Merge pull request #1017 from Bonymol-aot/FWF-5762/variable-check-issue

FWF5762 : [BugFix] Resolved variable check issue

Author: arun-s-aot

forms-flow-review/src/components/TaskFilterModal/TaskFilterModal.tsx

@@ -36,6 +36,9 @@ const TaskFilterModal = ({ show, onClose, toggleModal }) => {
   const defaultFilter = useSelector(
     (state: RootState) => state.task.defaultFilter
   );
+  const selectedFilter = useSelector(
+    (state: RootState) => state.task.selectedFilter
+  );
   const limit = useSelector((state: RootState) => state.task.limit);
   const [currentStep, setCurrentStep] = useState(1);
   const [showUpdateModal, setShowUpdateModal] = useState(false);
@@ -107,7 +110,8 @@ const TaskFilterModal = ({ show, onClose, toggleModal }) => {
     dispatch(setBPMFilterList(updatedFilterList));
     dispatch(fetchBPMTaskCount(updatedFilterList));
     const isDefaultFilter = response.data.id === defaultFilter;
-    if (isDefaultFilter) {
+    const isCurrentlySelected = response.data.id === selectedFilter?.id;
+    if (isDefaultFilter || isCurrentlySelected) {
       dispatch(setSelectedFilter(response.data));
       dispatch(fetchServiceTaskList(response.data, null, 1, limit));
     } else {

forms-flow-review/src/components/TaskFilterModal/TaskFilterModalBody.tsx

@@ -402,11 +402,20 @@ const handleFetchTaskVariables = (formId) => {
   fetchTaskVariables(formId)
     .then((res) => {
       const taskVariables = res.data?.taskVariables || [];
-      const isEditingWithSameForm = filterToEdit?.id && filterToEdit?.properties?.formId === formId;
-      // Always prefer latest saved filter state for existing variables (preserve isChecked)
-      const sourceVars = (selectedFilterExistingData?.variables || filterToEdit?.variables || []);
+      // Determine if we are editing an existing filter with the same form
+      const savedFormId =
+        filterToEdit?.properties?.formId ||
+        selectedFilterExistingData?.properties?.formId;
+      const isEditingWithSameForm =
+        !!filterToEdit?.id &&
+        savedFormId  &&
+        String(savedFormId) === String(formId);
+
+      // Always prefer latest saved filter state for existing variables (preserve isChecked and sortOrder)
+      const sourceVars =
+        selectedFilterExistingData?.variables || filterToEdit?.variables || [];
       let combinedVars;
-      
+
       if (isEditingWithSameForm) {
         // Get current task variable keys for comparison
         const currentTaskVariableKeys = taskVariables
@@ -455,7 +464,12 @@ const handleFetchTaskVariables = (formId) => {
         combinedVars = [...preservedDefaultVars, ...dynamicVariables];
       }
 
-      setVariableArray(combinedVars);
+      // Ensure UI reflects persisted ordering
+      const sortedVars = [...combinedVars].sort(
+        (a, b) => (a.sortOrder ?? 0) - (b.sortOrder ?? 0)
+      );
+
+      setVariableArray(sortedVars);
     })
     .catch((err) => console.error(err));
 };