From 3e3400d8e0e81a8e1921a6412413a89be1ceab3e Mon Sep 17 00:00:00 2001
From: Samuel Rowe <samuelrowe1999@gmail.com>
Date: Mon, 1 Aug 2022 00:45:16 +0530
Subject: [PATCH] refactor(frontend): updated service form utils to use
 `pack*As*` utils

---
 .../components/Modal/service/form-utils.ts    | 28 ++++++-------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/services/frontend/src/components/Modal/service/form-utils.ts b/services/frontend/src/components/Modal/service/form-utils.ts
index bcefe27..3fc0230 100644
--- a/services/frontend/src/components/Modal/service/form-utils.ts
+++ b/services/frontend/src/components/Modal/service/form-utils.ts
@@ -434,17 +434,14 @@ export const getFinalValues = (
         ssh: packArrayAsStrings(build.sshAuthentications, "id", "path", "="),
         cache_from: pruneArray(build.cacheFrom),
         cache_to: pruneArray(build.cacheTo),
-        extra_hosts: pruneArray(
-          build.extraHosts.map((extraHost) =>
-            [extraHost.hostName, extraHost.ipAddress].join(":")
-          )
+        extra_hosts: packArrayAsStrings(
+          build.extraHosts,
+          "hostName",
+          "ipAddress",
+          ":"
         ),
         isolation: pruneString(build.isolation),
-        labels: pruneObject(
-          Object.fromEntries(
-            build.labels.map((label) => [label.key, label.value])
-          )
-        ),
+        labels: packArrayAsObject(build.labels, "key", "value"),
         // NOTE: This could be a potential bug for "0".
         shm_size: pruneString(build.sharedMemorySize),
         target: pruneString(build.target)
@@ -492,14 +489,7 @@ export const getFinalValues = (
         values.imageTag ? `:${values.imageTag}` : ""
       }`,
       container_name: values.containerName,
-      environment: pruneObject(
-        Object.fromEntries(
-          environmentVariables.map((environmentVariable) => [
-            environmentVariable.key,
-            environmentVariable.value
-          ])
-        )
-      ),
+      environment: packArrayAsObject(environmentVariables, "key", "value"),
       volumes: pruneArray(
         volumes.map(
           (volume) =>
@@ -517,9 +507,7 @@ export const getFinalValues = (
         )
       ),
       profiles: pruneArray(profiles),
-      labels: pruneObject(
-        Object.fromEntries(labels.map((label) => [label.key, label.value]))
-      )
+      labels: packArrayAsObject(labels, "key", "value")
     }
   };
 };