gather all the unit conversions into one file

src/components/dialogs/converter-unit-utils.ts

@@ -0,0 +1,87 @@
+import { kiloUnitToUnit, microUnitToUnit, unitToKiloUnit, unitToMicroUnit } from '@gridsuite/commons-ui';
+
+export enum FieldType {
+    ID = 'ID',
+    NAME = 'NAME',
+    NOMINAL_VOLTAGE = 'NOMINAL_VOLTAGE',
+    TARGET_V = 'TARGET_V',
+    TARGET_P = 'TARGET_P',
+    COUNTRY = 'COUNTRY',
+    PLANNED_ACTIVE_POWER_SET_POINT = 'PLANNED_ACTIVE_POWER_SET_POINT',
+    MARGINAL_COST = 'MARGINAL_COST',
+    PLANNED_OUTAGE_RATE = 'PLANNED_OUTAGE_RATE',
+    FORCED_OUTAGE_RATE = 'FORCED_OUTAGE_RATE',
+    P0 = 'P0',
+    Q0 = 'Q0',
+    LOW_VOLTAGE_LIMIT = 'LOW_VOLTAGE_LIMIT',
+    HIGH_VOLTAGE_LIMIT = 'HIGH_VOLTAGE_LIMIT',
+    SECTION_COUNT = 'SECTION_COUNT',
+    MAXIMUM_SECTION_COUNT = 'MAXIMUM_SECTION_COUNT',
+    CONNECTED = 'CONNECTED',
+    MAX_Q_AT_NOMINAL_V = 'MAX_Q_AT_NOMINAL_V',
+    SHUNT_CONDUCTANCE_1 = 'SHUNT_CONDUCTANCE_1',
+    SHUNT_CONDUCTANCE_2 = 'SHUNT_CONDUCTANCE_2',
+    SHUNT_SUSCEPTANCE = 'SHUNT_SUSCEPTANCE',
+    SHUNT_SUSCEPTANCE_1 = 'SHUNT_SUSCEPTANCE_1',
+    SHUNT_SUSCEPTANCE_2 = 'SHUNT_SUSCEPTANCE_2',
+    VOLTAGE_SET_POINT = 'VOLTAGE_SET_POINT',
+    ACTIVE_POWER_SET_POINT = 'ACTIVE_POWER_SET_POINT',
+    REACTIVE_POWER_SET_POINT = 'REACTIVE_POWER_SET_POINT',
+    LOW_SHORT_CIRCUIT_CURRENT_LIMIT = 'LOW_SHORT_CIRCUIT_CURRENT_LIMIT',
+    HIGH_SHORT_CIRCUIT_CURRENT_LIMIT = 'HIGH_SHORT_CIRCUIT_CURRENT_LIMIT',
+    MAXIMUM_SUSCEPTANCE = 'MAXIMUM_SUSCEPTANCE',
+    R = 'R',
+    X = 'X',
+    G = 'G',
+    B = 'B',
+    G1 = 'G1',
+    B1 = 'B1',
+    G2 = 'G2',
+    B2 = 'B2',
+}
+
+const microUnits = [
+    FieldType.SHUNT_CONDUCTANCE_1,
+    FieldType.SHUNT_CONDUCTANCE_2,
+    FieldType.SHUNT_SUSCEPTANCE_1,
+    FieldType.SHUNT_SUSCEPTANCE_2,
+    FieldType.G,
+    FieldType.B,
+    FieldType.G1,
+    FieldType.B1,
+    FieldType.G2,
+    FieldType.B2,
+];
+
+const kiloUnits = [FieldType.HIGH_SHORT_CIRCUIT_CURRENT_LIMIT, FieldType.LOW_SHORT_CIRCUIT_CURRENT_LIMIT];
+export function convertInputValues(field: FieldType, value: any) {
+    if (microUnits.includes(field)) {
+        if (!Array.isArray(value)) {
+            return value ? unitToMicroUnit(value) : value;
+        }
+        return value.map((a: number) => unitToMicroUnit(a));
+    }
+    if (kiloUnits.includes(field)) {
+        if (!Array.isArray(value)) {
+            return value ? kiloUnitToUnit(value) : value;
+        }
+        return value.map((a: number) => kiloUnitToUnit(a));
+    }
+    return value;
+}
+
+export function convertOutputValues(field: FieldType, value: any) {
+    if (microUnits.includes(field)) {
+        if (!Array.isArray(value)) {
+            return value ? microUnitToUnit(value) : value;
+        }
+        return value.map((a: number) => microUnitToUnit(a));
+    }
+    if (kiloUnits.includes(field)) {
+        if (!Array.isArray(value)) {
+            return value ? unitToKiloUnit(value) : value;
+        }
+        return value.map((a: number) => unitToKiloUnit(a));
+    }
+    return value;
+}

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

