Merge pull request #170 from code0-tech/feat/#169

Missing NodeParameters results in wrong value insertion

Author: nicosammito

src/packages/ce/src/flow/hooks/Flow.edges.hook.ts

@@ -93,7 +93,7 @@ export const useEdges = (flowId: Flow['id'], namespaceId?: Namespace['id'], proj
 
             node.parameters?.nodes?.forEach((param, index) => {
                 const parameterValue = param?.value;
-                const parameterDefinition = functionService.getById(node.functionDefinition?.id!!)?.parameterDefinitions?.nodes?.find(p => p?.id === param?.parameterDefinition?.id);
+                const parameterDefinition = functionService.getById(node.functionDefinition?.id!!)?.parameterDefinitions?.nodes?.[index];
                 const variant = getTypeVariant(types.parameters[index], dataTypeService.values())[0].variant;
                 if (!parameterValue) return
 

src/packages/ce/src/flow/services/Flow.service.ts

@@ -2,6 +2,7 @@ import {ReactiveArrayService, ReactiveArrayStore} from "@code0-tech/pictor";
 import {
     FlowInput,
     FlowSetting,
+    FunctionDefinition,
     LiteralValue,
     Maybe,
     Mutation,
@@ -16,11 +17,10 @@ import {
     NodeFunction,
     NodeFunctionIdWrapper,
     NodeParameter,
-    NodeParameterValueInput, ParameterDefinition,
+    NodeParameterValueInput,
     Query,
     ReferencePathInput,
-    ReferenceValue,
-    Scalars
+    ReferenceValue
 } from "@code0-tech/sagittarius-graphql-types";
 import {GraphqlClient} from "@core/util/graphql-client";
 import flowsQuery from "@edition/flow/services/queries/Flows.query.graphql";
@@ -317,21 +317,43 @@ export class FlowService extends ReactiveArrayService<FlowView, FlowDependencies
         await this.syncFlow(flowId)
     }
 
-    async setParameterValue(flowId: FlowView['id'], nodeId: NodeFunction['id'], parameterIndex: number, value?: LiteralValue | ReferenceValue | NodeFunction, parameterDefinitionId?: ParameterDefinition['id']): Promise<void> {
+    async setParameterValue(flowId: FlowView['id'], nodeId: NodeFunction['id'], parameterIndex: number, value?: LiteralValue | ReferenceValue | NodeFunction, functionDefinition?: FunctionDefinition): Promise<void> {
+
         const flow = this.getById(flowId)
         const index = this.values().findIndex(f => f.id === flowId)
         if (!flow) return
         const node = this.getNodeById(flowId, nodeId)
         if (!node) return
+
+        if (!node.parameters) {
+            node.parameters = {
+                nodes: []
+            }
+        }
+
+        if (!node.parameters.nodes) {
+            node.parameters.nodes = []
+        }
+
+        functionDefinition?.parameterDefinitions?.nodes?.forEach((pD, index) => {
+            const nodeParameter = node.parameters?.nodes?.[index]
+            if (!nodeParameter) {
+
+                node!.parameters!.nodes![parameterIndex] = {
+                    __typename: "NodeParameter",
+                    value: null,
+                    parameterDefinition: {
+                        id: pD?.id
+                    }
+                }
+            }
+        })
+
         const parameter = node.parameters?.nodes?.[parameterIndex]
-        if (!parameter && parameterDefinitionId && node.parameters && node.parameters.nodes) {
-            //TODO: needs a parameterDefinitionId
+        if (!parameter && node.parameters && node.parameters.nodes) {
+
             const localParameter: NodeParameter = {
                 __typename: "NodeParameter",
-                parameterDefinition: {
-                    __typename: "ParameterDefinition",
-                    id: parameterDefinitionId
-                },
                 value: null
             }
 

src/packages/ce/src/function/components/files/FunctionFileDefaultComponent.tsx

@@ -4,7 +4,7 @@ import {
     Flow,
     LiteralValue,
     NodeFunction,
-    NodeParameterValue, ParameterDefinition,
+    NodeParameterValue,
     ReferenceValue
 } from "@code0-tech/sagittarius-graphql-types";
 import {FileTabsService} from "@code0-tech/pictor/dist/components/file-tabs/FileTabs.service";
@@ -66,7 +66,7 @@ export const FunctionFileDefaultComponent: React.FC<FunctionFileDefaultComponent
                 const parameterIndex = definition?.parameterDefinitions?.nodes?.findIndex(p => p?.id === parameterDefinition?.id)
                 if (typeof parameterIndex !== "number") return
                 if (!changedParameters.current.has(parameterIndex)) continue;
-                const nodeParameter = node.parameters?.nodes?.find(p => p?.parameterDefinition?.id === parameterDefinition?.id)
+                const nodeParameter = node.parameters?.nodes?.[parameterIndex]
                 const value = values[parameterDefinition!.id!]
                 const previousValue = nodeParameter?.value as NodeParameterValue
                 const syntaxValue = (value?.[0]?.type == "block" || value?.[0]?.type == "text" ? value?.[0]?.value : value) ?? null as NodeFunction | LiteralValue | ReferenceValue | null
@@ -79,7 +79,7 @@ export const FunctionFileDefaultComponent: React.FC<FunctionFileDefaultComponent
                 }
 
                 if (!syntaxValue || !value || (Array.isArray(syntaxValue) && Array.from(syntaxValue).length <= 0)) {
-                    await flowService.setParameterValue(flowId, node.id!!, parameterIndex, undefined, parameterDefinition?.id);
+                    await flowService.setParameterValue(flowId, node.id!!, parameterIndex, undefined, definition);
                     continue;
                 }
 
@@ -89,22 +89,22 @@ export const FunctionFileDefaultComponent: React.FC<FunctionFileDefaultComponent
                         await flowService.setParameterValue(flowId, node.id!!, parameterIndex, syntaxValue ? {
                             __typename: "LiteralValue",
                             value: parsedSyntaxValue
-                        } : undefined, parameterDefinition?.id);
+                        } : undefined, definition);
                         continue;
                     }
                 } catch (e) {
                     if (!syntaxValue?.__typename) {
                         await flowService.setParameterValue(flowId, node.id!!, parameterIndex, syntaxValue ? {
                             __typename: "LiteralValue",
                             value: syntaxValue,
-                        } : undefined, parameterDefinition?.id);
+                        } : undefined, definition);
                         continue;
                     }
                 }
 
                 const parsedSyntaxValue = typeof syntaxValue === "object" ? syntaxValue : JSON.parse(syntaxValue)
 
