diff --git a/forms-flow-web/src/components/ServiceFlow/list/ServiceTaskList.js b/forms-flow-web/src/components/ServiceFlow/list/ServiceTaskList.js index 420c371629..b8bdd5d576 100644 --- a/forms-flow-web/src/components/ServiceFlow/list/ServiceTaskList.js +++ b/forms-flow-web/src/components/ServiceFlow/list/ServiceTaskList.js @@ -41,10 +41,19 @@ const ServiceFlowTaskList = React.memo(() => { ); useEffect(() => { - if (selectedFilter) { + if (selectedFilter?.id) { + + const selectedBPMFilterParams = { + ...selectedFilter, + criteria: { + ...selectedFilter?.criteria, + ...reqData?.criteria + } + }; dispatch(setBPMTaskLoader(true)); dispatch(setBPMTaskListActivePage(1)); - dispatch(fetchServiceTaskList(reqData,null,firstResult)); + + dispatch(fetchServiceTaskList(selectedBPMFilterParams,null,firstResult)); } }, [reqData]); @@ -63,7 +72,7 @@ const ServiceFlowTaskList = React.memo(() => { ); }; - const renderTaskList = () => { + const renderTaskList = () => { if ((tasksCount || taskList.length) && selectedFilter) { return ( <> @@ -170,7 +179,7 @@ const ServiceFlowTaskList = React.memo(() => { </> ); - } else { + } else { return ( <div className="d-flex align-items-center justify-content-center py-4 px-2"> <i className="fa fa-info-circle mr-2" /> diff --git a/forms-flow-web/src/containers/TaskHead.js b/forms-flow-web/src/containers/TaskHead.js index f6639b50f1..d9e5ec55b6 100644 --- a/forms-flow-web/src/containers/TaskHead.js +++ b/forms-flow-web/src/containers/TaskHead.js @@ -4,7 +4,7 @@ import { push } from "connected-react-router"; import { NavDropdown } from "react-bootstrap"; import ServiceFlowFilterListDropDown from "../components/ServiceFlow/filter/ServiceTaskFilterListDropDown"; import {MULTITENANCY_ENABLED} from "../constants/constants"; -import {setViewType } from '../actions/bpmTaskActions'; +import {setSelectedTaskID, setViewType } from '../actions/bpmTaskActions'; import CreateNewFilterDrawer from "../components/ServiceFlow/list/sort/CreateNewFilter"; import { useTranslation } from "react-i18next"; function TaskHead() { @@ -15,7 +15,7 @@ function TaskHead() { const [filterSelectedForEdit, setFilterSelectedForEdit] = useState(null); const [openFilterDrawer, setOpenFilterDrawer] = useState(false); const selectedFilter = useSelector((state) => state.bpmTasks.selectedFilter); - + const viewType = useSelector((state) => state.bpmTasks.viewType); const isFilterLoading = useSelector( (state) => state.bpmTasks.isFilterLoading ); @@ -29,10 +29,14 @@ function TaskHead() { const goToTask = () => { dispatch(push(`${baseUrl}task`)); }; - const viewType = useSelector((state) => state.bpmTasks.viewType); + const changeTaskView = (view) => { - dispatch(setViewType(view)); + if(viewType !== view){ + dispatch(setSelectedTaskID(null)); + dispatch(setViewType(view)); + } + }; const filterListLoading = () => {