fix(ui) - url search page reset

This commit is contained in:
Shekar Siri 2023-03-30 16:13:08 +02:00
parent 1f33442756
commit 60134bfe7a
2 changed files with 8 additions and 4 deletions

View file

@ -17,7 +17,7 @@ const SessionSearchQueryParamHandler = (props: Props) => {
const applyFilterFromQuery = () => {
const filter = getFiltersFromQuery(history.location.search, appliedFilter);
props.updateFilter(filter, true);
props.updateFilter(filter, true, false);
};
const generateUrlQuery = () => {

View file

@ -71,8 +71,11 @@ function reducer(state = initialState, action = {}) {
case EDIT:
return state.mergeIn(['instance'], action.instance).set('currentPage', 1);
case APPLY:
return action.fromUrl ? state.set('instance', Filter(action.filter)) : state.mergeIn(['instance'], action.filter).set('currentPage', 1);
state.mergeIn(['instance'], action.filter).set('currentPage', 1);
if (action.resetPage) {
state.set('currentPage', 1)
}
return state
case success(FETCH):
return state.set('instance', action.data);
case success(FETCH_LIST):
@ -243,10 +246,11 @@ export const applyFilter = reduceThenFetchResource((filter, force = false) => ({
force,
}));
export const updateFilter = (filter, force = false) => ({
export const updateFilter = (filter, force = false, resetPage = true) => ({
type: APPLY,
filter,
force,
resetPage,
});
export const updateCurrentPage = reduceThenFetchResource((page) => ({