Merge pull request 'Applying the dict option to labels' (#2) from labels-dict into main

Reviewed-on: ComputerSurge/Dock-Dploy#2

src/routes/docker/compose-builder.tsx

@@ -933,16 +933,19 @@ function App() {
           : [],
       user: actualServiceData.user || "",
       working_dir: actualServiceData.working_dir || "",
-      labels: actualServiceData.labels
-        ? Array.isArray(actualServiceData.labels)
-          ? actualServiceData.labels.map((l: string) => {
-              const [key, ...rest] = l.split("=");
-              return { key, value: rest.join("=") };
-            })
-          : Object.entries(actualServiceData.labels).map(
+      labels: Array.isArray(actualServiceData.labels)
+        ? actualServiceData.labels.map((l: string) => {
+            const [key, ...rest] = l.split("=");
+            return { key, value: rest.join("=") };
+          })
+        : actualServiceData.labels && typeof actualServiceData.labels === "object"
+          ? Object.entries(actualServiceData.labels).map(
               ([key, value]: [string, any]) => ({ key, value: String(value) })
             )
-        : [],
+          : [],
+      labels_syntax: Array.isArray(actualServiceData.labels)
+        ? "array"
+        : "dict",
       privileged:
         actualServiceData.privileged !== undefined
           ? !!actualServiceData.privileged
@@ -3274,7 +3277,42 @@ function App() {
                         </div>
                         {/* Labels */}
                         <div>
-                          <Label className="mb-1 block">Labels</Label>
+                          <div className="flex items-center justify-between mb-1">
+                            <div className="flex items-center gap-2">
+                              <Label className="mb-1 block">Labels</Label>
+                            </div>
+                            <div className="flex gap-2 items-center">
+                              <span className="text-xs text-muted-foreground">
+                                Syntax:
+                              </span>
+                              <Toggle
+                                pressed={svc.labels_syntax === "array"}
+                                onPressedChange={(pressed) =>
+                                  updateServiceField(
+                                    "labels_syntax",
+                                    pressed ? "array" : "dict"
+                                  )
+                                }
+                                aria-label="Array syntax"
+                                className="border rounded px-2 py-1 text-xs"
+                              >
+                                Array
+                              </Toggle>
+                              <Toggle
+                                pressed={svc.labels_syntax === "dict"}
+                                onPressedChange={(pressed) =>
+                                  updateServiceField(
+                                    "labels_syntax",
+                                    pressed ? "dict" : "array"
+                                  )
+                                }
+                                aria-label="Dictionary syntax"
+                                className="border rounded px-2 py-1 text-xs"
+                              >
+                                Dict
+                              </Toggle>
+                            </div>
+                          </div>
                           <div className="flex flex-col gap-2">
                             {svc.labels?.map((label, idx) => (
                               <div

src/types/compose.ts

@@ -58,6 +58,7 @@ export interface ServiceConfig {
   user?: string;
   working_dir?: string;
   labels?: { key: string; value: string }[];
+  labels_syntax?: "array" | "dict";
   privileged?: boolean;
   read_only?: boolean;
   shm_size?: string;

src/utils/default-configs.ts

@@ -115,6 +115,7 @@ export function defaultService(): ServiceConfig {
     user: "",
     working_dir: "",
     labels: [],
+    labels_syntax: "array",
     privileged: undefined,
     read_only: undefined,
     shm_size: "",

src/utils/yaml-generator.ts

@@ -186,10 +186,20 @@ export function generateYaml(
       working_dir: svc.working_dir || undefined,
       labels:
         svc.labels && svc.labels.filter((l) => l.key).length
-          ? svc.labels
+          ? svc.labels_syntax === "dict"
+            ? svc.labels
+              .filter(({ key }) => key)
+              .reduce(
+                (acc, { key, value }) => {
+                  acc[key] = value;
+                  return acc;
+                },
+                {} as Record<string, string>
+              )
+            : svc.labels
               .filter((l) => l.key)
-              .map(({ key, value }) => `"${key}=${value}"`)
-          : undefined,
+              .map(({ key, value}) => `"${key}=${value}"`)
+          :undefined,
       privileged: svc.privileged !== undefined ? svc.privileged : undefined,
       read_only: svc.read_only !== undefined ? svc.read_only : undefined,
       shm_size: svc.shm_size || undefined,