feat: updated to use short form by default for `depends_on`

services/frontend/src/components/modals/docker-compose/service/form-utils.ts

@@ -1,4 +1,8 @@
-import type { IEditServiceForm, IServiceNodeItem } from "../../../../types";
+import type {
+  IEditServiceForm,
+  IEditServiceFormDependsOn,
+  IServiceNodeItem
+} from "../../../../types";
 import * as yup from "yup";
 import {
   checkArray,
@@ -533,6 +537,31 @@ export const getInitialValues = (node?: IServiceNodeItem): IEditServiceForm => {
   };
 };
 
+const getFinalDependsOn = (dependsOn: IEditServiceFormDependsOn[]) => {
+  let shortForm = true;
+  for (const item of dependsOn) {
+    if (item.condition !== "service_started") {
+      shortForm = false;
+      break;
+    }
+  }
+
+  if (shortForm) {
+    return pruneArray(dependsOn.map((item) => item.serviceName));
+  }
+
+  return pruneObject(
+    Object.fromEntries(
+      dependsOn.map((item) => [
+        item.serviceName,
+        {
+          condition: item.condition
+        }
+      ])
+    )
+  );
+};
+
 export const getFinalValues = (
   values: IEditServiceForm,
   previous?: IServiceNodeItem
@@ -639,16 +668,7 @@ export const getFinalValues = (
         }),
         labels: packArrayAsObject(deploy.labels, "key", "value")
       }),
-      depends_on: pruneObject(
-        Object.fromEntries(
-          dependsOn.map((item) => [
-            item.serviceName,
-            {
-              condition: item.condition
-            }
-          ])
-        )
-      ),
+      depends_on: getFinalDependsOn(dependsOn),
       entrypoint: pruneString(entrypoint),
       env_file: pruneString(envFile),
       image: pruneString(

services/frontend/src/types/index.ts

@@ -484,16 +484,18 @@ export interface IEditServiceForm {
     key: string;
     value: string;
   }[];
-  dependsOn: {
-    serviceName: string;
-    condition:
-      | "service_started"
-      | "service_healthy"
-      | "service_completed_successfully";
-  }[];
+  dependsOn: IEditServiceFormDependsOn[];
   workingDir: string;
 }
 
+export interface IEditServiceFormDependsOn {
+  serviceName: string;
+  condition:
+    | "service_started"
+    | "service_healthy"
+    | "service_completed_successfully";
+}
+
 export interface IEditVolumeForm {
   entryName: string;
   volumeName: string;