From 7ad409b3d9b4a4d795d117db13726c9e53cfd9d3 Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Mon, 19 Aug 2024 13:53:23 +0800
Subject: [PATCH] fix: update operate and value

---
 .../components/condition-list/condition-item.tsx  | 15 +++++++++++----
 .../nodes/if-else/components/condition-wrap.tsx   | 12 ++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/web/app/components/workflow/nodes/if-else/components/condition-list/condition-item.tsx b/web/app/components/workflow/nodes/if-else/components/condition-list/condition-item.tsx
index ce642e44c8..508d21ec4b 100644
--- a/web/app/components/workflow/nodes/if-else/components/condition-list/condition-item.tsx
+++ b/web/app/components/workflow/nodes/if-else/components/condition-list/condition-item.tsx
@@ -68,21 +68,28 @@ const ConditionItem = ({
 
   const [isHovered, setIsHovered] = useState(false)
 
+  const doUpdateCondition = useCallback((newCondition: Condition) => {
+    if (isSubVariableKey)
+      onUpdateSubVariableCondition?.(caseId, conditionId, condition.id, newCondition)
+    else
+      onUpdateCondition(caseId, condition.id, newCondition)
+  }, [caseId, condition, conditionId, isSubVariableKey, onUpdateCondition, onUpdateSubVariableCondition])
+
   const handleUpdateConditionOperator = useCallback((value: ComparisonOperator) => {
     const newCondition = {
       ...condition,
       comparison_operator: value,
     }
-    onUpdateCondition(caseId, condition.id, newCondition)
-  }, [caseId, condition, onUpdateCondition])
+    doUpdateCondition(newCondition)
+  }, [condition, doUpdateCondition])
 
   const handleUpdateConditionValue = useCallback((value: string) => {
     const newCondition = {
       ...condition,
       value,
     }
-    onUpdateCondition(caseId, condition.id, newCondition)
-  }, [caseId, condition, onUpdateCondition])
+    doUpdateCondition(newCondition)
+  }, [condition, doUpdateCondition])
 
   const handleUpdateConditionNumberVarType = useCallback((numberVarType: NumberVarType) => {
     const newCondition = {
diff --git a/web/app/components/workflow/nodes/if-else/components/condition-wrap.tsx b/web/app/components/workflow/nodes/if-else/components/condition-wrap.tsx
index 2c1604dc2b..1ce7ff5013 100644
--- a/web/app/components/workflow/nodes/if-else/components/condition-wrap.tsx
+++ b/web/app/components/workflow/nodes/if-else/components/condition-wrap.tsx
@@ -40,8 +40,8 @@ type Props = {
 
 const ConditionWrap: FC<Props> = ({
   isSubVariable,
-  caseId: conditionParentCaseId,
-  conditionId: parentConditionId,
+  caseId,
+  conditionId,
   nodeId: id,
   cases = [],
   readOnly,
@@ -118,8 +118,8 @@ const ConditionWrap: FC<Props> = ({
                       <ConditionList
                         disabled={readOnly}
                         caseItem={item}
-                        caseId={isSubVariable ? conditionParentCaseId! : item.case_id}
-                        conditionId={parentConditionId}
+                        caseId={isSubVariable ? caseId! : item.case_id}
+                        conditionId={conditionId}
                         onUpdateCondition={handleUpdateCondition}
                         onRemoveCondition={handleRemoveCondition}
                         onUpdateConditionLogicalOperator={handleUpdateConditionLogicalOperator}
@@ -146,7 +146,7 @@ const ConditionWrap: FC<Props> = ({
                       <Button
                         size='small'
                         disabled={readOnly}
-                        onClick={() => handleAddSubVariableCondition?.(conditionParentCaseId!, parentConditionId!)}
+                        onClick={() => handleAddSubVariableCondition?.(caseId!, conditionId!)}
                       >
                         <RiAddLine className='mr-1 w-3.5 h-3.5' />
                         {t('workflow.nodes.ifElse.addSubVariable')}
@@ -190,7 +190,7 @@ const ConditionWrap: FC<Props> = ({
         <Button
           size='small'
           disabled={readOnly}
-          onClick={() => handleAddSubVariableCondition?.(conditionParentCaseId!, parentConditionId!)}
+          onClick={() => handleAddSubVariableCondition?.(caseId!, conditionId!)}
         >
           <RiAddLine className='mr-1 w-3.5 h-3.5' />
           {t('workflow.nodes.ifElse.addSubVariable')}