fix(SystemsTable): Do not spread current params on reset

RedHatInsights · Sep 25, 2023 · dfee2c7 · dfee2c7
1 parent eb9c80e
commit dfee2c7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git 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/Helpers/TableToolbarHelper.test.js b/src/Helpers/TableToolbarHelper.test.js
@@ -26,7 +26,7 @@ const mockApply = jest.fn();
 
 describe('TableToolbarHelper', () => {
     afterEach(() => {
-      jest.clearAllMocks();
+        jest.clearAllMocks();
     });
 
     it('Should handleChangePage apply with provided page', () => {
@@ -156,7 +156,7 @@ describe('TableToolbarHelper', () => {
     it('Should reset to default filters when given and reset is ture', () => {
         removeFilters([mockGeneralChip], mockApply, true, { rule_presence: "true" });
         expect(mockApply).toHaveBeenCalledTimes(1);
-        expect(mockApply).toHaveBeenCalledWith({ rule_presence: 'true', page: 1 });
+        expect(mockApply).toHaveBeenCalledWith({ rule_presence: 'true', page: 1, reset: true });
     });
 
     it('Should remove search filters and multi value filters with only one value safely', () => {

diff --git 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,