@@ -26,7 +26,8 @@ import {
2626 setFilterListParams ,
2727 setFilterListSortParams ,
2828 setTaskListLimit ,
29- setDefaultFilter ,
29+ setDefaultFilter ,
30+ resetTaskListParams ,
3031 setSelectedBpmAttributeFilter ,
3132} from "../../actions/taskActions" ;
3233
@@ -287,7 +288,6 @@ export function ResizableTable(): JSX.Element {
287288 selectedFilter = null ,
288289 selectedAttributeFilter = null ,
289290 taskId : bpmTaskId = null ,
290- firstResult = 0 ,
291291 limit,
292292 tasksList : taskList = [ ] ,
293293 defaultFilter = null ,
@@ -298,6 +298,7 @@ export function ResizableTable(): JSX.Element {
298298 activePage,
299299 tasksCount,
300300 isTaskListLoading,
301+ filterCached,
301302 } = useSelector ( ( state : any ) => state . task ?? { } ) ;
302303 const selectedFilterId = selectedFilter ?. id ?? null ;
303304 const selectedAttributeFilterId = selectedAttributeFilter ?. id ?? null ;
@@ -412,7 +413,7 @@ export function ResizableTable(): JSX.Element {
412413 } ,
413414 } ;
414415 dispatch ( setBPMTaskLoader ( true ) ) ;
415- dispatch ( fetchServiceTaskList ( updatedFilter , null , firstResult , limit ) ) ;
416+ dispatch ( fetchServiceTaskList ( updatedFilter , null , activePage , limit ) ) ;
416417 }
417418 } , [ isAssigned ] ) ;
418419
@@ -728,8 +729,13 @@ const extraItems = isFilterCreator ? [
728729 dispatch ( setBPMTaskLoader ( true ) ) ;
729730 dispatch ( setBPMTaskListActivePage ( 1 ) ) ;
730731 dispatch (
731- fetchServiceTaskList ( cloneDeep ( updatedParams ) , null , firstResult , limit )
732+ fetchServiceTaskList ( cloneDeep ( updatedParams ) , null , activePage , limit )
732733 ) ;
734+ } else if ( filterCached ) {
735+ dispatch ( resetTaskListParams ( { filterCached :false } ) ) ;
736+ dispatch (
737+ fetchServiceTaskList ( cloneDeep ( updatedParams ) , null , activePage , limit )
738+ ) ;
733739 }
734740 } , [
735741 selectedAttributeFilterId ,
@@ -740,8 +746,6 @@ const extraItems = isFilterCreator ? [
740746 bpmattributeFilterList ,
741747 selectedFilter ,
742748 sortParams ,
743- firstResult ,
744- limit ,
745749 reqData ,
746750 ] ) ;
747751
@@ -800,14 +804,14 @@ const extraItems = isFilterCreator ? [
800804 dispatch ( setBPMTaskLoader ( true ) ) ;
801805 dispatch ( setBPMTaskListActivePage ( 1 ) ) ;
802806 dispatch (
803- fetchServiceTaskList ( formattedReqData , null , firstResult , limit )
807+ fetchServiceTaskList ( formattedReqData , null , activePage , limit )
804808 ) ;
805809 }
806810 } , [
807811 dispatch ,
808812 reqData ,
809813 selectedFilter ,
810- firstResult ,
814+ activePage ,
811815 limit ,
812816 searchParams ,
813817 bpmFiltersList ,
@@ -885,17 +889,17 @@ const extraItems = isFilterCreator ? [
885889 ( newLimit ) => {
886890 dispatch ( setBPMTaskLoader ( true ) ) ;
887891 dispatch ( setTaskListLimit ( newLimit ) ) ;
888- dispatch ( fetchServiceTaskList ( reqData , null , firstResult , newLimit ) ) ;
892+ dispatch ( setBPMTaskListActivePage ( 1 ) ) ;
893+ dispatch ( fetchServiceTaskList ( reqData , null , 1 , newLimit ) ) ;
889894 } ,
890- [ dispatch , reqData , firstResult ]
895+ [ dispatch , reqData , activePage ]
891896 ) ;
892897
893898 const handlePageChange = useCallback (
894899 ( pageNumber ) => {
895900 dispatch ( setBPMTaskListActivePage ( pageNumber ) ) ;
896901 dispatch ( setBPMTaskLoader ( true ) ) ;
897- const firstResultIndex = limit * pageNumber - limit ;
898- dispatch ( fetchServiceTaskList ( reqData , null , firstResultIndex , limit ) ) ;
902+ dispatch ( fetchServiceTaskList ( reqData , null , pageNumber , limit ) ) ;
899903 } ,
900904 [ dispatch , limit , reqData ]
901905 ) ;
0 commit comments