diff --git a/src/components/results/sensitivity-analysis/paged-sensitivity-analysis-result.tsx b/src/components/results/sensitivity-analysis/paged-sensitivity-analysis-result.tsx index d2a827c4bb..85afbf28aa 100644 --- a/src/components/results/sensitivity-analysis/paged-sensitivity-analysis-result.tsx +++ b/src/components/results/sensitivity-analysis/paged-sensitivity-analysis-result.tsx @@ -31,9 +31,10 @@ import type { UUID } from 'node:crypto'; import { SensiKind, SENSITIVITY_AT_NODE } from './sensitivity-analysis-result.type'; import { AppState } from '../../../redux/reducer'; import { SensitivityResult, SensitivityResultFilterOptions } from '../../../services/study/sensitivity-analysis.type'; -import { GlobalFilters } from '../common/global-filter/global-filter-types'; +import { GlobalFilter } from '../common/global-filter/global-filter-types'; import { usePaginationSelector } from 'hooks/use-pagination-selector'; import { useComputationColumnFilters } from '../common/global-filter/use-computation-column-filters'; +import { buildValidGlobalFilters } from '../common/global-filter/build-valid-global-filters'; export type PagedSensitivityAnalysisResultProps = { studyUuid: UUID; @@ -43,7 +44,7 @@ export type PagedSensitivityAnalysisResultProps = { sensiKind: SensiKind; setCsvHeaders: (newHeaders: string[]) => void; setIsCsvButtonDisabled: (newIsCsv: boolean) => void; - globalFilters?: GlobalFilters; + globalFilter: GlobalFilter[]; }; function PagedSensitivityAnalysisResult({ @@ -54,7 +55,7 @@ function PagedSensitivityAnalysisResult({ currentRootNetworkUuid, setCsvHeaders, setIsCsvButtonDisabled, - globalFilters, + globalFilter, }: Readonly) { const intl = useIntl(); @@ -164,6 +165,7 @@ function PagedSensitivityAnalysisResult({ return { ...elem, column: newColumn }; }); setIsLoading(true); + const globalFilters = buildValidGlobalFilters(globalFilter); fetchSensitivityAnalysisResult( studyUuid, nodeUuid, @@ -191,7 +193,7 @@ function PagedSensitivityAnalysisResult({ rowsPerPage, page, filters, - globalFilters, + globalFilter, studyUuid, nodeUuid, currentRootNetworkUuid, @@ -209,7 +211,7 @@ function PagedSensitivityAnalysisResult({ fetchFilterOptions(); debouncedFetchResult(); } - }, [sensiStatus, debouncedFetchResult, fetchFilterOptions, globalFilters]); + }, [sensiStatus, debouncedFetchResult, fetchFilterOptions, globalFilter]); return ( <> diff --git a/src/components/results/sensitivity-analysis/sensitivity-analysis-result-tab.tsx b/src/components/results/sensitivity-analysis/sensitivity-analysis-result-tab.tsx index 130e5f1ea1..8f15299372 100644 --- a/src/components/results/sensitivity-analysis/sensitivity-analysis-result-tab.tsx +++ b/src/components/results/sensitivity-analysis/sensitivity-analysis-result-tab.tsx @@ -123,6 +123,7 @@ function SensitivityAnalysisResultTab({ currentRootNetworkUuid={currentRootNetworkUuid} setCsvHeaders={setCsvHeaders} setIsCsvButtonDisabled={setIsCsvButtonDisabled} + globalFilter={globalFiltersFromState} /> )}