Merge pull request #137 from Tauffer-Consulting/fix/upstream-options-…

…complex-array Fix/upstream options complex array
Tauffer-Consulting · Nov 1, 2023 · 2190fe4 · 2190fe4
2 parents 0bf99f4 + 9d35edc
commit 2190fe4
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 17 deletions.
diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml
@@ -309,7 +309,7 @@ services:
       - DOMINO_DB_HOST=domino_postgres
       - DOMINO_DB_PORT=5432
       - DOMINO_DB_NAME=postgres
-      - DOMINO_DEFAULT_PIECES_REPOSITORY_VERSION=0.4.3
+      - DOMINO_DEFAULT_PIECES_REPOSITORY_VERSION=0.4.5
       - DOMINO_DEFAULT_PIECES_REPOSITORY_TOKEN=${DOMINO_DEFAULT_PIECES_REPOSITORY_TOKEN}
       - DOMINO_GITHUB_ACCESS_TOKEN_WORKFLOWS=${DOMINO_GITHUB_ACCESS_TOKEN_WORKFLOWS}
       - DOMINO_GITHUB_WORKFLOWS_REPOSITORY=${DOMINO_GITHUB_WORKFLOWS_REPOSITORY}

diff --git a/...src/features/workflowEditor/components/SidebarForm/PieceForm/PieceFormItem/arrayInput.tsx b/...src/features/workflowEditor/components/SidebarForm/PieceForm/PieceFormItem/arrayInput.tsx
@@ -20,7 +20,11 @@ import {
   useWatch,
 } from "react-hook-form";
 
-import { type ArrayOption } from "../upstreamOptions";
+import {
+  type ComplexArrayOption,
+  type ArrayOption,
+  type Option,
+} from "../upstreamOptions";
 
 import { disableCheckboxOptions } from "./disableCheckboxOptions";
 import ObjectInputComponent from "./objectInput";
@@ -32,7 +36,7 @@ interface ArrayInputItemProps {
   schema: any;
   control: Control<IWorkflowPieceData, any>;
   definitions?: any;
-  upstreamOptions: ArrayOption;
+  upstreamOptions: ArrayOption | ComplexArrayOption;
 }
 
 const ArrayInput: React.FC<ArrayInputItemProps> = ({
@@ -206,7 +210,7 @@ const ArrayInput: React.FC<ArrayInputItemProps> = ({
                   <SelectUpstreamInput
                     name={`${name}.${index}`}
                     label={schema?.title}
-                    options={upstreamOptions.items}
+                    options={upstreamOptions.items as Option[]}
                   />
                 </Grid>
               )}
@@ -313,7 +317,7 @@ const ArrayInput: React.FC<ArrayInputItemProps> = ({
                     name={`${name}.${index}`}
                     schema={schema}
                     definitions={definitions}
-                    upstreamOptions={upstreamOptions.items}
+                    upstreamOptions={upstreamOptions as ComplexArrayOption}
                   />
                 </Grid>
               )}

diff --git a/...rc/features/workflowEditor/components/SidebarForm/PieceForm/PieceFormItem/objectInput.tsx b/...rc/features/workflowEditor/components/SidebarForm/PieceForm/PieceFormItem/objectInput.tsx
@@ -6,7 +6,7 @@ import React, { useCallback, useMemo, useState } from "react";
 import { useWatch } from "react-hook-form";
 import { getDefinition } from "utils";
 
-import { type Option } from "../upstreamOptions";
+import { type ComplexArrayOption } from "../upstreamOptions";
 
 import { disableCheckboxOptions } from "./disableCheckboxOptions";
 import SelectUpstreamInput from "./selectUpstreamInput";
@@ -15,7 +15,7 @@ interface Prop {
   name: `inputs.${string}.value.${number}`;
   schema: ArrayObjectProperty;
   definitions: Definitions;
-  upstreamOptions: Option[];
+  upstreamOptions: ComplexArrayOption;
 }
 
 const ObjectInputComponent: React.FC<Prop> = ({
@@ -92,7 +92,11 @@ const ObjectInputComponent: React.FC<Prop> = ({
                 <SelectUpstreamInput
                   label={key}
                   name={`${name}.upstreamValue.${key}`}
-                  options={upstreamOptions}
+                  options={
+                    upstreamOptions[key] !== undefined
+                      ? upstreamOptions[key].items
+                      : []
+                  }
                   object
                 />
               </Grid>

diff --git a/frontend/src/features/workflowEditor/components/SidebarForm/PieceForm/upstreamOptions.ts b/frontend/src/features/workflowEditor/components/SidebarForm/PieceForm/upstreamOptions.ts
@@ -11,12 +11,19 @@ export interface ArrayOption {
   items: Option[];
 }
 
+export type ComplexArrayOption = Record<string, ArrayOption>;
+
 export type UpstreamOptions = Record<string, Option[] | ArrayOption>;
 
 const getInputType = (schema: Record<string, any>) => {
   let type = schema.format ? schema.format : schema.type;
-  if ("allOf" in schema || "oneOf" in schema || "anyOf" in schema) {
+  if ("allOf" in schema || "oneOf" in schema) {
     type = "enum";
+  } else if ("anyOf" in schema) {
+    type = [];
+    for (const item of schema.anyOf) {
+      type.push(item.type);
+    }
   }
   return type === "number" ? "float" : (type as string);
 };
@@ -36,7 +43,11 @@ const getOptions = (
       for (const property in upSchema) {
         const upType = getInputType(upSchema[property]);
 
-        if (upType === type || (upType === "string" && type === "object")) {
+        if (
+          upType === type ||
+          (upType === "string" && type === "object") ||
+          (Array.isArray(type) && type.includes(upType))
+        ) {
           const value = `${upPiece?.name} (${getUuidSlice(upPiece.id)}) - ${
             upSchema[property].title
           }`;
@@ -88,16 +99,24 @@ export const getUpstreamOptions = (
         itemsSchema = schema.definitions?.[subItemSchemaName];
       }
 
-      const itemsType = getInputType(itemsSchema);
-
       const array = getOptions(upstreamPieces, currentType);
-      const items = getOptions(upstreamPieces, itemsType);
-
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      upstreamOptions[key] = { array, items } as ArrayOption;
+      if (itemsSchema.type === "object") {
+        const __data: any = {};
+        Object.keys(itemsSchema.properties).forEach((subKey) => {
+          const subSchema = itemsSchema.properties[subKey];
+          const subType = getInputType(subSchema);
+          const items = getOptions(upstreamPieces, subType);
+          __data[subKey] = { array, items };
+        });
+        upstreamOptions[key] = __data;
+      } else {
+        const itemsType = getInputType(itemsSchema);
+        const items = getOptions(upstreamPieces, itemsType);
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+        upstreamOptions[key] = { array, items } as ArrayOption;
+      }
     } else {
       const options = getOptions(upstreamPieces, currentType);
-
       upstreamOptions[key] = options;
     }
   });