feat(frontend): prune `environment` in service forms

pull/81/head
Samuel Rowe 3 years ago
parent b6ec438d4f
commit d05b19839b

@ -1,6 +1,6 @@
import type { IEditServiceForm, IServiceNodeItem } from "../../../types"; import type { IEditServiceForm, IServiceNodeItem } from "../../../types";
import * as yup from "yup"; import * as yup from "yup";
import { checkArray, pruneObject } from "../../../utils/forms"; import { checkArray, pruneArray, pruneObject } from "../../../utils/forms";
const initialValues: IEditServiceForm = { const initialValues: IEditServiceForm = {
imageName: "", imageName: "",
@ -94,7 +94,7 @@ export const getInitialValues = (node?: IServiceNodeItem): IEditServiceForm => {
labels labels
} = serviceConfig; } = serviceConfig;
const environment0: string[] = checkArray(environment, "environment"); const environment0: string[] = checkArray(environment || [], "environment");
const volumes0: string[] = checkArray(volumes, "volumes"); const volumes0: string[] = checkArray(volumes, "volumes");
const ports0: string[] = checkArray(ports, "ports"); const ports0: string[] = checkArray(ports, "ports");
const [imageName, imageTag] = (image ?? ":").split(":"); const [imageName, imageTag] = (image ?? ":").split(":");
@ -165,9 +165,11 @@ export const getFinalValues = (
values.imageTag ? `:${values.imageTag}` : "" values.imageTag ? `:${values.imageTag}` : ""
}`, }`,
container_name: values.containerName, container_name: values.containerName,
environment: environmentVariables.map( environment: pruneArray(
(variable) => environmentVariables.map(
`${variable.key}${variable.value ? `=${variable.value}` : ""}` (variable) =>
`${variable.key}${variable.value ? `=${variable.value}` : ""}`
)
), ),
volumes: volumes.length volumes: volumes.length
? volumes.map( ? volumes.map(

Loading…
Cancel
Save