-                await flowService.setParameterValue(flowId, node.id!!, parameterIndex, parsedSyntaxValue.__typename === "LiteralValue" ? (!!parsedSyntaxValue.value ? parsedSyntaxValue : undefined) : parsedSyntaxValue, parameterDefinition?.id);
+                await flowService.setParameterValue(flowId, node.id!!, parameterIndex, parsedSyntaxValue.__typename === "LiteralValue" ? (!!parsedSyntaxValue.value ? parsedSyntaxValue : undefined) : parsedSyntaxValue, definition);
             }
             changedParameters.current.clear()
         })
@@ -118,6 +118,8 @@ export const FunctionFileDefaultComponent: React.FC<FunctionFileDefaultComponent
         onSubmit: onSubmit
     })
 
+    console.log(initialValues, node.id)
+
     React.useEffect(() => {
         validate()
     }, [validation])

src/packages/ce/src/function/components/nodes/FunctionNodeDefaultComponent.tsx

@@ -72,8 +72,8 @@ export const FunctionNodeDefaultComponent: React.FC<FunctionNodeDefaultComponent
             );
 
     const displayMessage = React.useMemo(() => splitTemplate(definition?.displayMessages?.[0]?.content ?? FALLBACK_FUNCTION_DISPLAY_MESSAGE).map(item => {
-        const nodeParameter = node?.parameters?.nodes?.find(p => {
-            const parameterDefinition = definition?.parameterDefinitions?.nodes?.find(pd => pd?.id == p?.parameterDefinition?.id)
+        const nodeParameter = node?.parameters?.nodes?.find((_, index) => {
+            const parameterDefinition = definition?.parameterDefinitions?.nodes?.[index]
             return parameterDefinition?.identifier == item
         })