From 02b3c87eeef5521ff97052088ce372145e4a360c Mon Sep 17 00:00:00 2001 From: Kyrylo Shmidt Date: Wed, 27 Nov 2024 17:13:10 +0100 Subject: [PATCH 1/2] Fix global errors state reset --- src/store/errors/errorsSlice.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/store/errors/errorsSlice.ts b/src/store/errors/errorsSlice.ts index a2fbadd6e..e3511a41d 100644 --- a/src/store/errors/errorsSlice.ts +++ b/src/store/errors/errorsSlice.ts @@ -57,7 +57,10 @@ const selectedFiltersInitialState: GlobalErrorsSelectedFiltersState = { handlingTypes: [] }; -export const globalErrorsWithoutFiltersInitialState = { +export const globalErrorsWithoutFiltersInitialState: Omit< + ErrorsState, + "globalErrorsSelectedFilters" +> = { globalErrorsList: null, globalErrorsTotalCount: 0, areGlobalErrorsLoading: false, @@ -71,8 +74,8 @@ export const globalErrorsWithoutFiltersInitialState = { errorTypes: null }, globalErrorsViewMode: ViewMode.All, - globalErrorsSelectedFilters: null, - globalErrorsLastDays: DAYS_FILTER_DEFAULT_VALUE + globalErrorsLastDays: DAYS_FILTER_DEFAULT_VALUE, + errorDetailsWorkspaceItemsOnly: false }; export const globalErrorsInitialState = { From 07bfe71a9b787f0784f37880aeaf3f92560ec076 Mon Sep 17 00:00:00 2001 From: Kyrylo Shmidt Date: Wed, 27 Nov 2024 17:43:32 +0100 Subject: [PATCH 2/2] Fix global errors initial state --- src/store/errors/errorsSlice.ts | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/store/errors/errorsSlice.ts b/src/store/errors/errorsSlice.ts index e3511a41d..647fd7f18 100644 --- a/src/store/errors/errorsSlice.ts +++ b/src/store/errors/errorsSlice.ts @@ -50,16 +50,9 @@ export interface ErrorsState { globalErrorsLastDays?: number; } -const selectedFiltersInitialState: GlobalErrorsSelectedFiltersState = { - endpoints: [], - errorTypes: [], - criticalities: [], - handlingTypes: [] -}; - export const globalErrorsWithoutFiltersInitialState: Omit< ErrorsState, - "globalErrorsSelectedFilters" + "globalErrorsSelectedFilters" | "errorDetailsWorkspaceItemsOnly" > = { globalErrorsList: null, globalErrorsTotalCount: 0, @@ -74,13 +67,15 @@ export const globalErrorsWithoutFiltersInitialState: Omit< errorTypes: null }, globalErrorsViewMode: ViewMode.All, - globalErrorsLastDays: DAYS_FILTER_DEFAULT_VALUE, - errorDetailsWorkspaceItemsOnly: false + globalErrorsLastDays: DAYS_FILTER_DEFAULT_VALUE }; -export const globalErrorsInitialState = { +export const globalErrorsInitialState: Omit< + ErrorsState, + "errorDetailsWorkspaceItemsOnly" +> = { ...globalErrorsWithoutFiltersInitialState, - globalErrorsSelectedFilters: selectedFiltersInitialState + globalErrorsSelectedFilters: null }; export const initialState: ErrorsState = { @@ -117,7 +112,14 @@ export const errorsSlice = createSlice({ filters: ErrorsState["globalErrorsSelectedFilters"] ) => set({ globalErrorsSelectedFilters: filters }), resetGlobalErrorsSelectedFilters: () => - set({ globalErrorsSelectedFilters: selectedFiltersInitialState }), + set({ + globalErrorsSelectedFilters: { + endpoints: [], + errorTypes: [], + criticalities: [], + handlingTypes: [] + } + }), setErrorDetailsWorkspaceItemsOnly: ( errorDetailsWorkspaceItemsOnly: boolean ) => set({ errorDetailsWorkspaceItemsOnly }),