Merge pull request #904 from 1AhmedYasser/Conditional-manual-values-not-cast-to-string,-comparison-fails

Fix: Conditional manual values not cast to string, comparison fails

Author: ffrose

GUI/src/services/service-builder.ts

@@ -113,7 +113,26 @@ const hasInvalidElements = (elements: any[]): boolean => {
   });
 };
 
-const buildConditionString = (group: any): string => {
+const getAssignedVariableNames = (nodes: Node[]): Set<string> => {
+  const names = new Set(['chatId', 'authorId', 'input', 'buttons', 'res']);
+  for (const node of nodes) {
+    const data = node.data as NodeDataProps | undefined;
+    if (data?.stepType === StepType.Assign && Array.isArray(data.assignElements)) {
+      for (const e of data.assignElements) {
+        const key = e.key?.replaceAll('${', '').replaceAll('}', '').trim();
+        if (key) names.add(key);
+      }
+    }
+  }
+  return names;
+};
+
+const buildConditionString = (group: any, assignedVariableNames: Set<string>): string => {
+  const formatField = (rawField: string): string => {
+    if (assignedVariableNames.has(rawField)) return rawField;
+    return isNumericString(rawField) ? rawField : `"${rawField}"`;
+  };
+
   if ('children' in group) {
     const subgroup = group as Group;
     if (subgroup.children.length === 0) {
@@ -122,12 +141,14 @@ const buildConditionString = (group: any): string => {
 
     const conditions = subgroup.children.map((child) => {
       if ('children' in child) {
-        return `(${buildConditionString(child)})`;
+        return `(${buildConditionString(child, assignedVariableNames)})`;
       } else {
         const rule = child;
+        const rawField = rule.field.replaceAll('${', '').replaceAll('}', '');
         const absoluteValue = removeWrapperQuotes(rule.value.replaceAll('${', '').replaceAll('}', ''));
         const value = isNumericString(absoluteValue) ? absoluteValue : `"${absoluteValue}"`;
-        return `${rule.field.replaceAll('${', '').replaceAll('}', '')} ${rule.operator} ${value}`;
+        const field = formatField(rawField);
+        return `${field} ${rule.operator} ${value}`;
       }
     });
 
@@ -138,9 +159,11 @@ const buildConditionString = (group: any): string => {
     }
   } else {
     const rule = group as Rule;
+    const rawField = rule.field.replaceAll('${', '').replaceAll('}', '');
     const absoluteValue = removeWrapperQuotes(rule.value.replaceAll('${', '').replaceAll('}', ''));
     const value = isNumericString(absoluteValue) ? absoluteValue : `"${absoluteValue}"`;
-    return `${rule.field.replaceAll('${', '').replaceAll('}', '')} ${rule.operator} ${value}`;
+    const field = formatField(rawField);
+    return `${field} ${rule.operator} ${value}`;
   }
 };
 
@@ -615,10 +638,11 @@ function handleConditionStep(
     throw new Error(i18next.t('toast.missing-condition-rules') ?? 'Error');
   }
 
+  const assignedVariableNames = getAssignedVariableNames(nodes);
   finishedFlow.set(parentStepName, {
     switch: [
       {
-        condition: `\${${buildConditionString(parentNode.data.rules)}}`,
+        condition: `\${${buildConditionString(parentNode.data.rules, assignedVariableNames)}}`,
         next: toSnakeCase(firstChild?.data?.label ?? '') ?? '',
       },
     ],