diff --git a/src/components/results/common/update-computation-columns-filters.ts b/src/components/results/common/column-filter/update-computation-columns-filters.ts similarity index 77% rename from src/components/results/common/update-computation-columns-filters.ts rename to src/components/results/common/column-filter/update-computation-columns-filters.ts index 4bf3aa3106..c115e21e9d 100644 --- a/src/components/results/common/update-computation-columns-filters.ts +++ b/src/components/results/common/column-filter/update-computation-columns-filters.ts @@ -4,8 +4,8 @@ * 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 { updateComputationResultFiltersColumn } from '../../../services/study/study-config'; +import { FilterConfig, FilterType } from '../../../../types/custom-aggrid-types'; +import { updateComputationResultFiltersColumn } from '../../../../services/study/study-config'; import { GridApi } from 'ag-grid-community'; import { UUID } from 'node:crypto'; @@ -23,16 +23,16 @@ export const updateComputationColumnsFilters = ( } const filter = filters?.find((f) => f.column === colId); onBeforePersist?.(); - const columnDto = { + const columnFilterInfos = { columnId: colId, columnFilterInfos: filter ? { filterDataType: filter?.dataType, filterType: filter?.type, - filterValue: filter?.value, + filterValue: JSON.stringify(filter?.value), filterTolerance: filter?.tolerance, } : null, }; - updateComputationResultFiltersColumn(studyUuid, filterType, filterSubType, columnDto).then(); + updateComputationResultFiltersColumn(studyUuid, filterType, filterSubType, columnFilterInfos).then(); }; diff --git a/src/components/results/common/global-filter/use-computation-column-filters.ts b/src/components/results/common/column-filter/use-computation-column-filters.ts similarity index 71% rename from src/components/results/common/global-filter/use-computation-column-filters.ts rename to src/components/results/common/column-filter/use-computation-column-filters.ts index 3d55c5f32b..462deff073 100644 --- a/src/components/results/common/global-filter/use-computation-column-filters.ts +++ b/src/components/results/common/column-filter/use-computation-column-filters.ts @@ -15,23 +15,19 @@ export type ComputationResultColumnFilterInfos = { columnId: string; columnFilterInfos: FilterConfig; }; -function toColumnFilterInfos(infos: ComputationResultColumnFilterInfos[] | null): FilterConfig[] { +function toFilterConfig(infos: ComputationResultColumnFilterInfos[] | null): FilterConfig[] { if (!Array.isArray(infos)) { return EMPTY_ARRAY; } - return infos.flatMap(mapColumnFilters); -} - -function mapColumnFilters({ columnId, columnFilterInfos }: ComputationResultColumnFilterInfos): FilterConfig[] { - const filters = Array.isArray(columnFilterInfos) ? columnFilterInfos : [columnFilterInfos]; - - return filters.map((filter) => ({ - column: columnId, - value: filter.filterValue, - type: filter.filterType, - dataType: filter.filterDataType, - tolerance: filter.filterTolerance ?? undefined, - })); + return infos.flatMap(({ columnId, columnFilterInfos }) => + (Array.isArray(columnFilterInfos) ? columnFilterInfos : [columnFilterInfos]).map((filter) => ({ + column: columnId, + value: JSON.parse(filter.filterValue), + type: filter.filterType, + dataType: filter.filterDataType, + tolerance: filter.filterTolerance, + })) + ); } const EMPTY_ARRAY: FilterConfig[] = []; @@ -41,7 +37,7 @@ export function useComputationColumnFilters(filterType: FilterType, computationS useEffect(() => { studyUuid && getComputationResultColumnFilters(studyUuid, filterType, computationSubType).then((infos) => { - const filters = toColumnFilterInfos(infos); + const filters = toFilterConfig(infos); dispatch(updateColumnFiltersAction(filterType, computationSubType, filters)); }); }, [dispatch, studyUuid, filterType, computationSubType]); diff --git a/src/components/results/dynamicsimulation/dynamic-simulation-result-timeline.tsx b/src/components/results/dynamicsimulation/dynamic-simulation-result-timeline.tsx index 029e1d610d..10f5cf86f2 100644 --- a/src/components/results/dynamicsimulation/dynamic-simulation-result-timeline.tsx +++ b/src/components/results/dynamicsimulation/dynamic-simulation-result-timeline.tsx @@ -29,7 +29,7 @@ import { } from '../../custom-aggrid/custom-aggrid-filters/custom-aggrid-filter.type'; import { AGGRID_LOCALES } from '../../../translations/not-intl/aggrid-locales'; import { fetchDynamicSimulationResultTimeline } from '../../../services/study/dynamic-simulation'; -import { updateComputationColumnsFilters } from '../common/update-computation-columns-filters'; +import { updateComputationColumnsFilters } from '../common/column-filter/update-computation-columns-filters'; import { useAgGridInitialColumnFilters } from '../common/use-ag-grid-initial-column-filters'; const styles = { diff --git a/src/components/results/loadflow/load-flow-result-tab.tsx b/src/components/results/loadflow/load-flow-result-tab.tsx index e35c9951e4..9c9593a1a3 100644 --- a/src/components/results/loadflow/load-flow-result-tab.tsx +++ b/src/components/results/loadflow/load-flow-result-tab.tsx @@ -55,7 +55,7 @@ import { useLoadFlowResultColumnActions } from './use-load-flow-result-column-ac import { useOpenLoaderShortWait } from '../../dialogs/commons/handle-loader'; import { RESULTS_LOADING_DELAY } from '../../network/constants'; import { useComputationGlobalFilters } from '../common/global-filter/use-computation-global-filters'; -import { useComputationColumnFilters } from '../common/global-filter/use-computation-column-filters'; +import { useComputationColumnFilters } from '../common/column-filter/use-computation-column-filters'; const styles = { flexWrapper: { diff --git a/src/components/results/loadflow/load-flow-result-utils.ts b/src/components/results/loadflow/load-flow-result-utils.ts index 2586567444..0edeb7a5cd 100644 --- a/src/components/results/loadflow/load-flow-result-utils.ts +++ b/src/components/results/loadflow/load-flow-result-utils.ts @@ -10,13 +10,11 @@ import { CountryAdequacy, ExchangePair, ExchangeValue, - LimitTypes, OverloadedEquipment, OverloadedEquipmentFromBack, } from './load-flow-result.type'; import { IntlShape } from 'react-intl'; import { ColDef, ICellRendererParams, ValueFormatterParams, ValueGetterParams } from 'ag-grid-community'; -import { BranchSide } from '../../utils/constants'; import { UNDEFINED_ACCEPTABLE_DURATION } from '../../utils/utils'; import { makeAgGridCustomHeaderColumn } from 'components/custom-aggrid/utils/custom-aggrid-header-utils'; import { JSX, useEffect, useState } from 'react'; @@ -49,15 +47,16 @@ import { } from '../../custom-aggrid/custom-aggrid-filters/custom-aggrid-filter.type'; import { convertDuration, formatNAValue } from 'components/custom-aggrid/utils/format-values-utils'; import { SubjectIdRendererType } from '../securityanalysis/security-analysis.type'; -import { updateComputationColumnsFilters } from '../common/update-computation-columns-filters'; +import { updateComputationColumnsFilters } from '../common/column-filter/update-computation-columns-filters'; import { SortParams } from '../../custom-aggrid/hooks/use-custom-aggrid-sort'; +import { BranchSide } from '../../utils/constants'; -export const convertSide = (side: string | undefined, intl: IntlShape) => { +export const convertSide = (side: string | undefined, intl: IntlShape): string => { return side === BranchSide.ONE ? intl.formatMessage({ id: 'Side1' }) : side === BranchSide.TWO ? intl.formatMessage({ id: 'Side2' }) - : undefined; + : ''; }; export const FROM_COLUMN_TO_FIELD_LIMIT_VIOLATION_RESULT: Record = { @@ -139,7 +138,7 @@ export const makeData = ( patlLimit: overloadedEquipment.patlLimit, limitName: translateLimitNameBackToFront(overloadedEquipment.limitName, intl), nextLimitName: translateLimitNameBackToFront(overloadedEquipment.nextLimitName, intl), - side: convertSide(overloadedEquipment.side, intl), + side: overloadedEquipment.side, limitType: overloadedEquipment.limitType, }; }); @@ -373,13 +372,12 @@ export const loadFlowCurrentViolationsColumnsDefinition = ( getOptionLabel: getEnumLabel, } ), + valueGetter: (value: ValueGetterParams) => value.data.side, + valueFormatter: (params: ValueFormatterParams) => getEnumLabel(params.value), }), ]; }; -export const formatLimitType = (limitType: string, intl: IntlShape) => { - return limitType in LimitTypes ? intl.formatMessage({ id: limitType }) : limitType; -}; export const loadFlowVoltageViolationsColumnsDefinition = ( intl: IntlShape, filterEnums: FilterEnumsType, @@ -417,9 +415,8 @@ export const loadFlowVoltageViolationsColumnsDefinition = ( getOptionLabel: getEnumLabel, } ), - valueGetter: (value: ValueGetterParams) => { - return formatLimitType(value.data.limitType, intl); - }, + valueGetter: (value: ValueGetterParams) => value.data.limitType, + valueFormatter: (params: ValueFormatterParams) => getEnumLabel(params.value), }), makeAgGridCustomHeaderColumn( makeAgGridFloatColumn('VoltageViolationLimit', 'limit', intl, sortParams, filterParams) @@ -466,6 +463,8 @@ export const componentColumnsDefinition = ( getOptionLabel: getEnumLabel, } ), + valueGetter: (value: ValueGetterParams) => value.data.status, + valueFormatter: (params: ValueFormatterParams) => getEnumLabel(params.value), cellRenderer: statusCellRender, }), makeAgGridCustomHeaderColumn({ diff --git a/src/components/results/pccmin/pcc-min-result.tsx b/src/components/results/pccmin/pcc-min-result.tsx index 905c4057bb..1cd3a2ce2a 100644 --- a/src/components/results/pccmin/pcc-min-result.tsx +++ b/src/components/results/pccmin/pcc-min-result.tsx @@ -25,7 +25,7 @@ import { UUID } from 'node:crypto'; import { PccMinExportButton } from './pcc-min-export-button'; import { buildValidGlobalFilters } from '../common/global-filter/build-valid-global-filters'; import { GlobalFilter } from '../common/global-filter/global-filter-types'; -import { useComputationColumnFilters } from '../common/global-filter/use-computation-column-filters'; +import { useComputationColumnFilters } from '../common/column-filter/use-computation-column-filters'; interface PccMinResultProps { studyUuid: UUID; diff --git a/src/components/results/pccmin/pcc-min-result.type.ts b/src/components/results/pccmin/pcc-min-result.type.ts index 4d4c48f96a..6ea0993cea 100644 --- a/src/components/results/pccmin/pcc-min-result.type.ts +++ b/src/components/results/pccmin/pcc-min-result.type.ts @@ -21,7 +21,7 @@ import { PCCMIN_ANALYSIS_RESULT_SORT_STORE, PCCMIN_RESULT } from 'utils/store-so import { IntlShape } from 'react-intl'; import { makeAgGridCustomHeaderColumn } from 'components/custom-aggrid/utils/custom-aggrid-header-utils'; import { GridApi, ICellRendererParams } from 'ag-grid-community'; -import { updateComputationColumnsFilters } from '../common/update-computation-columns-filters'; +import { updateComputationColumnsFilters } from '../common/column-filter/update-computation-columns-filters'; export interface SinglePccMinResultInfos { singlePccMinResultUuid: string; diff --git a/src/components/results/securityanalysis/security-analysis-result-n.tsx b/src/components/results/securityanalysis/security-analysis-result-n.tsx index 67b3ebcc81..b7459c6a38 100644 --- a/src/components/results/securityanalysis/security-analysis-result-n.tsx +++ b/src/components/results/securityanalysis/security-analysis-result-n.tsx @@ -13,7 +13,6 @@ import { } from './security-analysis.type'; import { IntlShape, useIntl } from 'react-intl'; import { SecurityAnalysisTable } from './security-analysis-table'; -import { convertSide } from '../loadflow/load-flow-result-utils'; import { translateLimitNameBackToFront } from '../common/utils'; import { MAX_INT32 } from 'services/utils'; @@ -32,9 +31,7 @@ export const SecurityAnalysisResultN: FunctionComponent element.id), - status: status - ? intl.formatMessage({ - id: status, - }) - : '', + status: status, violationCount: subjectLimitViolations.length, }); subjectLimitViolations?.forEach((constraint: Constraint) => { @@ -117,11 +113,7 @@ export const flattenNmKResultsContingencies = (intl: IntlShape, result: Constrai rows.push({ subjectId: subjectId, locationId: limitViolation.locationId, - limitType: limitViolation.limitType - ? intl.formatMessage({ - id: limitViolation.limitType, - }) - : '', + limitType: limitViolation.limitType, limit: limitViolation.limit, patlLimit: limitViolation.patlLimit, value: limitViolation.value, @@ -129,7 +121,7 @@ export const flattenNmKResultsContingencies = (intl: IntlShape, result: Constrai patlLoading: limitViolation.patlLoading, limitName: translateLimitNameBackToFront(limitViolation.limitName, intl), nextLimitName: translateLimitNameBackToFront(limitViolation.nextLimitName, intl), - side: limitViolation.side ? intl.formatMessage({ id: limitViolation.side }) : '', + side: limitViolation.side, linkedElementId: contingencyId, // TODO: Remove this check after fixing the acceptableDuration issue on the Powsybl side acceptableDuration: @@ -156,19 +148,11 @@ export const flattenNmKResultsConstraints = (intl: IntlShape, result: Contingenc rows.push({ contingencyId: contingency.contingencyId, contingencyEquipmentsIds: contingency.elements?.map((element) => element.id), - status: contingency.status - ? intl.formatMessage({ - id: contingency.status, - }) - : '', - limitType: limitViolation.limitType - ? intl.formatMessage({ - id: limitViolation.limitType, - }) - : '', + status: contingency.status, + limitType: limitViolation.limitType, limitName: translateLimitNameBackToFront(limitViolation.limitName, intl), nextLimitName: translateLimitNameBackToFront(limitViolation.nextLimitName, intl), - side: limitViolation.side ? intl.formatMessage({ id: limitViolation.side }) : '', + side: limitViolation.side, // TODO: Remove this check after fixing the acceptableDuration issue on the Powsybl side acceptableDuration: limitViolation?.acceptableDuration === MAX_INT32 ? null : limitViolation?.acceptableDuration, @@ -313,6 +297,8 @@ export const securityAnalysisTableNColumnsDefinition = ( getOptionLabel: getEnumLabel, }, }, + valueGetter: (value: ValueGetterParams) => value.data.limitType, + valueFormatter: (params: ValueFormatterParams) => getEnumLabel(params.value), }), makeAgGridCustomHeaderColumn(makeAgGridStringColumn('Bus', 'locationId', intl, filterParams, sortParams)), makeAgGridCustomHeaderColumn({ @@ -372,6 +358,8 @@ export const securityAnalysisTableNColumnsDefinition = ( getOptionLabel: getEnumLabel, }, }, + valueGetter: (value: ValueGetterParams) => value.data.side, + valueFormatter: (params: ValueFormatterParams) => getEnumLabel(params.value), }), ]; }; @@ -408,6 +396,8 @@ export const securityAnalysisTableNmKContingenciesColumnsDefinition = ( getOptionLabel: getEnumLabel, }, }, + valueGetter: (value: ValueGetterParams) => value.data.status, + valueFormatter: (params: ValueFormatterParams) => getEnumLabel(params.value), }), makeAgGridCustomHeaderColumn({ ...makeAgGridStringColumn('Equipment', 'subjectId', intl, filterParams, { @@ -432,6 +422,8 @@ export const securityAnalysisTableNmKContingenciesColumnsDefinition = ( getOptionLabel: getEnumLabel, }, }, + valueGetter: (value: ValueGetterParams) => value.data.limitType, + valueFormatter: (params: ValueFormatterParams) => getEnumLabel(params.value), }), makeAgGridCustomHeaderColumn( makeAgGridStringColumn('Bus', 'locationId', intl, filterParams, { @@ -532,6 +524,8 @@ export const securityAnalysisTableNmKContingenciesColumnsDefinition = ( getOptionLabel: getEnumLabel, }, }, + valueGetter: (value: ValueGetterParams) => value.data.side, + valueFormatter: (params: ValueFormatterParams) => getEnumLabel(params.value), }), //the following column is used purely to determine which rows are a group 'parent' and which are its 'children' //it is used for sorting actions @@ -582,6 +576,8 @@ export const securityAnalysisTableNmKConstraintsColumnsDefinition = ( getOptionLabel: getEnumLabel, }, }, + valueGetter: (value: ValueGetterParams) => value.data.status, + valueFormatter: (params: ValueFormatterParams) => getEnumLabel(params.value), }), makeAgGridCustomHeaderColumn({ headerName: intl.formatMessage({ id: 'ViolationType' }), @@ -599,6 +595,8 @@ export const securityAnalysisTableNmKConstraintsColumnsDefinition = ( getOptionLabel: getEnumLabel, }, }, + valueGetter: (value: ValueGetterParams) => value.data.limitType, + valueFormatter: (params: ValueFormatterParams) => getEnumLabel(params.value), }), makeAgGridCustomHeaderColumn( makeAgGridStringColumn('Bus', 'locationId', intl, filterParams, { @@ -690,6 +688,8 @@ export const securityAnalysisTableNmKConstraintsColumnsDefinition = ( getOptionLabel: getEnumLabel, }, }, + valueGetter: (value: ValueGetterParams) => value.data.side, + valueFormatter: (params: ValueFormatterParams) => getEnumLabel(params.value), }), //the following column is used purely to determine which rows are a group 'parent' and which are its 'children' //it is used for sorting actions diff --git a/src/components/results/securityanalysis/use-security-analysis-column-defs.tsx b/src/components/results/securityanalysis/use-security-analysis-column-defs.tsx index a0740de2ee..2b43ba4b2d 100644 --- a/src/components/results/securityanalysis/use-security-analysis-column-defs.tsx +++ b/src/components/results/securityanalysis/use-security-analysis-column-defs.tsx @@ -54,10 +54,12 @@ export const useSecurityAnalysisColumnsDefs: UseSecurityAnalysisColumnsDefsProps const getEnumLabel = useCallback( (value: string) => - intl.formatMessage({ - id: value, - defaultMessage: value, - }), + value + ? intl.formatMessage({ + id: value, + defaultMessage: value, + }) + : '', [intl] ); 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 85afbf28aa..a9be7d9b98 100644 --- a/src/components/results/sensitivity-analysis/paged-sensitivity-analysis-result.tsx +++ b/src/components/results/sensitivity-analysis/paged-sensitivity-analysis-result.tsx @@ -33,8 +33,8 @@ import { AppState } from '../../../redux/reducer'; import { SensitivityResult, SensitivityResultFilterOptions } from '../../../services/study/sensitivity-analysis.type'; 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'; +import { useComputationColumnFilters } from '../common/column-filter/use-computation-column-filters'; export type PagedSensitivityAnalysisResultProps = { studyUuid: UUID; diff --git a/src/components/results/sensitivity-analysis/sensitivity-analysis-result.tsx b/src/components/results/sensitivity-analysis/sensitivity-analysis-result.tsx index 2f49038dc4..ed89bfc5bb 100644 --- a/src/components/results/sensitivity-analysis/sensitivity-analysis-result.tsx +++ b/src/components/results/sensitivity-analysis/sensitivity-analysis-result.tsx @@ -31,7 +31,7 @@ import { FILTER_TEXT_COMPARATORS, } from '../../custom-aggrid/custom-aggrid-filters/custom-aggrid-filter.type'; import { getColumnHeaderDisplayNames } from 'components/utils/column-constant'; -import { updateComputationColumnsFilters } from '../common/update-computation-columns-filters'; +import { updateComputationColumnsFilters } from '../common/column-filter/update-computation-columns-filters'; import type { UUID } from 'node:crypto'; import { useAgGridInitialColumnFilters } from '../common/use-ag-grid-initial-column-filters'; diff --git a/src/components/results/shortcircuit/shortcircuit-analysis-result-table.tsx b/src/components/results/shortcircuit/shortcircuit-analysis-result-table.tsx index 805c3bbb7c..b7ab69b0ec 100644 --- a/src/components/results/shortcircuit/shortcircuit-analysis-result-table.tsx +++ b/src/components/results/shortcircuit/shortcircuit-analysis-result-table.tsx @@ -15,6 +15,7 @@ import { ICellRendererParams, RowClassParams, RowDataUpdatedEvent, + ValueFormatterParams, ValueGetterParams, } from 'ag-grid-community'; import { getNoRowsMessage, getRows, useIntlResultStatusMessages } from '../../utils/aggrid-rows-handler'; @@ -28,7 +29,6 @@ import { unitToKiloUnit, } from '@gridsuite/commons-ui'; import { makeAgGridCustomHeaderColumn } from '../../custom-aggrid/utils/custom-aggrid-header-utils'; -import { convertSide } from '../loadflow/load-flow-result-utils'; import { CustomAggridComparatorFilter } from '../../custom-aggrid/custom-aggrid-filters/custom-aggrid-comparator-filter'; import { CustomAggridAutocompleteFilter } from '../../custom-aggrid/custom-aggrid-filters/custom-aggrid-autocomplete-filter'; import { SHORTCIRCUIT_ANALYSIS_RESULT_SORT_STORE } from '../../../utils/store-sort-filter-fields'; @@ -49,7 +49,7 @@ import { import { AGGRID_LOCALES } from '../../../translations/not-intl/aggrid-locales'; import { useWorkspacePanelActions } from 'components/workspace/hooks/use-workspace-panel-actions'; import { PanelType } from '../../workspace/types/workspace.types'; -import { updateComputationColumnsFilters } from '../common/update-computation-columns-filters'; +import { updateComputationColumnsFilters } from '../common/column-filter/update-computation-columns-filters'; import type { UUID } from 'node:crypto'; import { useAgGridInitialColumnFilters } from '../common/use-ag-grid-initial-column-filters'; @@ -134,10 +134,12 @@ const ShortCircuitAnalysisResultTable: FunctionComponent - intl.formatMessage({ - id: value, - defaultMessage: value, - }), + value + ? intl.formatMessage({ + id: value, + defaultMessage: value, + }) + : '', [intl] ); @@ -237,6 +239,8 @@ const ShortCircuitAnalysisResultTable: FunctionComponent value.data.faultType, + valueFormatter: (params: ValueFormatterParams) => getEnumLabel(params.value), }), makeAgGridCustomHeaderColumn({ headerName: intl.formatMessage({ id: 'Feeders' }), @@ -267,6 +271,8 @@ const ShortCircuitAnalysisResultTable: FunctionComponent value.data.side, + valueFormatter: (params: ValueFormatterParams) => getEnumLabel(params.value), }), { ...makeAgGridCustomHeaderColumn({ @@ -276,6 +282,8 @@ const ShortCircuitAnalysisResultTable: FunctionComponent value.data.limitType, + valueFormatter: (params: ValueFormatterParams) => getEnumLabel(params.value), }), minWidth: 150, }, @@ -422,9 +430,7 @@ const ShortCircuitAnalysisResultTable: FunctionComponent 0) { let lv = limitViolations[0]; firstLimitViolation = { - limitType: intl.formatMessage({ - id: lv.limitType, - }), + limitType: lv.limitType, }; } @@ -436,7 +442,7 @@ const ShortCircuitAnalysisResultTable: FunctionComponent { rows.push({ - limitType: intl.formatMessage({ - id: lv.limitType, - }), + limitType: lv.limitType, limitMin: lv.limitType === 'LOW_SHORT_CIRCUIT_CURRENT' ? lv.limit : null, limitMax: lv.limitType === 'HIGH_SHORT_CIRCUIT_CURRENT' ? lv.limit : null, current: lv.value, @@ -473,13 +477,13 @@ const ShortCircuitAnalysisResultTable: FunctionComponent flattenResult(result), [flattenResult, result]); diff --git a/src/components/results/shortcircuit/shortcircuit-analysis-result.tsx b/src/components/results/shortcircuit/shortcircuit-analysis-result.tsx index 98dde8e2fe..62641e2606 100644 --- a/src/components/results/shortcircuit/shortcircuit-analysis-result.tsx +++ b/src/components/results/shortcircuit/shortcircuit-analysis-result.tsx @@ -39,7 +39,7 @@ import { FilterEnumsType } from '../../custom-aggrid/custom-aggrid-filters/custo import { usePaginationSelector } from 'hooks/use-pagination-selector'; import { GlobalFilter } from '../common/global-filter/global-filter-types'; import { buildValidGlobalFilters } from '../common/global-filter/build-valid-global-filters'; -import { useComputationColumnFilters } from '../common/global-filter/use-computation-column-filters'; +import { useComputationColumnFilters } from '../common/column-filter/use-computation-column-filters'; interface IShortCircuitAnalysisGlobalResultProps { analysisType: ShortCircuitAnalysisType; diff --git a/src/services/study/study-config.ts b/src/services/study/study-config.ts index 9d6151b291..35f48585b5 100644 --- a/src/services/study/study-config.ts +++ b/src/services/study/study-config.ts @@ -264,7 +264,7 @@ export function updateComputationResultFiltersColumn( studyUuid: UUID, filterType: FilterType, filterSubType: string, - column: any + columnFilterInfos: any ) { const url = `${getStudyUrl(studyUuid)}/computation-result-filters/${filterType}/${filterSubType}/columns`; return backendFetchJson(url, { @@ -272,6 +272,6 @@ export function updateComputationResultFiltersColumn( headers: { 'Content-Type': 'application/json', }, - body: JSON.stringify(column), + body: JSON.stringify(columnFilterInfos), }); }