From 0e57f543d073fd0db68eafc6dc0b0dab620ecf34 Mon Sep 17 00:00:00 2001
From: corpulent <artemgolub@gmail.com>
Date: Thu, 28 Jul 2022 19:13:10 +0300
Subject: [PATCH] fix: proper formats non required fields

---
 .../components/Modal/Service/form-utils.ts    | 45 ++++++++++++-------
 .../src/components/Modal/volume/form-utils.ts | 17 ++++---
 2 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/services/frontend/src/components/Modal/Service/form-utils.ts b/services/frontend/src/components/Modal/Service/form-utils.ts
index f469f1e..e7aa43b 100644
--- a/services/frontend/src/components/Modal/Service/form-utils.ts
+++ b/services/frontend/src/components/Modal/Service/form-utils.ts
@@ -60,8 +60,7 @@ export const validationSchema = yup.object({
   ),
   environmentVariables: yup.array(
     yup.object({
-      key: yup.string().required("Key is required"),
-      value: yup.string().required("Value is required")
+      key: yup.string().required("Key is required")
     })
   ),
   volumes: yup.array(
@@ -73,8 +72,7 @@ export const validationSchema = yup.object({
   ),
   labels: yup.array(
     yup.object({
-      key: yup.string().required("Key is required"),
-      value: yup.string().required("Value is required")
+      key: yup.string().required("Key is required")
     })
   )
 });
@@ -110,10 +108,10 @@ export const getInitialValues = (node?: IServiceNodeItem): IEditServiceForm => {
     serviceName: node_name,
     containerName: container_name,
     environmentVariables: environment0.map((variable) => {
-      const [key, value] = variable.split(":");
+      const [key, value] = variable.split("=");
       return {
         key,
-        value
+        value: value ? value : ""
       };
     }),
     volumes: volumes0.map((volume) => {
@@ -140,7 +138,7 @@ export const getInitialValues = (node?: IServiceNodeItem): IEditServiceForm => {
       return { hostPort, containerPort, protocol } as any;
     }),
     labels: labels0.map((label) => {
-      const [key, value] = label.split(":");
+      const [key, value] = label.split("=");
       return {
         key,
         value
@@ -155,7 +153,7 @@ export const getFinalValues = (
 ): IServiceNodeItem => {
   const { environmentVariables, ports, volumes, labels } = values;
 
-  return lodash.merge(
+  return lodash.mergeWith(
     lodash.cloneDeep(previous) || {
       key: "service",
       type: "SERVICE",
@@ -168,25 +166,38 @@ export const getFinalValues = (
         node_name: values.serviceName
       },
       serviceConfig: {
-        image: `${values.imageName}:${values.imageTag}`,
+        image: `${values.imageName}${
+          values.imageTag ? `:${values.imageTag}` : ""
+        }`,
         container_name: values.containerName,
         environment: environmentVariables.map(
-          (variable) => `${variable.key}:${variable.value}`
-        ),
-        volumes: volumes.map(
-          (volume) =>
-            volume.name +
-            (volume.containerPath ? `:${volume.containerPath}` : "") +
-            (volume.accessMode ? `:${volume.accessMode}` : "")
+          (variable) =>
+            `${variable.key}${variable.value ? `=${variable.value}` : ""}`
         ),
+        volumes: volumes.length
+          ? volumes.map(
+              (volume) =>
+                volume.name +
+                (volume.containerPath ? `:${volume.containerPath}` : "") +
+                (volume.accessMode ? `:${volume.accessMode}` : "")
+            )
+          : [],
         ports: ports.map(
           (port) =>
             port.hostPort +
             (port.containerPort ? `:${port.containerPort}` : "") +
             (port.protocol ? `/${port.protocol}` : "")
         ),
-        labels: labels.map((label) => `${label.key}:${label.value}`)
+        labels: labels.map(
+          (label) => `${label.key}${label.value ? `=${label.value}` : ""}`
+        )
+      }
+    },
+    (obj, src) => {
+      if (!lodash.isNil(src)) {
+        return src;
       }
+      return obj;
     }
   ) as any;
 };
diff --git a/services/frontend/src/components/Modal/volume/form-utils.ts b/services/frontend/src/components/Modal/volume/form-utils.ts
index da2aaf3..ba451f4 100644
--- a/services/frontend/src/components/Modal/volume/form-utils.ts
+++ b/services/frontend/src/components/Modal/volume/form-utils.ts
@@ -14,8 +14,7 @@ export const validationSchema = yup.object({
     .required("Volume name is required"),
   labels: yup.array(
     yup.object({
-      key: yup.string().required("Key is required"),
-      value: yup.string().required("Value is required")
+      key: yup.string().required("Key is required")
     })
   )
 });
@@ -44,7 +43,7 @@ export const getInitialValues = (node?: IVolumeNodeItem): IEditVolumeForm => {
     entryName: node_name,
     volumeName: name,
     labels: labels0.map((label) => {
-      const [key, value] = label.split(":");
+      const [key, value] = label.split("=");
       return {
         key,
         value
@@ -59,7 +58,7 @@ export const getFinalValues = (
 ): IVolumeNodeItem => {
   const { labels } = values;
 
-  return lodash.merge(
+  return lodash.mergeWith(
     lodash.cloneDeep(previous) || {
       key: "volume",
       type: "VOLUME",
@@ -73,8 +72,16 @@ export const getFinalValues = (
       },
       volumeConfig: {
         name: values.volumeName,
-        labels: labels.map((label) => `${label.key}:${label.value}`)
+        labels: labels.map(
+          (label) => `${label.key}${label.value ? `=${label.value}` : ""}`
+        )
       }
+    },
+    (obj, src) => {
+      if (!lodash.isNil(src)) {
+        return src;
+      }
+      return obj;
     }
   ) as any;
 };