Skip to content

Commit 9f98381

Browse files
EtienneLtthangqp
andauthored
add category hvdc for expert filters (#524)
--------- Signed-off-by: Etienne LESOT <[email protected]> Co-authored-by: Thang PHAM <[email protected]>
1 parent 6d7060b commit 9f98381

File tree

5 files changed

+112
-12
lines changed

5 files changed

+112
-12
lines changed

src/components/filter/expert/expert-filter-constants.ts

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ export const EXPERT_FILTER_EQUIPMENTS = {
5757
id: 'STATIC_VAR_COMPENSATOR',
5858
label: 'StaticVarCompensators',
5959
},
60+
HVDC_LINE: {
61+
id: 'HVDC_LINE',
62+
label: 'Hvdc',
63+
},
6064
};
6165

6266
export const ENERGY_SOURCE_OPTIONS = [
@@ -101,6 +105,17 @@ export const REGULATION_TYPE_OPTIONS = [
101105
{ name: 'DISTANT', label: 'regulationType.distant' },
102106
];
103107

108+
export const CONVERTERS_MODE_OPTIONS = [
109+
{
110+
name: 'SIDE_1_RECTIFIER_SIDE_2_INVERTER',
111+
label: 'side1RectifierSide2Inverter',
112+
},
113+
{
114+
name: 'SIDE_1_INVERTER_SIDE_2_RECTIFIER',
115+
label: 'side1InverterSide2Rectifier',
116+
},
117+
];
118+
104119
// customName is used to export to the server
105120
export const OPERATOR_OPTIONS = {
106121
EQUALS: { name: '=', customName: OperatorType.EQUALS, label: 'equality' },
@@ -604,6 +619,12 @@ export const FIELDS_OPTIONS = {
604619
dataType: DataType.NUMBER,
605620
inputType: 'number',
606621
},
622+
ACTIVE_POWER_SET_POINT: {
623+
name: FieldType.ACTIVE_POWER_SET_POINT,
624+
label: 'activePowerSetPoint',
625+
dataType: DataType.NUMBER,
626+
inputType: 'number',
627+
},
607628
REACTIVE_POWER_SET_POINT: {
608629
name: FieldType.REACTIVE_POWER_SET_POINT,
609630
label: 'reactivePowerSetPoint',
@@ -674,6 +695,42 @@ export const FIELDS_OPTIONS = {
674695
dataType: DataType.NUMBER,
675696
inputType: 'number',
676697
},
698+
CONVERTER_STATION_ID_1: {
699+
name: FieldType.CONVERTER_STATION_ID_1,
700+
label: 'converterStationId1',
701+
dataType: DataType.STRING,
702+
},
703+
CONVERTER_STATION_ID_2: {
704+
name: FieldType.CONVERTER_STATION_ID_2,
705+
label: 'converterStationId2',
706+
dataType: DataType.STRING,
707+
},
708+
CONVERTERS_MODE: {
709+
name: FieldType.CONVERTERS_MODE,
710+
label: 'convertersMode',
711+
dataType: DataType.ENUM,
712+
values: CONVERTERS_MODE_OPTIONS,
713+
valueEditorType: 'select',
714+
defaultValue: 'SIDE_1_RECTIFIER_SIDE_2_INVERTER',
715+
},
716+
CONVERTER_STATION_NOMINAL_VOLTAGE_1: {
717+
name: FieldType.CONVERTER_STATION_NOMINAL_VOLTAGE_1,
718+
label: 'converterStationNominalVoltage1',
719+
dataType: DataType.NUMBER,
720+
inputType: 'number',
721+
},
722+
CONVERTER_STATION_NOMINAL_VOLTAGE_2: {
723+
name: FieldType.CONVERTER_STATION_NOMINAL_VOLTAGE_2,
724+
label: 'converterStationNominalVoltage2',
725+
dataType: DataType.NUMBER,
726+
inputType: 'number',
727+
},
728+
DC_NOMINAL_VOLTAGE: {
729+
name: FieldType.DC_NOMINAL_VOLTAGE,
730+
label: 'dcNominalVoltage',
731+
dataType: DataType.NUMBER,
732+
inputType: 'number',
733+
},
677734
};
678735

679736
export const fields: Record<string, Field[]> = {
@@ -860,4 +917,28 @@ export const fields: Record<string, Field[]> = {
860917
FIELDS_OPTIONS.SUBSTATION_PROPERTY,
861918
FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY,
862919
],
920+
HVDC_LINE: [
921+
FIELDS_OPTIONS.ID,
922+
FIELDS_OPTIONS.NAME,
923+
FIELDS_OPTIONS.COUNTRY_1,
924+
FIELDS_OPTIONS.COUNTRY_2,
925+
FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_1,
926+
FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_2,
927+
FIELDS_OPTIONS.CONVERTER_STATION_ID_1,
928+
FIELDS_OPTIONS.CONVERTER_STATION_ID_2,
929+
FIELDS_OPTIONS.CONNECTED_1,
930+
FIELDS_OPTIONS.CONNECTED_2,
931+
FIELDS_OPTIONS.CONVERTER_STATION_NOMINAL_VOLTAGE_1,
932+
FIELDS_OPTIONS.CONVERTER_STATION_NOMINAL_VOLTAGE_2,
933+
FIELDS_OPTIONS.DC_NOMINAL_VOLTAGE,
934+
FIELDS_OPTIONS.SERIE_RESISTANCE,
935+
FIELDS_OPTIONS.MAX_P,
936+
FIELDS_OPTIONS.ACTIVE_POWER_SET_POINT,
937+
FIELDS_OPTIONS.CONVERTERS_MODE,
938+
FIELDS_OPTIONS.PROPERTY,
939+
FIELDS_OPTIONS.SUBSTATION_PROPERTY_1,
940+
FIELDS_OPTIONS.SUBSTATION_PROPERTY_2,
941+
FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_1,
942+
FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_2,
943+
],
863944
};

src/components/filter/expert/expert-filter.type.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ export enum FieldType {
9999
VOLTAGE_LEVEL_PROPERTY_2 = 'VOLTAGE_LEVEL_PROPERTIES_2',
100100
SVAR_REGULATION_MODE = 'SVAR_REGULATION_MODE',
101101
VOLTAGE_SET_POINT = 'VOLTAGE_SET_POINT',
102+
ACTIVE_POWER_SET_POINT = 'ACTIVE_POWER_SET_POINT',
102103
REACTIVE_POWER_SET_POINT = 'REACTIVE_POWER_SET_POINT',
103104
REMOTE_REGULATED_TERMINAL = 'REMOTE_REGULATED_TERMINAL', // composite rule of REGULATING_TERMINAL_VL_ID and/or REGULATING_TERMINAL_CONNECTABLE_ID
104105
REGULATING_TERMINAL_VL_ID = 'REGULATING_TERMINAL_VL_ID',
@@ -110,6 +111,12 @@ export enum FieldType {
110111
LOW_VOLTAGE_THRESHOLD = 'LOW_VOLTAGE_THRESHOLD',
111112
HIGH_VOLTAGE_THRESHOLD = 'HIGH_VOLTAGE_THRESHOLD',
112113
SUSCEPTANCE_FIX = 'SUSCEPTANCE_FIX',
114+
CONVERTERS_MODE = 'CONVERTERS_MODE',
115+
CONVERTER_STATION_ID_1 = 'CONVERTER_STATION_ID_1',
116+
CONVERTER_STATION_ID_2 = 'CONVERTER_STATION_ID_2',
117+
CONVERTER_STATION_NOMINAL_VOLTAGE_1 = 'CONVERTER_STATION_NOMINAL_VOLTAGE_1',
118+
CONVERTER_STATION_NOMINAL_VOLTAGE_2 = 'CONVERTER_STATION_NOMINAL_VOLTAGE_2',
119+
DC_NOMINAL_VOLTAGE = 'DC_NOMINAL_VOLTAGE',
113120
}
114121

115122
export enum DataType {

src/components/inputs/react-query-builder/value-editor.tsx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,7 @@ function ValueEditor(props: ValueEditorProps) {
8585
) {
8686
return <CountryValueEditor {...props} />;
8787
}
88-
if (
89-
field === FieldType.REGULATION_TYPE ||
90-
field === FieldType.SVAR_REGULATION_MODE ||
91-
field === FieldType.ENERGY_SOURCE ||
92-
field === FieldType.SHUNT_COMPENSATOR_TYPE ||
93-
field === FieldType.LOAD_TYPE ||
94-
field === FieldType.RATIO_REGULATION_MODE ||
95-
field === FieldType.PHASE_REGULATION_MODE
96-
) {
88+
if (fieldData.dataType === DataType.ENUM) {
9789
return <TranslatedValueEditor {...props} />;
9890
}
9991
if (

src/components/translations/filter-expert-en.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ const filterExpertEn = {
8080
'regulationMode.voltage': 'Voltage regulation',
8181
'regulationMode.reactivePower': 'Reactive power regulation',
8282
voltageSetPoint: 'Voltage set point',
83+
activePowerSetPoint: 'Active power set point',
8384
reactivePowerSetPoint: 'Reactive power set point',
8485
remoteRegulatedTerminal: 'Remote regulated terminal',
8586
regulatingTerminalVLId: 'Voltage Level ID',
@@ -93,6 +94,14 @@ const filterExpertEn = {
9394
lowVoltageThreshold: 'Low voltage threshold',
9495
highVoltageThreshold: 'High voltage threshold',
9596
susceptanceFix: 'Fixed part of susceptance ',
97+
converterStationId1: 'Converter station 1 ID',
98+
converterStationId2: 'Converter station 2 ID',
99+
convertersMode: 'Converters mode',
100+
side1RectifierSide2Inverter: 'Side 1 rectifier side 2 inverter',
101+
side1InverterSide2Rectifier: 'Side 1 inverter side 2 rectifier',
102+
dcNominalVoltage: 'DC nominal voltage (kV)',
103+
converterStationNominalVoltage1: 'Converter station 1 nominal voltage (kV)',
104+
converterStationNominalVoltage2: 'Converter station 2 nominal voltage (kV)',
96105
};
97106

98107
export default filterExpertEn;

src/components/translations/filter-expert-fr.ts

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ const filterExpertFr = {
5656
CurrentLimiter: 'Limitation de courant',
5757
ActivePowerControl: 'Suivi de transit',
5858
FixedTap: 'Déphasage constant',
59-
ratioRegulationMode: 'Mode de réglage régleur',
60-
phaseRegulationMode: 'Mode de réglage déphaseur',
59+
ratioRegulationMode: 'Mode de réglage du régleur',
60+
phaseRegulationMode: 'Mode de réglage du déphaseur',
6161
phaseRegulationValue: 'Consigne de transit ou du courant du déphaseur',
6262
property: 'Propriété',
6363
substationProperty: 'Propriété site',
@@ -80,7 +80,8 @@ const filterExpertFr = {
8080
'regulationMode.voltage': 'Réglage de tension',
8181
'regulationMode.reactivePower': 'Réglage du réactif',
8282
voltageSetPoint: 'Tension',
83-
reactivePowerSetPoint: 'Puissance réactive',
83+
activePowerSetPoint: 'Consigne de puissance active',
84+
reactivePowerSetPoint: 'Consigne de puissance réactive',
8485
remoteRegulatedTerminal: 'Terminal distant réglé',
8586
regulatingTerminalVLId: 'ID de poste',
8687
regulatingTerminalConnectableId: "ID d'ouvrage",
@@ -93,6 +94,16 @@ const filterExpertFr = {
9394
lowVoltageThreshold: 'U activation bas',
9495
highVoltageThreshold: 'U activation haut',
9596
susceptanceFix: 'Susceptance fixe',
97+
converterStationId1: 'ID de la station de conversion 1',
98+
converterStationId2: 'ID de la station de conversion 2',
99+
convertersMode: 'Mode de conversion',
100+
side1RectifierSide2Inverter: 'Coté 1 redresseur côté 2 onduleur',
101+
side1InverterSide2Rectifier: 'Côté 1 onduleur côté 2 redresseur',
102+
dcNominalVoltage: 'Tension nominale DC (kV)',
103+
converterStationNominalVoltage1:
104+
'Tension nominale de la station de conversion 1 (kV)',
105+
converterStationNominalVoltage2:
106+
'Tension nominale de la station de conversion 2 (kV)',
96107
};
97108

98109
export default filterExpertFr;

0 commit comments

Comments
 (0)