From 4eafb8fcf872596fe1ffb08a61292059208fe578 Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Wed, 5 Feb 2025 19:14:18 +0100 Subject: [PATCH 01/11] seperate the two types of HVDC station --- .../filter/utils/filterFormUtils.ts | 34 +++++++++++++++---- src/utils/types/equipmentType.ts | 6 ++-- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/src/components/filter/utils/filterFormUtils.ts b/src/components/filter/utils/filterFormUtils.ts index 6d5218271..c66081341 100644 --- a/src/components/filter/utils/filterFormUtils.ts +++ b/src/components/filter/utils/filterFormUtils.ts @@ -9,7 +9,7 @@ import { FieldConstants } from '../../../utils/constants/fieldConstants'; import { RangeInput } from '../../inputs/reactHookForm/numbers/RangeInput'; import { CountriesInput } from '../../inputs/reactHookForm/selectInputs/CountriesInput'; import { SelectInput } from '../../inputs/reactHookForm/selectInputs/SelectInput'; -import { EquipmentType } from '../../../utils/types/equipmentType'; +import { EquipmentType, EquipmentHvdcType } from '../../../utils/types/equipmentType'; const countries = { renderer: CountriesInput, @@ -158,7 +158,7 @@ export const CONTINGENCY_LIST_EQUIPMENTS: Record< fields: [countries, nominalVoltage], }, }; -export const FILTER_EQUIPMENTS: Record< +export const FILTER_EQUIPMENTS_BASE: Record< | EquipmentType.SUBSTATION | EquipmentType.VOLTAGE_LEVEL | EquipmentType.LINE @@ -169,7 +169,6 @@ export const FILTER_EQUIPMENTS: Record< | EquipmentType.LOAD | EquipmentType.SHUNT_COMPENSATOR | EquipmentType.STATIC_VAR_COMPENSATOR - | EquipmentType.HVDC_LINE | EquipmentType.DANGLING_LINE, FormEquipment > = { @@ -223,14 +222,35 @@ export const FILTER_EQUIPMENTS: Record< label: 'StaticVarCompensators', fields: [countries, nominalVoltage], }, + DANGLING_LINE: { + id: 'DANGLING_LINE', + label: 'DanglingLines', + fields: [countries, nominalVoltage], + }, +}; + +export const FILTER_EQUIPMENTS: Record = { + ...FILTER_EQUIPMENTS_BASE, HVDC_LINE: { id: 'HVDC_LINE', label: 'Hvdc', fields: [countries1, countries2, nominalVoltage], }, - DANGLING_LINE: { - id: 'DANGLING_LINE', - label: 'DanglingLines', - fields: [countries, nominalVoltage], +}; + +export const FILTER_INDEXED_EQUIPMENTS: Record< + EquipmentHvdcType.HVDC_LINE_LCC | EquipmentHvdcType.HVDC_LINE_VSC, + FormEquipment +> = { + ...FILTER_EQUIPMENTS_BASE, + HVDC_LINE_LCC: { + id: 'HVDC_LINE_VSC', + label: 'VSC', + fields: [countries1, countries2, nominalVoltage], + }, + HVDC_LINE_VSC: { + id: 'HVDC_LINE_LCC', + label: 'LCC', + fields: [countries1, countries2, nominalVoltage], }, }; diff --git a/src/utils/types/equipmentType.ts b/src/utils/types/equipmentType.ts index b76047acc..74e5b16ef 100644 --- a/src/utils/types/equipmentType.ts +++ b/src/utils/types/equipmentType.ts @@ -78,9 +78,9 @@ export enum EquipmentType { BREAKER = 'BREAKER', } -export enum HvdcType { - LCC = 'LCC', - VSC = 'VSC', +export enum EquipmentHvdcType { + HVDC_LINE_LCC = 'HVDC_LINE_LCC', + HVDC_LINE_VSC = 'HVDC_LINE_VSC', } // Must be equivalent as the back enum From cd638848addbe85f38cd5079fda064b6264d1fb7 Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Fri, 7 Feb 2025 11:42:22 +0100 Subject: [PATCH 02/11] separate LCC and VSC tags --- src/components/filter/utils/filterFormUtils.ts | 4 ++-- src/translations/en/equipmentSearchEn.ts | 2 ++ src/translations/fr/equipmentSearchFr.ts | 2 ++ src/utils/types/equipmentType.ts | 15 ++++++++++----- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/components/filter/utils/filterFormUtils.ts b/src/components/filter/utils/filterFormUtils.ts index c66081341..f972f037e 100644 --- a/src/components/filter/utils/filterFormUtils.ts +++ b/src/components/filter/utils/filterFormUtils.ts @@ -9,7 +9,7 @@ import { FieldConstants } from '../../../utils/constants/fieldConstants'; import { RangeInput } from '../../inputs/reactHookForm/numbers/RangeInput'; import { CountriesInput } from '../../inputs/reactHookForm/selectInputs/CountriesInput'; import { SelectInput } from '../../inputs/reactHookForm/selectInputs/SelectInput'; -import { EquipmentType, EquipmentHvdcType } from '../../../utils/types/equipmentType'; +import { EquipmentType } from '../../../utils/types/equipmentType'; const countries = { renderer: CountriesInput, @@ -239,7 +239,7 @@ export const FILTER_EQUIPMENTS: Record = }; export const FILTER_INDEXED_EQUIPMENTS: Record< - EquipmentHvdcType.HVDC_LINE_LCC | EquipmentHvdcType.HVDC_LINE_VSC, + EquipmentType.HVDC_LINE_LCC | EquipmentType.HVDC_LINE_VSC, FormEquipment > = { ...FILTER_EQUIPMENTS_BASE, diff --git a/src/translations/en/equipmentSearchEn.ts b/src/translations/en/equipmentSearchEn.ts index 17a108d13..c920a8901 100644 --- a/src/translations/en/equipmentSearchEn.ts +++ b/src/translations/en/equipmentSearchEn.ts @@ -18,6 +18,8 @@ export const equipmentSearchEn = { 'equipment_search/shuntTag': 'SHUNT', 'equipment_search/svcTag': 'SVC', 'equipment_search/hvdcLineTag': 'HVDC LINE', + 'equipment_search/hvdcLineVscTag': 'HVDC LINE VSC', + 'equipment_search/hvdcLineLccTag': 'HVDC LINE LCC', 'equipment_search/hvdcStationTag': 'HVDC STATION', 'equipment_search/voltageLevelTag': 'VOLTAGE LEVEL', 'equipment_search/substationTag': 'SUBSTATION', diff --git a/src/translations/fr/equipmentSearchFr.ts b/src/translations/fr/equipmentSearchFr.ts index 6d4ee2e80..2c807f4e2 100644 --- a/src/translations/fr/equipmentSearchFr.ts +++ b/src/translations/fr/equipmentSearchFr.ts @@ -18,6 +18,8 @@ export const equipmentSearchFr = { 'equipment_search/shuntTag': 'MCS', 'equipment_search/svcTag': 'CSPR', 'equipment_search/hvdcLineTag': 'LIGNE HVDC', + 'equipment_search/hvdcLineVscTag': 'HVDC LINE VSC', + 'equipment_search/hvdcLineLccTag': 'HVDC LINE LCC', 'equipment_search/hvdcStationTag': 'STATION HVDC', 'equipment_search/voltageLevelTag': 'POSTE', 'equipment_search/substationTag': 'SITE', diff --git a/src/utils/types/equipmentType.ts b/src/utils/types/equipmentType.ts index 74e5b16ef..d5d025880 100644 --- a/src/utils/types/equipmentType.ts +++ b/src/utils/types/equipmentType.ts @@ -69,6 +69,8 @@ export enum EquipmentType { SHUNT_COMPENSATOR = 'SHUNT_COMPENSATOR', STATIC_VAR_COMPENSATOR = 'STATIC_VAR_COMPENSATOR', HVDC_LINE = 'HVDC_LINE', + HVDC_LINE_LCC = 'HVDC_LINE_LCC', + HVDC_LINE_VSC = 'HVDC_LINE_VSC', HVDC_CONVERTER_STATION = 'HVDC_CONVERTER_STATION', VSC_CONVERTER_STATION = 'VSC_CONVERTER_STATION', LCC_CONVERTER_STATION = 'LCC_CONVERTER_STATION', @@ -78,11 +80,6 @@ export enum EquipmentType { BREAKER = 'BREAKER', } -export enum EquipmentHvdcType { - HVDC_LINE_LCC = 'HVDC_LINE_LCC', - HVDC_LINE_VSC = 'HVDC_LINE_VSC', -} - // Must be equivalent as the back enum export const EQUIPMENT_TYPE: Record = { [EquipmentType.SUBSTATION]: { @@ -109,6 +106,14 @@ export const EQUIPMENT_TYPE: Record Date: Wed, 12 Feb 2025 16:30:47 +0100 Subject: [PATCH 03/11] create extended equipment type --- .../filter/utils/filterFormUtils.ts | 5 +-- src/utils/types/equipmentType.ts | 24 ++++++-------- src/utils/types/extendedEquipmentType.ts | 31 +++++++++++++++++++ src/utils/types/index.ts | 1 + 4 files changed, 42 insertions(+), 19 deletions(-) create mode 100644 src/utils/types/extendedEquipmentType.ts diff --git a/src/components/filter/utils/filterFormUtils.ts b/src/components/filter/utils/filterFormUtils.ts index f972f037e..b4ec7c867 100644 --- a/src/components/filter/utils/filterFormUtils.ts +++ b/src/components/filter/utils/filterFormUtils.ts @@ -238,10 +238,7 @@ export const FILTER_EQUIPMENTS: Record = }, }; -export const FILTER_INDEXED_EQUIPMENTS: Record< - EquipmentType.HVDC_LINE_LCC | EquipmentType.HVDC_LINE_VSC, - FormEquipment -> = { +export const FILTER_INDEXED_EQUIPMENTS = { ...FILTER_EQUIPMENTS_BASE, HVDC_LINE_LCC: { id: 'HVDC_LINE_VSC', diff --git a/src/utils/types/equipmentType.ts b/src/utils/types/equipmentType.ts index d5d025880..6d7347f69 100644 --- a/src/utils/types/equipmentType.ts +++ b/src/utils/types/equipmentType.ts @@ -69,8 +69,6 @@ export enum EquipmentType { SHUNT_COMPENSATOR = 'SHUNT_COMPENSATOR', STATIC_VAR_COMPENSATOR = 'STATIC_VAR_COMPENSATOR', HVDC_LINE = 'HVDC_LINE', - HVDC_LINE_LCC = 'HVDC_LINE_LCC', - HVDC_LINE_VSC = 'HVDC_LINE_VSC', HVDC_CONVERTER_STATION = 'HVDC_CONVERTER_STATION', VSC_CONVERTER_STATION = 'VSC_CONVERTER_STATION', LCC_CONVERTER_STATION = 'LCC_CONVERTER_STATION', @@ -81,7 +79,7 @@ export enum EquipmentType { } // Must be equivalent as the back enum -export const EQUIPMENT_TYPE: Record = { +export const EQUIPMENT_TYPE_BASE = { [EquipmentType.SUBSTATION]: { name: EquipmentType.SUBSTATION, tagLabel: 'equipment_search/substationTag', @@ -102,18 +100,6 @@ export const EQUIPMENT_TYPE: Record = { + ...EQUIPMENT_TYPE_BASE, + [EquipmentType.HVDC_LINE]: { + name: EquipmentType.HVDC_LINE, + tagLabel: 'equipment_search/hvdcLineTag', + }, +}; + export interface Identifiable { id: string; name?: string; diff --git a/src/utils/types/extendedEquipmentType.ts b/src/utils/types/extendedEquipmentType.ts new file mode 100644 index 000000000..bc8b90e19 --- /dev/null +++ b/src/utils/types/extendedEquipmentType.ts @@ -0,0 +1,31 @@ +/** + * Copyright (c) 2025, RTE (http://www.rte-france.com) + * This Source Code Form is subject to the terms of the Mozilla Public + * 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 { EQUIPMENT_TYPE, EquipmentType } from './equipmentType'; + +export const ExtendedEquipmentType = { + ...EquipmentType, + HVDC_LINE_LCC: 'HVDC_LINE_LCC', + HVDC_LINE_VSC: 'HVDC_LINE_VSC', +} as const; + +export const EQUIPMENT_INDEXED_TYPE: Record< + ExtendedEquipmentTypes, + { name: ExtendedEquipmentTypes; tagLabel: string } | undefined +> = { + ...EQUIPMENT_TYPE, + [ExtendedEquipmentType.HVDC_LINE_LCC]: { + name: ExtendedEquipmentType.HVDC_LINE_LCC, + tagLabel: 'equipment_search/hvdcLineLccTag', + }, + [ExtendedEquipmentType.HVDC_LINE_VSC]: { + name: ExtendedEquipmentType.HVDC_LINE_VSC, + tagLabel: 'equipment_search/hvdcLineVscTag', + }, +}; + +export type ExtendedEquipmentTypes = (typeof ExtendedEquipmentType)[keyof typeof ExtendedEquipmentType]; diff --git a/src/utils/types/index.ts b/src/utils/types/index.ts index 170145d01..0e4c155b3 100644 --- a/src/utils/types/index.ts +++ b/src/utils/types/index.ts @@ -11,3 +11,4 @@ export * from './metadata'; export * from './types'; export * from './modificationType'; export * from './fieldType'; +export * from './extendedEquipmentType'; From ca36aacf1d43d74756de3fb7dfd90a9b6af0b2fa Mon Sep 17 00:00:00 2001 From: Thang PHAM Date: Mon, 17 Feb 2025 18:15:09 +0100 Subject: [PATCH 04/11] LCC vs VSC (Thang's Proposition) Signed-off-by: Thang PHAM --- .../filter/utils/filterFormUtils.ts | 113 ++++++------------ src/hooks/useModificationLabelComputer.tsx | 4 +- src/utils/types/equipmentType.ts | 31 +++-- src/utils/types/extendedEquipmentType.ts | 31 ----- src/utils/types/index.ts | 1 - 5 files changed, 58 insertions(+), 122 deletions(-) delete mode 100644 src/utils/types/extendedEquipmentType.ts diff --git a/src/components/filter/utils/filterFormUtils.ts b/src/components/filter/utils/filterFormUtils.ts index b4ec7c867..5b747dd4b 100644 --- a/src/components/filter/utils/filterFormUtils.ts +++ b/src/components/filter/utils/filterFormUtils.ts @@ -8,8 +8,8 @@ import { FunctionComponent } from 'react'; import { FieldConstants } from '../../../utils/constants/fieldConstants'; import { RangeInput } from '../../inputs/reactHookForm/numbers/RangeInput'; import { CountriesInput } from '../../inputs/reactHookForm/selectInputs/CountriesInput'; -import { SelectInput } from '../../inputs/reactHookForm/selectInputs/SelectInput'; import { EquipmentType } from '../../../utils/types/equipmentType'; +import { ExtendedEquipmentType } from '../../../utils'; const countries = { renderer: CountriesInput, @@ -60,21 +60,6 @@ const nominalVoltage3 = { name: `${FieldConstants.CRITERIA_BASED}.${FieldConstants.NOMINAL_VOLTAGE_3}`, }, }; -const energySource = { - renderer: SelectInput, - props: { - label: 'EnergySourceText', - name: `${FieldConstants.CRITERIA_BASED}.${FieldConstants.ENERGY_SOURCE}`, - options: [ - { id: 'HYDRO', label: 'Hydro' }, - { id: 'NUCLEAR', label: 'Nuclear' }, - { id: 'WIND', label: 'Wind' }, - { id: 'THERMAL', label: 'Thermal' }, - { id: 'SOLAR', label: 'Solar' }, - { id: 'OTHER', label: 'Other' }, - ], - }, -}; export type FormField = { renderer: FunctionComponent; props: { @@ -158,96 +143,72 @@ export const CONTINGENCY_LIST_EQUIPMENTS: Record< fields: [countries, nominalVoltage], }, }; -export const FILTER_EQUIPMENTS_BASE: Record< - | EquipmentType.SUBSTATION - | EquipmentType.VOLTAGE_LEVEL - | EquipmentType.LINE - | EquipmentType.TWO_WINDINGS_TRANSFORMER - | EquipmentType.THREE_WINDINGS_TRANSFORMER - | EquipmentType.GENERATOR - | EquipmentType.BATTERY - | EquipmentType.LOAD - | EquipmentType.SHUNT_COMPENSATOR - | EquipmentType.STATIC_VAR_COMPENSATOR - | EquipmentType.DANGLING_LINE, - FormEquipment -> = { - SUBSTATION: { - id: 'SUBSTATION', + +const BASE_EQUIPMENTS: Partial> = { + [EquipmentType.SUBSTATION]: { + id: EquipmentType.SUBSTATION, label: 'Substations', - fields: [countries], }, - VOLTAGE_LEVEL: { - id: 'VOLTAGE_LEVEL', + [EquipmentType.VOLTAGE_LEVEL]: { + id: EquipmentType.VOLTAGE_LEVEL, label: 'VoltageLevels', - fields: [countries, nominalVoltage], }, - LINE: { - id: 'LINE', + [EquipmentType.LINE]: { + id: EquipmentType.LINE, label: 'Lines', - fields: [countries1, countries2, nominalVoltage1, nominalVoltage2], }, - TWO_WINDINGS_TRANSFORMER: { - id: 'TWO_WINDINGS_TRANSFORMER', + [EquipmentType.TWO_WINDINGS_TRANSFORMER]: { + id: EquipmentType.TWO_WINDINGS_TRANSFORMER, label: 'TwoWindingsTransformers', - fields: [countries, nominalVoltage1, nominalVoltage2], }, - THREE_WINDINGS_TRANSFORMER: { - id: 'THREE_WINDINGS_TRANSFORMER', + [EquipmentType.THREE_WINDINGS_TRANSFORMER]: { + id: EquipmentType.THREE_WINDINGS_TRANSFORMER, label: 'ThreeWindingsTransformers', - fields: [countries, nominalVoltage1, nominalVoltage2, nominalVoltage3], }, - GENERATOR: { - id: 'GENERATOR', + [EquipmentType.GENERATOR]: { + id: EquipmentType.GENERATOR, label: 'Generators', - fields: [countries, energySource, nominalVoltage], }, - BATTERY: { - id: 'BATTERY', + [EquipmentType.BATTERY]: { + id: EquipmentType.BATTERY, label: 'Batteries', - fields: [countries, nominalVoltage], }, - LOAD: { - id: 'LOAD', + [EquipmentType.LOAD]: { + id: EquipmentType.LOAD, label: 'Loads', - fields: [countries, nominalVoltage], }, - SHUNT_COMPENSATOR: { - id: 'SHUNT_COMPENSATOR', + [EquipmentType.SHUNT_COMPENSATOR]: { + id: EquipmentType.SHUNT_COMPENSATOR, label: 'ShuntCompensators', - fields: [countries, nominalVoltage], }, - STATIC_VAR_COMPENSATOR: { - id: 'STATIC_VAR_COMPENSATOR', + [EquipmentType.STATIC_VAR_COMPENSATOR]: { + id: EquipmentType.STATIC_VAR_COMPENSATOR, label: 'StaticVarCompensators', - fields: [countries, nominalVoltage], }, - DANGLING_LINE: { - id: 'DANGLING_LINE', + [EquipmentType.DANGLING_LINE]: { + id: EquipmentType.DANGLING_LINE, label: 'DanglingLines', - fields: [countries, nominalVoltage], }, }; -export const FILTER_EQUIPMENTS: Record = { - ...FILTER_EQUIPMENTS_BASE, - HVDC_LINE: { - id: 'HVDC_LINE', +export const FILTER_EQUIPMENTS: Partial> = { + ...BASE_EQUIPMENTS, + [EquipmentType.HVDC_LINE]: { + id: EquipmentType.HVDC_LINE, label: 'Hvdc', - fields: [countries1, countries2, nominalVoltage], }, }; -export const FILTER_INDEXED_EQUIPMENTS = { - ...FILTER_EQUIPMENTS_BASE, - HVDC_LINE_LCC: { - id: 'HVDC_LINE_VSC', +export const SEARCH_EQUIPMENTS: Partial< + Record +> = { + ...BASE_EQUIPMENTS, + [ExtendedEquipmentType.HVDC_LINE_LCC]: { + id: ExtendedEquipmentType.HVDC_LINE_LCC, label: 'VSC', - fields: [countries1, countries2, nominalVoltage], }, - HVDC_LINE_VSC: { - id: 'HVDC_LINE_LCC', + [ExtendedEquipmentType.HVDC_LINE_VSC]: { + id: ExtendedEquipmentType.HVDC_LINE_VSC, label: 'LCC', - fields: [countries1, countries2, nominalVoltage], }, }; diff --git a/src/hooks/useModificationLabelComputer.tsx b/src/hooks/useModificationLabelComputer.tsx index 384151375..ff435cc3d 100644 --- a/src/hooks/useModificationLabelComputer.tsx +++ b/src/hooks/useModificationLabelComputer.tsx @@ -9,7 +9,7 @@ import { useIntl } from 'react-intl'; import { useCallback } from 'react'; import { UUID } from 'crypto'; import { MODIFICATION_TYPES } from '../utils/types/modificationType'; -import { EQUIPMENT_TYPE } from '../utils/types/equipmentType'; +import { EquipmentType } from '../utils/types/equipmentType'; export interface NetworkModificationMetadata { uuid: UUID; @@ -70,7 +70,7 @@ export const useModificationLabelComputer = () => { case MODIFICATION_TYPES.BY_FILTER_DELETION.type: return intl.formatMessage({ id: - modificationMetadata.equipmentType === EQUIPMENT_TYPE.HVDC_LINE + modificationMetadata.equipmentType === EquipmentType.HVDC_LINE ? 'Hvdc' : modificationMetadata.equipmentType, }); diff --git a/src/utils/types/equipmentType.ts b/src/utils/types/equipmentType.ts index 6d7347f69..0cbe592eb 100644 --- a/src/utils/types/equipmentType.ts +++ b/src/utils/types/equipmentType.ts @@ -78,8 +78,18 @@ export enum EquipmentType { BREAKER = 'BREAKER', } +export enum ExtendedEquipmentType { + HVDC_LINE_LCC = 'HVDC_LINE_LCC', + HVDC_LINE_VSC = 'HVDC_LINE_VSC', +} + // Must be equivalent as the back enum -export const EQUIPMENT_TYPE_BASE = { +export const EQUIPMENT_TYPE: Partial< + Record< + EquipmentType | ExtendedEquipmentType, + { name: EquipmentType | ExtendedEquipmentType; tagLabel: string } | undefined + > +> = { [EquipmentType.SUBSTATION]: { name: EquipmentType.SUBSTATION, tagLabel: 'equipment_search/substationTag', @@ -100,6 +110,14 @@ export const EQUIPMENT_TYPE_BASE = { name: EquipmentType.THREE_WINDINGS_TRANSFORMER, tagLabel: 'equipment_search/3wtTag', }, + [ExtendedEquipmentType.HVDC_LINE_LCC]: { + name: ExtendedEquipmentType.HVDC_LINE_LCC, + tagLabel: 'equipment_search/hvdcLineLccTag', + }, + [ExtendedEquipmentType.HVDC_LINE_VSC]: { + name: ExtendedEquipmentType.HVDC_LINE_VSC, + tagLabel: 'equipment_search/hvdcLineVscTag', + }, [EquipmentType.GENERATOR]: { name: EquipmentType.GENERATOR, tagLabel: 'equipment_search/generatorTag', @@ -148,17 +166,6 @@ export const EQUIPMENT_TYPE_BASE = { name: EquipmentType.LCC_CONVERTER_STATION, tagLabel: 'equipment_search/lccConverterStationTag', }, - [EquipmentType.TIE_LINE]: undefined, // Not used in the UI - [EquipmentType.DISCONNECTOR]: undefined, // Not used in the UI - [EquipmentType.BREAKER]: undefined, // Not used in the UI -}; - -export const EQUIPMENT_TYPE: Record = { - ...EQUIPMENT_TYPE_BASE, - [EquipmentType.HVDC_LINE]: { - name: EquipmentType.HVDC_LINE, - tagLabel: 'equipment_search/hvdcLineTag', - }, }; export interface Identifiable { diff --git a/src/utils/types/extendedEquipmentType.ts b/src/utils/types/extendedEquipmentType.ts deleted file mode 100644 index bc8b90e19..000000000 --- a/src/utils/types/extendedEquipmentType.ts +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright (c) 2025, RTE (http://www.rte-france.com) - * This Source Code Form is subject to the terms of the Mozilla Public - * 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 { EQUIPMENT_TYPE, EquipmentType } from './equipmentType'; - -export const ExtendedEquipmentType = { - ...EquipmentType, - HVDC_LINE_LCC: 'HVDC_LINE_LCC', - HVDC_LINE_VSC: 'HVDC_LINE_VSC', -} as const; - -export const EQUIPMENT_INDEXED_TYPE: Record< - ExtendedEquipmentTypes, - { name: ExtendedEquipmentTypes; tagLabel: string } | undefined -> = { - ...EQUIPMENT_TYPE, - [ExtendedEquipmentType.HVDC_LINE_LCC]: { - name: ExtendedEquipmentType.HVDC_LINE_LCC, - tagLabel: 'equipment_search/hvdcLineLccTag', - }, - [ExtendedEquipmentType.HVDC_LINE_VSC]: { - name: ExtendedEquipmentType.HVDC_LINE_VSC, - tagLabel: 'equipment_search/hvdcLineVscTag', - }, -}; - -export type ExtendedEquipmentTypes = (typeof ExtendedEquipmentType)[keyof typeof ExtendedEquipmentType]; diff --git a/src/utils/types/index.ts b/src/utils/types/index.ts index 0e4c155b3..170145d01 100644 --- a/src/utils/types/index.ts +++ b/src/utils/types/index.ts @@ -11,4 +11,3 @@ export * from './metadata'; export * from './types'; export * from './modificationType'; export * from './fieldType'; -export * from './extendedEquipmentType'; From 2889e068a5699712037862369a9cc2db153a48f3 Mon Sep 17 00:00:00 2001 From: Thang PHAM Date: Tue, 18 Feb 2025 15:59:57 +0100 Subject: [PATCH 05/11] Correct bug label inverse Signed-off-by: Thang PHAM --- src/components/filter/utils/filterFormUtils.ts | 4 ++-- src/utils/types/equipmentType.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/filter/utils/filterFormUtils.ts b/src/components/filter/utils/filterFormUtils.ts index 5b747dd4b..54f2b0857 100644 --- a/src/components/filter/utils/filterFormUtils.ts +++ b/src/components/filter/utils/filterFormUtils.ts @@ -205,10 +205,10 @@ export const SEARCH_EQUIPMENTS: Partial< ...BASE_EQUIPMENTS, [ExtendedEquipmentType.HVDC_LINE_LCC]: { id: ExtendedEquipmentType.HVDC_LINE_LCC, - label: 'VSC', + label: 'LCC', }, [ExtendedEquipmentType.HVDC_LINE_VSC]: { id: ExtendedEquipmentType.HVDC_LINE_VSC, - label: 'LCC', + label: 'VSC', }, }; diff --git a/src/utils/types/equipmentType.ts b/src/utils/types/equipmentType.ts index 0cbe592eb..787d96441 100644 --- a/src/utils/types/equipmentType.ts +++ b/src/utils/types/equipmentType.ts @@ -181,7 +181,7 @@ export interface Equipment extends Identifiable { export interface EquipmentInfos extends Identifiable { label: string; key: string; - type: EquipmentType; + type: EquipmentType | ExtendedEquipmentType; voltageLevelLabel?: string; voltageLevelId?: string; operatingStatus?: string; From e3751d0bf6cdab29f00cf070da1452666e9cdc9a Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Fri, 21 Feb 2025 11:19:50 +0100 Subject: [PATCH 06/11] Etienne review --- .../filter/utils/filterFormUtils.ts | 13 +++++------- src/utils/types/equipmentType.ts | 20 ++++++------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/src/components/filter/utils/filterFormUtils.ts b/src/components/filter/utils/filterFormUtils.ts index 54f2b0857..aac523c55 100644 --- a/src/components/filter/utils/filterFormUtils.ts +++ b/src/components/filter/utils/filterFormUtils.ts @@ -9,7 +9,6 @@ import { FieldConstants } from '../../../utils/constants/fieldConstants'; import { RangeInput } from '../../inputs/reactHookForm/numbers/RangeInput'; import { CountriesInput } from '../../inputs/reactHookForm/selectInputs/CountriesInput'; import { EquipmentType } from '../../../utils/types/equipmentType'; -import { ExtendedEquipmentType } from '../../../utils'; const countries = { renderer: CountriesInput, @@ -199,16 +198,14 @@ export const FILTER_EQUIPMENTS: Partial -> = { +export const SEARCH_EQUIPMENTS: Partial> = { ...BASE_EQUIPMENTS, - [ExtendedEquipmentType.HVDC_LINE_LCC]: { - id: ExtendedEquipmentType.HVDC_LINE_LCC, + [EquipmentType.HVDC_LINE_LCC]: { + id: EquipmentType.HVDC_LINE_LCC, label: 'LCC', }, - [ExtendedEquipmentType.HVDC_LINE_VSC]: { - id: ExtendedEquipmentType.HVDC_LINE_VSC, + [EquipmentType.HVDC_LINE_VSC]: { + id: EquipmentType.HVDC_LINE_VSC, label: 'VSC', }, }; diff --git a/src/utils/types/equipmentType.ts b/src/utils/types/equipmentType.ts index 787d96441..7e41db859 100644 --- a/src/utils/types/equipmentType.ts +++ b/src/utils/types/equipmentType.ts @@ -76,20 +76,12 @@ export enum EquipmentType { TIE_LINE = 'TIE_LINE', DISCONNECTOR = 'DISCONNECTOR', BREAKER = 'BREAKER', -} - -export enum ExtendedEquipmentType { HVDC_LINE_LCC = 'HVDC_LINE_LCC', HVDC_LINE_VSC = 'HVDC_LINE_VSC', } // Must be equivalent as the back enum -export const EQUIPMENT_TYPE: Partial< - Record< - EquipmentType | ExtendedEquipmentType, - { name: EquipmentType | ExtendedEquipmentType; tagLabel: string } | undefined - > -> = { +export const EQUIPMENT_TYPE: Partial> = { [EquipmentType.SUBSTATION]: { name: EquipmentType.SUBSTATION, tagLabel: 'equipment_search/substationTag', @@ -110,12 +102,12 @@ export const EQUIPMENT_TYPE: Partial< name: EquipmentType.THREE_WINDINGS_TRANSFORMER, tagLabel: 'equipment_search/3wtTag', }, - [ExtendedEquipmentType.HVDC_LINE_LCC]: { - name: ExtendedEquipmentType.HVDC_LINE_LCC, + [EquipmentType.HVDC_LINE_LCC]: { + name: EquipmentType.HVDC_LINE_LCC, tagLabel: 'equipment_search/hvdcLineLccTag', }, - [ExtendedEquipmentType.HVDC_LINE_VSC]: { - name: ExtendedEquipmentType.HVDC_LINE_VSC, + [EquipmentType.HVDC_LINE_VSC]: { + name: EquipmentType.HVDC_LINE_VSC, tagLabel: 'equipment_search/hvdcLineVscTag', }, [EquipmentType.GENERATOR]: { @@ -181,7 +173,7 @@ export interface Equipment extends Identifiable { export interface EquipmentInfos extends Identifiable { label: string; key: string; - type: EquipmentType | ExtendedEquipmentType; + type: EquipmentType; voltageLevelLabel?: string; voltageLevelId?: string; operatingStatus?: string; From 57e92bb27072e8ac8a41fb2138293e9a1da74780 Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Fri, 21 Feb 2025 11:27:23 +0100 Subject: [PATCH 07/11] Etienne review --- src/translations/en/equipmentSearchEn.ts | 4 ++-- src/translations/fr/equipmentSearchFr.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/translations/en/equipmentSearchEn.ts b/src/translations/en/equipmentSearchEn.ts index c920a8901..06a1fb979 100644 --- a/src/translations/en/equipmentSearchEn.ts +++ b/src/translations/en/equipmentSearchEn.ts @@ -18,8 +18,8 @@ export const equipmentSearchEn = { 'equipment_search/shuntTag': 'SHUNT', 'equipment_search/svcTag': 'SVC', 'equipment_search/hvdcLineTag': 'HVDC LINE', - 'equipment_search/hvdcLineVscTag': 'HVDC LINE VSC', - 'equipment_search/hvdcLineLccTag': 'HVDC LINE LCC', + 'equipment_search/hvdcLineVscTag': 'HVDC LINE (VSC)', + 'equipment_search/hvdcLineLccTag': 'HVDC LINE (LCC)', 'equipment_search/hvdcStationTag': 'HVDC STATION', 'equipment_search/voltageLevelTag': 'VOLTAGE LEVEL', 'equipment_search/substationTag': 'SUBSTATION', diff --git a/src/translations/fr/equipmentSearchFr.ts b/src/translations/fr/equipmentSearchFr.ts index 2c807f4e2..06fea6c78 100644 --- a/src/translations/fr/equipmentSearchFr.ts +++ b/src/translations/fr/equipmentSearchFr.ts @@ -18,8 +18,8 @@ export const equipmentSearchFr = { 'equipment_search/shuntTag': 'MCS', 'equipment_search/svcTag': 'CSPR', 'equipment_search/hvdcLineTag': 'LIGNE HVDC', - 'equipment_search/hvdcLineVscTag': 'HVDC LINE VSC', - 'equipment_search/hvdcLineLccTag': 'HVDC LINE LCC', + 'equipment_search/hvdcLineVscTag': 'HVDC LINE (VSC)', + 'equipment_search/hvdcLineLccTag': 'HVDC LINE (LCC)', 'equipment_search/hvdcStationTag': 'STATION HVDC', 'equipment_search/voltageLevelTag': 'POSTE', 'equipment_search/substationTag': 'SITE', From 7761f27e0ed8588e4180a2b7bbb5203cbb73d8cd Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Fri, 21 Feb 2025 13:41:03 +0100 Subject: [PATCH 08/11] fix translation --- src/translations/fr/equipmentSearchFr.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/translations/fr/equipmentSearchFr.ts b/src/translations/fr/equipmentSearchFr.ts index 06fea6c78..06fc10ad8 100644 --- a/src/translations/fr/equipmentSearchFr.ts +++ b/src/translations/fr/equipmentSearchFr.ts @@ -18,8 +18,8 @@ export const equipmentSearchFr = { 'equipment_search/shuntTag': 'MCS', 'equipment_search/svcTag': 'CSPR', 'equipment_search/hvdcLineTag': 'LIGNE HVDC', - 'equipment_search/hvdcLineVscTag': 'HVDC LINE (VSC)', - 'equipment_search/hvdcLineLccTag': 'HVDC LINE (LCC)', + 'equipment_search/hvdcLineVscTag': 'LINE HVDC (VSC)', + 'equipment_search/hvdcLineLccTag': 'LINE HVDC (LCC)', 'equipment_search/hvdcStationTag': 'STATION HVDC', 'equipment_search/voltageLevelTag': 'POSTE', 'equipment_search/substationTag': 'SITE', From f38a9065a8df095381e0b511b8633651c7b59e91 Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Fri, 21 Feb 2025 13:43:58 +0100 Subject: [PATCH 09/11] fix translation --- src/translations/fr/equipmentSearchFr.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/translations/fr/equipmentSearchFr.ts b/src/translations/fr/equipmentSearchFr.ts index 06fc10ad8..7df15cea7 100644 --- a/src/translations/fr/equipmentSearchFr.ts +++ b/src/translations/fr/equipmentSearchFr.ts @@ -18,8 +18,8 @@ export const equipmentSearchFr = { 'equipment_search/shuntTag': 'MCS', 'equipment_search/svcTag': 'CSPR', 'equipment_search/hvdcLineTag': 'LIGNE HVDC', - 'equipment_search/hvdcLineVscTag': 'LINE HVDC (VSC)', - 'equipment_search/hvdcLineLccTag': 'LINE HVDC (LCC)', + 'equipment_search/hvdcLineVscTag': 'LIGNE HVDC (VSC)', + 'equipment_search/hvdcLineLccTag': 'LIGNE HVDC (LCC)', 'equipment_search/hvdcStationTag': 'STATION HVDC', 'equipment_search/voltageLevelTag': 'POSTE', 'equipment_search/substationTag': 'SITE', From 225827dbbbfd994090ccbc7164f4302088036850 Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Fri, 21 Feb 2025 14:49:34 +0100 Subject: [PATCH 10/11] clean code --- .../filter/utils/filterFormUtils.ts | 61 +------------------ src/utils/types/equipmentType.ts | 60 +++++++++++++++++- 2 files changed, 60 insertions(+), 61 deletions(-) diff --git a/src/components/filter/utils/filterFormUtils.ts b/src/components/filter/utils/filterFormUtils.ts index aac523c55..e37228bba 100644 --- a/src/components/filter/utils/filterFormUtils.ts +++ b/src/components/filter/utils/filterFormUtils.ts @@ -8,7 +8,7 @@ import { FunctionComponent } from 'react'; import { FieldConstants } from '../../../utils/constants/fieldConstants'; import { RangeInput } from '../../inputs/reactHookForm/numbers/RangeInput'; import { CountriesInput } from '../../inputs/reactHookForm/selectInputs/CountriesInput'; -import { EquipmentType } from '../../../utils/types/equipmentType'; +import { BASE_EQUIPMENTS, EquipmentType } from '../../../utils/types/equipmentType'; const countries = { renderer: CountriesInput, @@ -143,53 +143,6 @@ export const CONTINGENCY_LIST_EQUIPMENTS: Record< }, }; -const BASE_EQUIPMENTS: Partial> = { - [EquipmentType.SUBSTATION]: { - id: EquipmentType.SUBSTATION, - label: 'Substations', - }, - [EquipmentType.VOLTAGE_LEVEL]: { - id: EquipmentType.VOLTAGE_LEVEL, - label: 'VoltageLevels', - }, - [EquipmentType.LINE]: { - id: EquipmentType.LINE, - label: 'Lines', - }, - [EquipmentType.TWO_WINDINGS_TRANSFORMER]: { - id: EquipmentType.TWO_WINDINGS_TRANSFORMER, - label: 'TwoWindingsTransformers', - }, - [EquipmentType.THREE_WINDINGS_TRANSFORMER]: { - id: EquipmentType.THREE_WINDINGS_TRANSFORMER, - label: 'ThreeWindingsTransformers', - }, - [EquipmentType.GENERATOR]: { - id: EquipmentType.GENERATOR, - label: 'Generators', - }, - [EquipmentType.BATTERY]: { - id: EquipmentType.BATTERY, - label: 'Batteries', - }, - [EquipmentType.LOAD]: { - id: EquipmentType.LOAD, - label: 'Loads', - }, - [EquipmentType.SHUNT_COMPENSATOR]: { - id: EquipmentType.SHUNT_COMPENSATOR, - label: 'ShuntCompensators', - }, - [EquipmentType.STATIC_VAR_COMPENSATOR]: { - id: EquipmentType.STATIC_VAR_COMPENSATOR, - label: 'StaticVarCompensators', - }, - [EquipmentType.DANGLING_LINE]: { - id: EquipmentType.DANGLING_LINE, - label: 'DanglingLines', - }, -}; - export const FILTER_EQUIPMENTS: Partial> = { ...BASE_EQUIPMENTS, [EquipmentType.HVDC_LINE]: { @@ -197,15 +150,3 @@ export const FILTER_EQUIPMENTS: Partial> = { - ...BASE_EQUIPMENTS, - [EquipmentType.HVDC_LINE_LCC]: { - id: EquipmentType.HVDC_LINE_LCC, - label: 'LCC', - }, - [EquipmentType.HVDC_LINE_VSC]: { - id: EquipmentType.HVDC_LINE_VSC, - label: 'VSC', - }, -}; diff --git a/src/utils/types/equipmentType.ts b/src/utils/types/equipmentType.ts index 7e41db859..0d8e5f0d7 100644 --- a/src/utils/types/equipmentType.ts +++ b/src/utils/types/equipmentType.ts @@ -80,7 +80,53 @@ export enum EquipmentType { HVDC_LINE_VSC = 'HVDC_LINE_VSC', } -// Must be equivalent as the back enum +export const BASE_EQUIPMENTS: Partial> = { + [EquipmentType.SUBSTATION]: { + id: EquipmentType.SUBSTATION, + label: 'Substations', + }, + [EquipmentType.VOLTAGE_LEVEL]: { + id: EquipmentType.VOLTAGE_LEVEL, + label: 'VoltageLevels', + }, + [EquipmentType.LINE]: { + id: EquipmentType.LINE, + label: 'Lines', + }, + [EquipmentType.TWO_WINDINGS_TRANSFORMER]: { + id: EquipmentType.TWO_WINDINGS_TRANSFORMER, + label: 'TwoWindingsTransformers', + }, + [EquipmentType.THREE_WINDINGS_TRANSFORMER]: { + id: EquipmentType.THREE_WINDINGS_TRANSFORMER, + label: 'ThreeWindingsTransformers', + }, + [EquipmentType.GENERATOR]: { + id: EquipmentType.GENERATOR, + label: 'Generators', + }, + [EquipmentType.BATTERY]: { + id: EquipmentType.BATTERY, + label: 'Batteries', + }, + [EquipmentType.LOAD]: { + id: EquipmentType.LOAD, + label: 'Loads', + }, + [EquipmentType.SHUNT_COMPENSATOR]: { + id: EquipmentType.SHUNT_COMPENSATOR, + label: 'ShuntCompensators', + }, + [EquipmentType.STATIC_VAR_COMPENSATOR]: { + id: EquipmentType.STATIC_VAR_COMPENSATOR, + label: 'StaticVarCompensators', + }, + [EquipmentType.DANGLING_LINE]: { + id: EquipmentType.DANGLING_LINE, + label: 'DanglingLines', + }, +}; + export const EQUIPMENT_TYPE: Partial> = { [EquipmentType.SUBSTATION]: { name: EquipmentType.SUBSTATION, @@ -160,6 +206,18 @@ export const EQUIPMENT_TYPE: Partial> = { + ...BASE_EQUIPMENTS, + [EquipmentType.HVDC_LINE_LCC]: { + id: EquipmentType.HVDC_LINE_LCC, + label: 'LCC', + }, + [EquipmentType.HVDC_LINE_VSC]: { + id: EquipmentType.HVDC_LINE_VSC, + label: 'VSC', + }, +}; + export interface Identifiable { id: string; name?: string; From bb6125adb9585579b07efa480dc2ad6591cab635 Mon Sep 17 00:00:00 2001 From: Thang PHAM Date: Fri, 21 Feb 2025 16:54:07 +0100 Subject: [PATCH 11/11] Refactor Equipment types Signed-off-by: Thang PHAM --- .../elementItem/EquipmentItem.tsx | 4 +- .../elementSearch/tagRenderer/TagRenderer.tsx | 4 +- .../ExplicitNamingFilterForm.tsx | 6 +- .../filter/utils/filterFormUtils.ts | 42 +++++++-- src/utils/types/equipmentType.ts | 88 +++++++++++-------- 5 files changed, 94 insertions(+), 50 deletions(-) diff --git a/src/components/elementSearch/elementItem/EquipmentItem.tsx b/src/components/elementSearch/elementItem/EquipmentItem.tsx index 9eb8030ef..1da293028 100644 --- a/src/components/elementSearch/elementItem/EquipmentItem.tsx +++ b/src/components/elementSearch/elementItem/EquipmentItem.tsx @@ -9,7 +9,7 @@ import parse from 'autosuggest-highlight/parse'; import clsx from 'clsx'; import { FormattedMessage } from 'react-intl'; import { Box, SxProps, Theme } from '@mui/material'; -import { EQUIPMENT_TYPE, EquipmentInfos } from '../../../utils/types/equipmentType'; +import { EquipmentInfos, SEARCH_TAG_EQUIPMENT_TYPES } from '../../../utils/types/equipmentType'; import { TagRenderer } from '../tagRenderer/TagRenderer'; import { OverflowableText } from '../../overflowableText'; import { mergeSx } from '../../../utils/styles'; @@ -57,7 +57,7 @@ export function EquipmentItem({ className={clsx(props.classes?.equipmentTag, props.classes?.equipmentTypeTag)} sx={mergeSx(props.styles?.equipmentTag, props.styles?.equipmentTypeTag)} > - + )} { - if (watchEquipmentType && !((watchEquipmentType as EquipmentType) in FILTER_EQUIPMENTS)) { + if (watchEquipmentType && !((watchEquipmentType as EquipmentType) in FILTER_EQUIPMENT_TYPES)) { snackError({ headerId: 'obsoleteFilter', }); @@ -216,7 +216,7 @@ export function ExplicitNamingFilterForm({ sourceFilterForExplicitNamingConversi > = { - ...BASE_EQUIPMENTS, +// order is important +export const FILTER_EQUIPMENT_TYPES: Partial> = { + [EquipmentType.SUBSTATION]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.SUBSTATION], + }, + [EquipmentType.VOLTAGE_LEVEL]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.VOLTAGE_LEVEL], + }, + [EquipmentType.LINE]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.LINE], + }, + [EquipmentType.TWO_WINDINGS_TRANSFORMER]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.TWO_WINDINGS_TRANSFORMER], + }, + [EquipmentType.THREE_WINDINGS_TRANSFORMER]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.THREE_WINDINGS_TRANSFORMER], + }, + [EquipmentType.GENERATOR]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.GENERATOR], + }, + [EquipmentType.BATTERY]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.BATTERY], + }, + [EquipmentType.LOAD]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.LOAD], + }, + [EquipmentType.SHUNT_COMPENSATOR]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.SHUNT_COMPENSATOR], + }, + [EquipmentType.STATIC_VAR_COMPENSATOR]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.STATIC_VAR_COMPENSATOR], + }, + [EquipmentType.DANGLING_LINE]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.DANGLING_LINE], + }, [EquipmentType.HVDC_LINE]: { - id: EquipmentType.HVDC_LINE, - label: 'Hvdc', + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.HVDC_LINE], }, }; diff --git a/src/utils/types/equipmentType.ts b/src/utils/types/equipmentType.ts index 0d8e5f0d7..3448a8856 100644 --- a/src/utils/types/equipmentType.ts +++ b/src/utils/types/equipmentType.ts @@ -80,141 +80,153 @@ export enum EquipmentType { HVDC_LINE_VSC = 'HVDC_LINE_VSC', } -export const BASE_EQUIPMENTS: Partial> = { +// order is not important,should cover all elements in EquipmentType +export const BASE_INFOS_EQUIPMENT_TYPES: Partial> = { [EquipmentType.SUBSTATION]: { - id: EquipmentType.SUBSTATION, label: 'Substations', }, [EquipmentType.VOLTAGE_LEVEL]: { - id: EquipmentType.VOLTAGE_LEVEL, label: 'VoltageLevels', }, [EquipmentType.LINE]: { - id: EquipmentType.LINE, label: 'Lines', }, [EquipmentType.TWO_WINDINGS_TRANSFORMER]: { - id: EquipmentType.TWO_WINDINGS_TRANSFORMER, label: 'TwoWindingsTransformers', }, [EquipmentType.THREE_WINDINGS_TRANSFORMER]: { - id: EquipmentType.THREE_WINDINGS_TRANSFORMER, label: 'ThreeWindingsTransformers', }, [EquipmentType.GENERATOR]: { - id: EquipmentType.GENERATOR, label: 'Generators', }, [EquipmentType.BATTERY]: { - id: EquipmentType.BATTERY, label: 'Batteries', }, [EquipmentType.LOAD]: { - id: EquipmentType.LOAD, label: 'Loads', }, [EquipmentType.SHUNT_COMPENSATOR]: { - id: EquipmentType.SHUNT_COMPENSATOR, label: 'ShuntCompensators', }, [EquipmentType.STATIC_VAR_COMPENSATOR]: { - id: EquipmentType.STATIC_VAR_COMPENSATOR, label: 'StaticVarCompensators', }, [EquipmentType.DANGLING_LINE]: { - id: EquipmentType.DANGLING_LINE, label: 'DanglingLines', }, + [EquipmentType.HVDC_LINE]: { + label: 'Hvdc', + }, + [EquipmentType.HVDC_LINE_LCC]: { + label: 'LCC', + }, + [EquipmentType.HVDC_LINE_VSC]: { + label: 'VSC', + }, }; -export const EQUIPMENT_TYPE: Partial> = { +// order is not important +export const SEARCH_TAG_EQUIPMENT_TYPES: Partial> = { [EquipmentType.SUBSTATION]: { - name: EquipmentType.SUBSTATION, tagLabel: 'equipment_search/substationTag', }, [EquipmentType.VOLTAGE_LEVEL]: { - name: EquipmentType.VOLTAGE_LEVEL, tagLabel: 'equipment_search/voltageLevelTag', }, [EquipmentType.LINE]: { - name: EquipmentType.LINE, tagLabel: 'equipment_search/lineTag', }, [EquipmentType.TWO_WINDINGS_TRANSFORMER]: { - name: EquipmentType.TWO_WINDINGS_TRANSFORMER, tagLabel: 'equipment_search/2wtTag', }, [EquipmentType.THREE_WINDINGS_TRANSFORMER]: { - name: EquipmentType.THREE_WINDINGS_TRANSFORMER, tagLabel: 'equipment_search/3wtTag', }, [EquipmentType.HVDC_LINE_LCC]: { - name: EquipmentType.HVDC_LINE_LCC, tagLabel: 'equipment_search/hvdcLineLccTag', }, [EquipmentType.HVDC_LINE_VSC]: { - name: EquipmentType.HVDC_LINE_VSC, tagLabel: 'equipment_search/hvdcLineVscTag', }, [EquipmentType.GENERATOR]: { - name: EquipmentType.GENERATOR, tagLabel: 'equipment_search/generatorTag', }, [EquipmentType.BATTERY]: { - name: EquipmentType.BATTERY, tagLabel: 'equipment_search/batteryTag', }, [EquipmentType.LOAD]: { - name: EquipmentType.LOAD, tagLabel: 'equipment_search/loadTag', }, [EquipmentType.SHUNT_COMPENSATOR]: { - name: EquipmentType.SHUNT_COMPENSATOR, tagLabel: 'equipment_search/shuntTag', }, [EquipmentType.DANGLING_LINE]: { - name: EquipmentType.DANGLING_LINE, tagLabel: 'equipment_search/lineTag', }, [EquipmentType.STATIC_VAR_COMPENSATOR]: { - name: EquipmentType.STATIC_VAR_COMPENSATOR, tagLabel: 'equipment_search/svcTag', }, [EquipmentType.HVDC_CONVERTER_STATION]: { - name: EquipmentType.HVDC_CONVERTER_STATION, tagLabel: 'equipment_search/hvdcStationTag', }, [EquipmentType.BUSBAR_SECTION]: { - name: EquipmentType.BUSBAR_SECTION, tagLabel: 'equipment_search/busbarSectionTag', }, [EquipmentType.BUS]: { - name: EquipmentType.BUS, tagLabel: 'equipment_search/busTag', }, [EquipmentType.SWITCH]: { - name: EquipmentType.SWITCH, tagLabel: 'equipment_search/switchTag', }, [EquipmentType.VSC_CONVERTER_STATION]: { - name: EquipmentType.VSC_CONVERTER_STATION, tagLabel: 'equipment_search/vscConverterStationTag', }, [EquipmentType.LCC_CONVERTER_STATION]: { - name: EquipmentType.LCC_CONVERTER_STATION, tagLabel: 'equipment_search/lccConverterStationTag', }, }; -export const SEARCH_EQUIPMENTS: Partial> = { - ...BASE_EQUIPMENTS, +// order is important +export const SEARCH_FILTER_EQUIPMENT_TYPES: Partial> = { + [EquipmentType.SUBSTATION]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.SUBSTATION], + }, + [EquipmentType.VOLTAGE_LEVEL]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.VOLTAGE_LEVEL], + }, + [EquipmentType.LINE]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.LINE], + }, + [EquipmentType.TWO_WINDINGS_TRANSFORMER]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.TWO_WINDINGS_TRANSFORMER], + }, + [EquipmentType.THREE_WINDINGS_TRANSFORMER]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.THREE_WINDINGS_TRANSFORMER], + }, + [EquipmentType.GENERATOR]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.GENERATOR], + }, + [EquipmentType.BATTERY]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.BATTERY], + }, + [EquipmentType.LOAD]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.LOAD], + }, + [EquipmentType.SHUNT_COMPENSATOR]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.SHUNT_COMPENSATOR], + }, + [EquipmentType.STATIC_VAR_COMPENSATOR]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.STATIC_VAR_COMPENSATOR], + }, + [EquipmentType.DANGLING_LINE]: { + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.DANGLING_LINE], + }, [EquipmentType.HVDC_LINE_LCC]: { - id: EquipmentType.HVDC_LINE_LCC, - label: 'LCC', + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.HVDC_LINE_LCC], }, [EquipmentType.HVDC_LINE_VSC]: { - id: EquipmentType.HVDC_LINE_VSC, - label: 'VSC', + ...BASE_INFOS_EQUIPMENT_TYPES[EquipmentType.HVDC_LINE_VSC], }, };