From aa9b37064d4dc8e0da244dc3efd6b518ffd7d5f9 Mon Sep 17 00:00:00 2001
From: fahad-aot <99656326+fahad-aot@users.noreply.github.com>
Date: Fri, 5 Apr 2024 05:35:59 -0700
Subject: [PATCH] Fixed search in task page (#2004)

---
 .../ServiceFlow/list/search/TaskFilterViewComponent.js      | 5 -----
 .../components/ServiceFlow/list/search/TaskSearchBarView.js | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/forms-flow-web/src/components/ServiceFlow/list/search/TaskFilterViewComponent.js b/forms-flow-web/src/components/ServiceFlow/list/search/TaskFilterViewComponent.js
index 0104cf698d..d5013fbe58 100644
--- a/forms-flow-web/src/components/ServiceFlow/list/search/TaskFilterViewComponent.js
+++ b/forms-flow-web/src/components/ServiceFlow/list/search/TaskFilterViewComponent.js
@@ -48,7 +48,6 @@ const TaskFilterViewComponent = React.memo(
     const { t } = useTranslation();
     const [assigneeOptions, setAssigneeOptions] = useState([]);
     const [inputValuesPresent, setInputValuesPresent] = useState(false); // State to track any input value is present or not
-    const selectedFilter = useSelector((state) => state.bpmTasks.selectedFilter);
     
     const handleClick = (e) => {
       if (createSearchNode?.current?.contains(e.target)) {
@@ -157,10 +156,6 @@ const TaskFilterViewComponent = React.memo(
     }, [assignee, candidateGroup, processVariables, dueStartDate, dueEndDate,
       followStartDate, followEndDate, createdStartDate, createdEndDate, priority]);
     
-    useEffect(() => {
-      //The search fields get clear when switching the filter
-      setFilterParams({});
-    }, [selectedFilter]);
      
       const handleDueStartDateChange = (date) => {
         setDueStartDate(date); 
diff --git a/forms-flow-web/src/components/ServiceFlow/list/search/TaskSearchBarView.js b/forms-flow-web/src/components/ServiceFlow/list/search/TaskSearchBarView.js
index 8811a867d4..21b3277b24 100644
--- a/forms-flow-web/src/components/ServiceFlow/list/search/TaskSearchBarView.js
+++ b/forms-flow-web/src/components/ServiceFlow/list/search/TaskSearchBarView.js
@@ -17,6 +17,7 @@ const TaskSearchBarListView = React.memo(({ toggleAllTaskVariables }) => {
   const [filterParams, setFilterParams] = useState({});
   const taskList = useSelector((state) => state.bpmTasks.tasksList);
   const allTaskVariablesExpanded = useSelector((state) => state.bpmTasks.allTaskVariablesExpand);
+  const selectedFilter = useSelector((state) => state.bpmTasks.selectedFilter);
   const dispatch = useDispatch();
   const { t } = useTranslation();
   useEffect(() => {
@@ -29,6 +30,11 @@ const TaskSearchBarListView = React.memo(({ toggleAllTaskVariables }) => {
     });
     dispatch(setSelectedTaskVariables(taskVaribles));
   }, [taskList]);
+  
+  useEffect(() => {
+    //The search fields get clear when switching the filter
+    setFilterParams({});
+  }, [selectedFilter]);
 
   return (
     <>