task filter count and test case fixes (#1774)

AOT-Technologies · Nov 23, 2023 · 655da84 · 655da84
1 parent 13397e6
commit 655da84
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 21 deletions.
diff --git a/forms-flow-web/src/components/ServiceFlow/index.js b/forms-flow-web/src/components/ServiceFlow/index.js
@@ -166,17 +166,16 @@ export default React.memo(() => {
         ...{ sorting: [...sortParams.sorting] },
         ...searchParams,
       };
-      let selectedBPMFilterParams;
-
-
-        selectedBPMFilterParams = {
+
+
+        const selectedBPMFilterParams = {
           ...selectedFilter,
           criteria: {
-            ...selectedBPMFilterParams?.criteria,
+            ...selectedFilter?.criteria,
             ...reqParamData
           }
         };
-
+       
       if (forceReload) {
         dispatch(
           fetchServiceTaskList(

diff --git a/forms-flow-web/src/components/ServiceFlow/list/ServiceTaskListView.js b/forms-flow-web/src/components/ServiceFlow/list/ServiceTaskListView.js
@@ -44,17 +44,7 @@ const ServiceTaskListView = React.memo(() => {
   const taskvariables = useSelector(
     (state) => state.bpmTasks.selectedFilter?.variables || []
   );
-  const [taskVariableLabels , setTaskVariableLabels] = useState({});
-
-  useEffect(()=>{
-    setTaskVariableLabels(()=>{
-      const data = {};
-      taskvariables.forEach((item)=>{
-        data[item.name] = item.label;
-      });
-      return data;
-    });
-  },[taskvariables]);
+
 
 
   const options = [
@@ -225,10 +215,13 @@ const ServiceTaskListView = React.memo(() => {
               <Row className="p-2" >
                   {task?._embedded?.variable?.map((eachVariable, index) => {
                     if ( eachVariable.name !== "applicationId" && eachVariable.name !== "formName" && selectedTaskVariables[eachVariable.name] === true) {
+                      const data = taskvariables?.find(
+                        (variableItem) => variableItem.name === eachVariable.name
+                      );
                       return (
                         <Col xs={2} key={index} >
                           <div className="col-12" style={{ wordBreak: "break-all" }}>
-                            <h6 className="font-weight-light">{taskVariableLabels[eachVariable.name]}</h6>
+                            <h6 className="font-weight-light">{data?.label}</h6>
                           </div>
                           <div className="d-flex col-12">
                             <h6>

diff --git a/forms-flow-web/src/components/ServiceFlow/list/sort/CreateNewFilter.js b/forms-flow-web/src/components/ServiceFlow/list/sort/CreateNewFilter.js
@@ -103,13 +103,13 @@ export default function CreateNewFilterDrawer({
       ...{ sorting: [...sortParams.sorting] },
       ...searchParams,
     };
-    let selectedBPMFilterParams;
+     
 
 
-      selectedBPMFilterParams = {
+     const selectedBPMFilterParams = {
         ...resData,
         criteria: {
-          ...selectedBPMFilterParams?.criteria,
+          ...resData?.criteria,
           ...reqParamData
         }
       };