Merge pull request #146 from code0-tech/feat/#131

Value extraction within the default file does not work properly

Author: nicosammito

src/packages/ce/src/datatype/components/badges/NodeBadgeComponent.tsx

@@ -46,7 +46,7 @@ export const NodeBadgeComponent: React.FC<NodeBadgeComponentProps> = (props) =>
 
     const name = React.useMemo(() => {
         if (definition) {
-            return definition.names?.[0]?.content ?? definition.__typename === "FunctionDefinition" ? FALLBACK_FUNCTION_NAME : FALLBACK_FLOW_TYPE_NAME
+            return definition.names?.[0]?.content ?? (definition.__typename === "FunctionDefinition" ? FALLBACK_FUNCTION_NAME : FALLBACK_FLOW_TYPE_NAME)
         } else if (isTrigger && node?.__typename === "FlowType") {
             return node.names?.[0]?.content ?? FALLBACK_FLOW_TYPE_NAME
         }

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

@@ -67,9 +67,9 @@ export const FunctionFileDefaultComponent: React.FC<FunctionFileDefaultComponent
                 if (typeof parameterIndex !== "number") return
                 if (!changedParameters.current.has(parameterIndex)) continue;
                 const nodeParameter = node.parameters?.nodes?.find(p => p?.parameterDefinition?.id === parameterDefinition?.id)
-                const syntaxSegment = values[parameterDefinition!.id!]
+                const value = values[parameterDefinition!.id!]
                 const previousValue = nodeParameter?.value as NodeParameterValue
-                const syntaxValue = syntaxSegment?.[0]?.value ?? syntaxSegment?.value ?? syntaxSegment ?? null as NodeFunction | LiteralValue | ReferenceValue | null
+                const syntaxValue = (value?.[0]?.type == "block" || value?.[0]?.type == "text" ? value?.[0]?.value : value) ?? null as NodeFunction | LiteralValue | ReferenceValue | null
 
                 if (previousValue && previousValue.__typename === "NodeFunctionIdWrapper" && previousValue.id) {
                     const linkedNodes = flowService.getLinkedNodesById(flowId, previousValue.id)
@@ -78,7 +78,7 @@ export const FunctionFileDefaultComponent: React.FC<FunctionFileDefaultComponent
                     })
                 }
 
-                if (!syntaxValue || !syntaxSegment || (Array.isArray(syntaxValue) && Array.from(syntaxValue).length <= 0)) {
+                if (!syntaxValue || !value || (Array.isArray(syntaxValue) && Array.from(syntaxValue).length <= 0)) {
                     await flowService.setParameterValue(flowId, node.id!!, parameterIndex, undefined, parameterDefinition?.id);
                     continue;
                 }

src/packages/ce/src/function/components/suggestion/FunctionSuggestionMenuComponent.util.tsx

@@ -55,7 +55,10 @@ export const toInputSuggestions = (suggestions: FunctionSuggestion[]): InputSugg
         return {
             children,
             insertMode: "replace",
-            valueData: suggestion,
+            valueData: {
+                ...suggestion,
+                icon: ""
+            },
             value: suggestion.value,
             groupBy: groupLabel,
         };