Refactor global filters: simplify state management

src/components/app.jsx

@@ -38,9 +38,9 @@ import { getOptionalServices } from '../services/study/index';
 import {
     addFilterForNewSpreadsheet,
     addSortForNewSpreadsheet,
+    initOrUpdateSpreadsheetGlobalFilters,
     initTableDefinitions,
     renameTableDefinition,
-    saveSpreadsheetGlobalFilters,
     selectComputedLanguage,
     selectIsDeveloperMode,
     selectLanguage,
@@ -66,6 +66,7 @@ import useStudyNavigationSync from 'hooks/use-study-navigation-sync';
 import { useOptionalLoadingParameters } from '../hooks/use-optional-loading-parameters';
 import { SortWay } from '../types/custom-aggrid-types.ts';
 import { useBaseVoltages } from '../hooks/use-base-voltages.ts';
+import { useGlobalFilterOptions } from './results/common/global-filter/use-global-filter-options.ts';
 
 const noUserManager = { instance: null, error: null };
 
@@ -161,6 +162,8 @@ const App = () => {
 
     useBaseVoltages();
 
+    useGlobalFilterOptions();
+
     const networkVisuParamsUpdated = useCallback(
         (event) => {
             const eventData = JSON.parse(event.data);
@@ -200,7 +203,7 @@ const App = () => {
                     dispatch(renameTableDefinition(tabUuid, model.name));
                     dispatch(updateTableColumns(tabUuid, formattedColumns));
                     dispatch(addFilterForNewSpreadsheet(tabUuid, columnsFilters));
-                    dispatch(saveSpreadsheetGlobalFilters(tabUuid, formattedGlobalFilters));
+                    dispatch(initOrUpdateSpreadsheetGlobalFilters(tabUuid, formattedGlobalFilters));
                     dispatch(
                         addSortForNewSpreadsheet(tabUuid, [
                             {

src/components/report-viewer/log-table.tsx

@@ -30,7 +30,7 @@ import VisibilityOffIcon from '@mui/icons-material/VisibilityOff';
 import VisibilityIcon from '@mui/icons-material/Visibility';
 import { CustomAggridComparatorFilter } from '../custom-aggrid/custom-aggrid-filters/custom-aggrid-comparator-filter';
 import { useFilterSelector } from '../../hooks/use-filter-selector';
-import { FilterConfig, FilterType } from '../../types/custom-aggrid-types';
+import { FilterConfig, TableType } from '../../types/custom-aggrid-types';
 import {
     FILTER_DATA_TYPES,
     FILTER_TEXT_COMPARATORS,
@@ -108,7 +108,7 @@ const LogTable = ({
     const [, , , fetchLogs, fetchLogMatches] = useReportFetcher(
         reportType as keyof typeof COMPUTING_AND_NETWORK_MODIFICATION_TYPE
     );
-    const { filters } = useFilterSelector(FilterType.Logs, reportType);
+    const { filters } = useFilterSelector(TableType.Logs, reportType);
     const { pagination, setPagination } = useLogsPagination(reportType);
 
     const [selectedRowIndex, setSelectedRowIndex] = useState<number | null>(-1);
@@ -228,7 +228,7 @@ const LogTable = ({
                     filterComponent: CustomAggridComparatorFilter,
                     filterComponentParams: {
                         filterParams: {
-                            type: FilterType.Logs,
+                            type: TableType.Logs,
                             tab: reportType,
                             dataType: FILTER_DATA_TYPES.TEXT,
                             comparators: [FILTER_TEXT_COMPARATORS.CONTAINS],

src/components/results/common/column-filter/update-computation-columns-filters.ts

@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-import { FilterConfig, FilterType } from '../../../../types/custom-aggrid-types';
+import { FilterConfig, TableType } from '../../../../types/custom-aggrid-types';
 import { updateComputationResultFiltersColumn } from '../../../../services/study/study-config';
 import { GridApi } from 'ag-grid-community';
 import { UUID } from 'node:crypto';
@@ -14,11 +14,11 @@ export const updateComputationColumnsFilters = (
     filters?: FilterConfig[],
     colId?: string,
     studyUuid?: UUID,
-    filterType?: FilterType,
+    tableType?: TableType,
     filterSubType?: string,
     onBeforePersist?: () => void
 ) => {
-    if (!agGridApi || !studyUuid || !colId || !filterSubType || !filterType) {
+    if (!agGridApi || !studyUuid || !colId || !filterSubType || !tableType) {
         return;
     }
     const filter = filters?.find((f) => f.column === colId);
@@ -34,5 +34,5 @@ export const updateComputationColumnsFilters = (
               }
             : null,
     };
-    updateComputationResultFiltersColumn(studyUuid, filterType, filterSubType, columnFilterInfos).then();
+    updateComputationResultFiltersColumn(studyUuid, tableType, filterSubType, columnFilterInfos).then();
 };

src/components/results/common/column-filter/use-computation-column-filters.ts

@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-import { FilterConfig, FilterType } from '../../../../types/custom-aggrid-types';
+import { FilterConfig, TableType } from '../../../../types/custom-aggrid-types';
 import { useDispatch, useSelector } from 'react-redux';
 import { AppState } from '../../../../redux/reducer';
 import { useEffect } from 'react';
@@ -31,18 +31,18 @@ function toFilterConfig(infos: ComputationResultColumnFilterInfos[] | null): Fil
 }
 
 const EMPTY_ARRAY: FilterConfig[] = [];
-export function useComputationColumnFilters(filterType: FilterType, computationSubType: string) {
+export function useComputationColumnFilters(tableType: TableType, computationSubType: string) {
     const dispatch = useDispatch();
     const studyUuid = useSelector((state: AppState) => state.studyUuid);
     useEffect(() => {
         studyUuid &&
-            getComputationResultColumnFilters(studyUuid, filterType, computationSubType).then((infos) => {
+            getComputationResultColumnFilters(studyUuid, tableType, computationSubType).then((infos) => {
                 const filters = toFilterConfig(infos);
-                dispatch(updateColumnFiltersAction(filterType, computationSubType, filters));
+                dispatch(updateColumnFiltersAction(tableType, computationSubType, filters));
             });
-    }, [dispatch, studyUuid, filterType, computationSubType]);
+    }, [dispatch, studyUuid, tableType, computationSubType]);
     const filters = useSelector<AppState, FilterConfig[]>(
-        (state) => state.computationFilters?.[filterType]?.columnsFilters?.[computationSubType]?.columns ?? EMPTY_ARRAY
+        (state) => state.tableFilters.columnsFilters?.[tableType]?.[computationSubType]?.columns ?? EMPTY_ARRAY
     );
     return {
         filters,