@@ -8,7 +8,7 @@
 import type { ReadonlyDeep } from 'type-fest';
 import { DataType, FieldOptionType, FieldType } from './assignment.type';
 import { LOAD_TYPES } from '../../../../../network/constants';
-import { EquipmentType, kiloUnitToUnit, microUnitToUnit, unitToKiloUnit, unitToMicroUnit } from '@gridsuite/commons-ui';
+import { EquipmentType } from '@gridsuite/commons-ui';
 import { KILO_AMPERE, MICRO_SIEMENS } from '../../../../../utils/field-constants';
 
 export const FIELD_OPTIONS = {
@@ -107,16 +107,12 @@ export const FIELD_OPTIONS = {
         label: 'maxSusceptance',
         unit: MICRO_SIEMENS,
         dataType: DataType.DOUBLE,
-        outputConverter: (value) => microUnitToUnit(value),
-        inputConverter: (value) => unitToMicroUnit(value),
     },
     MAXIMUM_Q_AT_NOMINAL_VOLTAGE: {
         id: FieldType.MAXIMUM_Q_AT_NOMINAL_VOLTAGE,
         label: 'maxQAtNominalV',
         unit: MICRO_SIEMENS,
         dataType: DataType.DOUBLE,
-        outputConverter: (value) => microUnitToUnit(value),
-        inputConverter: (value) => unitToMicroUnit(value),
     },
     NOMINAL_VOLTAGE: {
         id: FieldType.NOMINAL_VOLTAGE,
@@ -138,16 +134,12 @@ export const FIELD_OPTIONS = {
         label: 'LowShortCircuitCurrentLimit',
         unit: KILO_AMPERE,
         dataType: DataType.DOUBLE,
-        outputConverter: (value) => kiloUnitToUnit(value),
-        inputConverter: (value) => unitToKiloUnit(value),
     },
     HIGH_SHORT_CIRCUIT_CURRENT_LIMIT: {
         id: FieldType.HIGH_SHORT_CIRCUIT_CURRENT_LIMIT,
         label: 'HighShortCircuitCurrentLimit',
         unit: KILO_AMPERE,
         dataType: DataType.DOUBLE,
-        outputConverter: (value) => kiloUnitToUnit(value),
-        inputConverter: (value) => unitToKiloUnit(value),
     },
     ACTIVE_POWER: {
         id: FieldType.ACTIVE_POWER,
@@ -174,16 +166,12 @@ export const FIELD_OPTIONS = {
         label: 'G',
         unit: MICRO_SIEMENS,
         dataType: DataType.DOUBLE,
-        outputConverter: (value) => microUnitToUnit(value),
-        inputConverter: (value) => unitToMicroUnit(value),
     },
     B: {
         id: FieldType.B,
         label: 'B',
         unit: MICRO_SIEMENS,
         dataType: DataType.DOUBLE,
-        outputConverter: (value) => microUnitToUnit(value),
-        inputConverter: (value) => unitToMicroUnit(value),
     },
     RATED_U1: {
         id: FieldType.RATED_U1,

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

@@ -26,12 +26,6 @@ export const getFieldOption = (fieldName?: string | null) => {
     return Object.values(FIELD_OPTIONS).find((fieldOption) => fieldOption.id === fieldName);
 };
 
-export const convertOutputValue = (fieldName?: string | null, fieldValue?: FieldValue) => {
-    const fieldOption = getFieldOption(fieldName);
-    // @ts-expect-error TODO TS2339: Property outputConverter does not exist on typeof FIELD_OPTIONS[*]
-    return fieldOption?.outputConverter ? fieldOption.outputConverter(Number(fieldValue)) : fieldValue;
-};
-
 export const convertInputValue = (fieldName?: string | null, fieldValue?: FieldValue) => {
     const fieldOption = getFieldOption(fieldName);
     // @ts-expect-error TODO TS2339: Property inputConverter does not exist on typeof FIELD_OPTIONS[*]

src/components/dialogs/network-modifications/by-filter/by-assignment/modification-by-assignment-dialog.tsx

@@ -19,14 +19,14 @@ import { ASSIGNMENTS, EDITED_FIELD, EQUIPMENT_TYPE_FIELD, VALUE_FIELD } from '..
 import { modifyByAssignment } from '../../../../../services/study/network-modifications';
 import {
     convertInputValue,
-    convertOutputValue,
     getAssignmentFromEditData,
     getAssignmentInitialValue,
     getAssignmentsSchema,
     getDataType,
 } from './assignment/assignment-utils';
 import { Assignment, ModificationByAssignment } from './assignment/assignment.type';
 import { DeepNullable } from '../../../../utils/ts-utils';
+import { convertOutputValues, FieldType } from '../../../converter-unit-utils';
 
 const formSchema = yup
     .object()
@@ -93,7 +93,11 @@ const ModificationByAssignmentDialog: FC<any> = ({
         (formData: ModificationByAssignment) => {
             const assignmentsList = formData[ASSIGNMENTS].map((assignment) => {
                 const dataType = getDataType(assignment[EDITED_FIELD]);
-                const valueConverted = convertOutputValue(assignment[EDITED_FIELD], assignment[VALUE_FIELD]);
+                console.log('=================assignment[EDITED_FIELD]', assignment[EDITED_FIELD]);
+                const fieldKey = assignment[EDITED_FIELD] as keyof typeof FieldType;
+                const field = FieldType[fieldKey];
+                const value = assignment[VALUE_FIELD];
+                const valueConverted = convertOutputValues(field, value);
                 return {
                     ...assignment,
                     dataType,

src/components/dialogs/network-modifications/line/characteristics-pane/line-characteristics-pane.jsx

@@ -20,11 +20,11 @@ import {
     R,
     X,
 } from 'components/utils/field-constants';
-import { unitToMicroUnit } from 'utils/unit-converter';
 import PropertiesForm from '../../common/properties/properties-form';
 import useVoltageLevelsListInfos from '../../../../../hooks/use-voltage-levels-list-infos';
 import GridSection from '../../../commons/grid-section';
 import GridItem from '../../../commons/grid-item';
+import { convertInputValues, FieldType } from '../../../converter-unit-utils';
 
 const styles = {
     h3: {
@@ -70,7 +70,7 @@ const LineCharacteristicsPane = ({
             name={`${id}.${G1}`}
             label="ShuntConductanceText"
             adornment={MicroSusceptanceAdornment}
-            previousValue={unitToMicroUnit(lineToModify?.g1)}
+            previousValue={convertInputValues(FieldType.G1, lineToModify?.g1)}
             clearable={clearableFields}
         />
     );
@@ -80,7 +80,7 @@ const LineCharacteristicsPane = ({
             name={`${id}.${B1}`}
             label="ShuntSusceptanceText"
             adornment={MicroSusceptanceAdornment}
-            previousValue={unitToMicroUnit(lineToModify?.b1)}
+            previousValue={convertInputValues(FieldType.B1, lineToModify?.b1)}
             clearable={clearableFields}
         />
     );
@@ -90,7 +90,7 @@ const LineCharacteristicsPane = ({
             name={`${id}.${G2}`}
             label="ShuntConductanceText"
             adornment={MicroSusceptanceAdornment}
-            previousValue={unitToMicroUnit(lineToModify?.g2)}
+            previousValue={convertInputValues(FieldType.G2, lineToModify?.g2)}
             clearable={clearableFields}
         />
     );
@@ -100,7 +100,7 @@ const LineCharacteristicsPane = ({
             name={`${id}.${B2}`}
             label="ShuntSusceptanceText"
             adornment={MicroSusceptanceAdornment}
-            previousValue={unitToMicroUnit(lineToModify?.b2)}
+            previousValue={convertInputValues(FieldType.B2, lineToModify?.b2)}
             clearable={clearableFields}
         />
     );

src/components/dialogs/network-modifications/line/creation/line-creation-dialog.jsx

@@ -41,7 +41,6 @@ import PropTypes from 'prop-types';
 import { useCallback, useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { FetchStatus } from '../../../../../services/utils';
-import { microUnitToUnit, unitToMicroUnit } from 'utils/unit-converter';
 import { FORM_LOADING_DELAY, UNDEFINED_CONNECTION_DIRECTION } from 'components/network/constants';
 import yup from 'components/utils/yup-config';
 import ModificationDialog from '../../../commons/modificationDialog';
@@ -76,6 +75,7 @@ import {
     toModificationProperties,
 } from '../../common/properties/property-utils';
 import GridItem from '../../../commons/grid-item';
+import { convertInputValues, convertOutputValues, FieldType } from '../../../converter-unit-utils';
 
 const emptyFormData = {
     ...getHeaderEmptyFormData(),
@@ -149,10 +149,10 @@ const LineCreationDialog = ({
                 ...getCharacteristicsFormData({
                     r: line.r,
                     x: line.x,
-                    g1: unitToMicroUnit(line.g1), // this form uses and displays microSiemens
-                    b1: unitToMicroUnit(line.b1),
-                    g2: unitToMicroUnit(line.g2),
-                    b2: unitToMicroUnit(line.b2),
+                    g1: convertInputValues(FieldType.G1, line.g1), // this form uses and displays microSiemens
+                    b1: convertInputValues(FieldType.B1, line.b1),
+                    g2: convertInputValues(FieldType.G2, line.g2),
+                    b2: convertInputValues(FieldType.B2, line.b2),
                     ...(displayConnectivity &&
                         getConnectivityFormData(
                             {
@@ -200,10 +200,10 @@ const LineCreationDialog = ({
                 ...getCharacteristicsFormData({
                     r: line.r,
                     x: line.x,
-                    g1: unitToMicroUnit(line.g1),
-                    b1: unitToMicroUnit(line.b1),
-                    g2: unitToMicroUnit(line.g2),
-                    b2: unitToMicroUnit(line.b2),
+                    g1: convertInputValues(FieldType.G1, line.g1),
+                    b1: convertInputValues(FieldType.B1, line.b1),
+                    g2: convertInputValues(FieldType.G2, line.g2),
+                    b2: convertInputValues(FieldType.B2, line.b2),
                     ...getConnectivityFormData(
                         {
                             busbarSectionId: line.busOrBusbarSectionId1,
@@ -290,10 +290,10 @@ const LineCreationDialog = ({
                 sanitizeString(header[EQUIPMENT_NAME]),
                 characteristics[R],
                 characteristics[X],
-                microUnitToUnit(characteristics[G1]),
-                microUnitToUnit(characteristics[B1]),
-                microUnitToUnit(characteristics[G2]),
-                microUnitToUnit(characteristics[B2]),
+                convertOutputValues(FieldType.G1, characteristics[G1]),
+                convertOutputValues(FieldType.B1, characteristics[B1]),
+                convertOutputValues(FieldType.G2, characteristics[G2]),
+                convertOutputValues(FieldType.B2, characteristics[B2]),
                 characteristics[CONNECTIVITY_1]?.[VOLTAGE_LEVEL]?.id,
                 characteristics[CONNECTIVITY_1]?.[BUS_OR_BUSBAR_SECTION]?.id,
                 characteristics[CONNECTIVITY_2]?.[VOLTAGE_LEVEL]?.id,

src/components/dialogs/network-modifications/line/modification/line-modification-dialog.jsx

@@ -39,7 +39,6 @@ import {
 } from 'components/utils/field-constants';
 import { useForm } from 'react-hook-form';
 import { sanitizeString } from 'components/dialogs/dialog-utils';
-import { microUnitToUnit, unitToMicroUnit } from 'utils/unit-converter';
 import yup from 'components/utils/yup-config';
 import ModificationDialog from '../../../commons/modificationDialog';
 
@@ -81,6 +80,7 @@ import {
     getConnectivityFormData,
     getCont1Cont2WithPositionEmptyFormData,
 } from '../../../connectivity/connectivity-form-utils';
+import { convertInputValues, convertOutputValues, FieldType } from '../../../converter-unit-utils';
 
 export const LineModificationDialogTab = {
     CONNECTIVITY_TAB: 0,
@@ -161,10 +161,10 @@ const LineModificationDialog = ({
                 ...getCharacteristicsWithOutConnectivityFormData({
                     r: line.r?.value ?? null,
                     x: line.x?.value ?? null,
-                    g1: unitToMicroUnit(line.g1?.value ?? null),
-                    b1: unitToMicroUnit(line.b1?.value ?? null),
-                    g2: unitToMicroUnit(line.g2?.value ?? null),
-                    b2: unitToMicroUnit(line.b2?.value ?? null),
+                    g1: convertInputValues(FieldType.G1, line.g1?.value ?? null),
+                    b1: convertInputValues(FieldType.B1, line.b1?.value ?? null),
+                    g2: convertInputValues(FieldType.G2, line.g2?.value ?? null),
+                    b2: convertInputValues(FieldType.B2, line.b2?.value ?? null),
                 }),
                 ...getLimitsFormData({
                     permanentLimit1: line.currentLimits1?.permanentLimit,
@@ -242,10 +242,10 @@ const LineModificationDialog = ({
                 sanitizeString(line[EQUIPMENT_NAME]),
                 characteristics[R],
                 characteristics[X],
-                microUnitToUnit(characteristics[G1]),
-                microUnitToUnit(characteristics[B1]),
-                microUnitToUnit(characteristics[G2]),
-                microUnitToUnit(characteristics[B2]),
+                convertOutputValues(FieldType.G1, characteristics[G1]),
+                convertOutputValues(FieldType.B1, characteristics[B1]),
+                convertOutputValues(FieldType.G2, characteristics[G2]),
+                convertOutputValues(FieldType.B2, characteristics[B2]),
                 currentLimits1,
                 currentLimits2,
                 connectivity1[VOLTAGE_LEVEL]?.id,

src/components/dialogs/network-modifications/tabular-modification/tabular-modification-dialog.jsx

@@ -19,13 +19,13 @@ import { createTabulareModification } from 'services/study/network-modifications
 import { FetchStatus } from 'services/utils';
 import TabularModificationForm from './tabular-modification-form';
 import {
-    convertValueFromBackToFront,
-    convertValueFromFrontToBack,
     formatModification,
     getEquipmentTypeFromModificationType,
     TABULAR_MODIFICATION_TYPES,
 } from './tabular-modification-utils';
 import { useIntl } from 'react-intl';
+import { convertInputValues, convertOutputValues, FieldType } from '../../converter-unit-utils';
+import { toModificationOperation } from '../../../utils/utils.js';
 
 const formSchema = yup
     .object()
@@ -76,7 +76,7 @@ const TabularModificationDialog = ({
             const modifications = editData?.modifications.map((modif) => {
                 const modification = {};
                 Object.keys(formatModification(modif)).forEach((key) => {
-                    modification[key] = convertValueFromBackToFront(key, modif[key]);
+                    modification[key] = convertInputValues(FieldType[key], modif[key]);
                 });
                 return modification;
             });
@@ -95,7 +95,7 @@ const TabularModificationDialog = ({
                     type: modificationType,
                 };
                 Object.keys(row).forEach((key) => {
-                    modification[key] = convertValueFromFrontToBack(key, row[key]);
+                    modification[key] = toModificationOperation(convertOutputValues(FieldType[key], row[key]));
                 });
                 return modification;
             });