From d05b19839b551bff35582a9f44e7efb067ec5cdd Mon Sep 17 00:00:00 2001
From: Samuel Rowe <samuelrowe1999@gmail.com>
Date: Fri, 29 Jul 2022 23:17:40 +0530
Subject: [PATCH] feat(frontend): prune `environment` in service forms

---
 .../src/components/Modal/service/form-utils.ts       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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