From 210e50e832f63646fe498b1675d4e5fcd4be2f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Gra=CC=88=C3=9Fl?= Date: Mon, 25 Sep 2023 17:03:42 +0200 Subject: [PATCH] fix(SystemsTable): Do not spread current params on reset --- src/Helpers/TableToolbarHelper.js | 2 +- src/Store/Reducers/SystemsPageStore.js | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Helpers/TableToolbarHelper.js b/src/Helpers/TableToolbarHelper.js index 09cdab65c2..fd01ac9220 100644 --- a/src/Helpers/TableToolbarHelper.js +++ b/src/Helpers/TableToolbarHelper.js @@ -102,7 +102,7 @@ export const buildActiveFilters = (currentFilters, filterRuleValues = []) => { export const removeFilters = (chips, apply, reset = false, defaultFilters = {}) => { if (reset) { - apply({ ...defaultFilters, page: 1 }); + apply({ ...defaultFilters, page: 1, reset }); return; } diff --git a/src/Store/Reducers/SystemsPageStore.js b/src/Store/Reducers/SystemsPageStore.js index 9a4515c43f..e8302e9100 100644 --- a/src/Store/Reducers/SystemsPageStore.js +++ b/src/Store/Reducers/SystemsPageStore.js @@ -25,13 +25,17 @@ export const initialState = { export const SystemsPageStore = (state = initialState, action) => { let newState = { ...state }; switch (action.type) { - case ActionTypes.CHANGE_SYSTEMS_PARAMS: + case ActionTypes.CHANGE_SYSTEMS_PARAMS: { + const { reset, ...params } = action.payload; newState.params = { - ...newState.params, - ...action.payload, + ...!reset ? newState.params : {}, + ...params, page_size: action.payload.page_size || newState.params.page_size }; + return newState; + } + case ActionTypes.CHANGE_COLUMNS_SYSTEM_LIST: return { ...newState,