Adjust some labels in modification filters (#3159)

Signed-off-by: Igor PIROG <[email protected]>
Co-authored-by: basseche <[email protected]>

Author: ipirog

src/components/dialogs/network-modifications/by-filter/by-assignment/assignment/assignment-constants.ts

@@ -48,13 +48,13 @@ export const FIELD_OPTIONS = {
     },
     ACTIVE_POWER_SET_POINT: {
         id: FieldType.ACTIVE_POWER_SET_POINT,
-        label: 'ActivePowerText',
+        label: 'ActivePowerSetPointText',
         unit: MEGA_WATT,
         dataType: DataType.DOUBLE,
     },
     REACTIVE_POWER_SET_POINT: {
         id: FieldType.REACTIVE_POWER_SET_POINT,
-        label: 'ReactivePowerText',
+        label: 'ReactivePowerSetPointText',
         unit: MEGA_VAR,
         dataType: DataType.DOUBLE,
     },
@@ -72,7 +72,7 @@ export const FIELD_OPTIONS = {
     },
     MARGINAL_COST: {
         id: FieldType.MARGINAL_COST,
-        label: 'marginalCost',
+        label: 'MarginalCost',
         dataType: DataType.DOUBLE,
     },
     PLANNED_OUTAGE_RATE: {
@@ -192,37 +192,37 @@ export const FIELD_OPTIONS = {
     },
     G: {
         id: FieldType.G,
-        label: 'G',
+        label: 'ShuntConductanceText',
         unit: MICRO_SIEMENS,
         dataType: DataType.DOUBLE,
     },
     G1: {
         id: FieldType.G1,
-        label: 'G1',
+        label: 'ShuntConductanceText1',
         unit: MICRO_SIEMENS,
         dataType: DataType.DOUBLE,
     },
     G2: {
         id: FieldType.G2,
-        label: 'G2',
+        label: 'ShuntConductanceText2',
         unit: MICRO_SIEMENS,
         dataType: DataType.DOUBLE,
     },
     B: {
         id: FieldType.B,
-        label: 'B',
+        label: 'ShuntSusceptanceText',
         unit: MICRO_SIEMENS,
         dataType: DataType.DOUBLE,
     },
     B1: {
         id: FieldType.B1,
-        label: 'B1',
+        label: 'ShuntSusceptanceText1',
         unit: MICRO_SIEMENS,
         dataType: DataType.DOUBLE,
     },
     B2: {
         id: FieldType.B2,
-        label: 'B2',
+        label: 'ShuntSusceptanceText2',
         unit: MICRO_SIEMENS,
         dataType: DataType.DOUBLE,
     },
@@ -375,8 +375,8 @@ export const EQUIPMENTS_FIELDS = {
     [EquipmentType.LOAD]: [
         FIELD_OPTIONS.PROPERTY,
         FIELD_OPTIONS.LOAD_TYPE,
-        FIELD_OPTIONS.ACTIVE_POWER,
-        FIELD_OPTIONS.REACTIVE_POWER,
+        FIELD_OPTIONS.ACTIVE_POWER_SET_POINT,
+        FIELD_OPTIONS.REACTIVE_POWER_SET_POINT,
     ],
     [EquipmentType.SHUNT_COMPENSATOR]: [
         FIELD_OPTIONS.PROPERTY,

src/components/dialogs/network-modifications/by-filter/by-formula/formula/formula-utils.tsx

@@ -54,15 +54,15 @@ export const EQUIPMENTS_FIELDS: EquipmentFields = {
         { id: 'RATED_NOMINAL_POWER', label: 'RatedNominalPowerText', unit: MEGA_WATT },
         { id: 'MINIMUM_ACTIVE_POWER', label: 'MinimumActivePowerText', unit: MEGA_WATT },
         { id: 'MAXIMUM_ACTIVE_POWER', label: 'MaximumActivePowerText', unit: MEGA_WATT },
-        { id: 'ACTIVE_POWER_SET_POINT', label: 'ActivePowerText', unit: MEGA_WATT },
-        { id: 'REACTIVE_POWER_SET_POINT', label: 'ReactivePowerText', unit: MEGA_VAR },
+        { id: 'ACTIVE_POWER_SET_POINT', label: 'ActivePowerSetPointText', unit: MEGA_WATT },
+        { id: 'REACTIVE_POWER_SET_POINT', label: 'ReactivePowerSetPointText', unit: MEGA_VAR },
         { id: 'VOLTAGE_SET_POINT', label: 'GeneratorTargetV', unit: KILO_VOLT },
         {
             id: 'PLANNED_ACTIVE_POWER_SET_POINT',
             label: 'PlannedActivePowerSetPointForm',
             unit: MEGA_WATT,
         },
-        { id: 'MARGINAL_COST', label: 'marginalCost' },
+        { id: 'MARGINAL_COST', label: 'MarginalCost' },
         { id: 'PLANNED_OUTAGE_RATE', label: 'plannedOutageRate' },
         { id: 'FORCED_OUTAGE_RATE', label: 'forcedOutageRate' },
         { id: 'DROOP', label: 'ActivePowerRegulationDroop', unit: PERCENTAGE },
@@ -77,8 +77,8 @@ export const EQUIPMENTS_FIELDS: EquipmentFields = {
     [EQUIPMENT_TYPES.BATTERY]: [
         { id: 'MINIMUM_ACTIVE_POWER', label: 'MinimumActivePowerText', unit: MEGA_WATT },
         { id: 'MAXIMUM_ACTIVE_POWER', label: 'MaximumActivePowerText', unit: MEGA_WATT },
-        { id: 'ACTIVE_POWER_SET_POINT', label: 'ActivePowerText', unit: MEGA_WATT },
-        { id: 'REACTIVE_POWER_SET_POINT', label: 'ReactivePowerText', unit: MEGA_VAR },
+        { id: 'ACTIVE_POWER_SET_POINT', label: 'ActivePowerSetPointText', unit: MEGA_WATT },
+        { id: 'REACTIVE_POWER_SET_POINT', label: 'ReactivePowerSetPointText', unit: MEGA_VAR },
         { id: 'DROOP', label: 'Droop', unit: PERCENTAGE },
     ],
     [EQUIPMENT_TYPES.SHUNT_COMPENSATOR]: [
@@ -103,8 +103,8 @@ export const EQUIPMENTS_FIELDS: EquipmentFields = {
         },
     ],
     [EQUIPMENT_TYPES.LOAD]: [
-        { id: 'ACTIVE_POWER', label: 'ActivePowerText', unit: MEGA_WATT },
-        { id: 'REACTIVE_POWER', label: 'ReactivePowerText', unit: MEGA_VAR },
+        { id: 'ACTIVE_POWER_SET_POINT', label: 'ActivePowerSetPointText', unit: MEGA_WATT },
+        { id: 'REACTIVE_POWER_SET_POINT', label: 'ReactivePowerSetPointText', unit: MEGA_VAR },
     ],
     [EQUIPMENT_TYPES.TWO_WINDINGS_TRANSFORMER]: [
         { id: 'R', label: 'SeriesResistanceText', unit: OHM },

src/translations/en.json

@@ -541,7 +541,9 @@
     "Auxiliary": "Auxiliary",
     "Fictitious": "Fictitious",
     "ActivePowerText": "Active power",
+    "ActivePowerSetPointText": "Active power setpoint",
     "ReactivePowerText": "Reactive power",
+    "ReactivePowerSetPointText": "Reactive power setpoint",
     "BusBarBus": "Bus bar section / bus",
     "Buses": "Buses",
     "Magnitude": "Voltage magnitude",
@@ -696,7 +698,7 @@
     "Droop": "Droop",
     "PlannedActivePowerSetPointForm": "Planning active power set point",
     "plannedActivePowerSetPoint": "Planning P (MW)",
-    "MarginalCost": "Cost",
+    "MarginalCost": "Generation dispatch cost",
     "plannedOutageRate": "Planning outage rate",
     "forcedOutageRate": "Forced outage rate",
     "MinActivePowerMustBeLessOrEqualToMaxActivePower": "Minimum active power value must be less than or equal to maximum active power value",

src/translations/fr.json

@@ -541,7 +541,9 @@
     "Auxiliary": "Auxiliaire",
     "Fictitious": "Fictif",
     "ActivePowerText": "Puissance active",
+    "ActivePowerSetPointText": "Consigne de puissance active",
     "ReactivePowerText": "Puissance réactive",
+    "ReactivePowerSetPointText": "Consigne de puissance réactive",
     "BusBarBus": "SJB / nœud",
     "Buses": "Nœuds électriques",
     "Magnitude": "Tension",
@@ -692,7 +694,7 @@
     "Droop": "Participation",
     "PlannedActivePowerSetPointForm": "Puissance imposée",
     "plannedActivePowerSetPoint": "P imposée (MW)",
-    "MarginalCost": "Coût",
+    "MarginalCost": "Coût de démarrage",
     "plannedOutageRate": "Indisponibilité programmée",
     "forcedOutageRate": "Indisponibilité fortuite",
     "MinActivePowerMustBeLessOrEqualToMaxActivePower": "La valeur de la puissance active min doit être inférieure ou égale à la valeur de la puissance active max",