@gridsuite/commons-ui 0.276.0 → 0.277.0

package/dist/features/network-modifications/common/properties/properties.type.d.ts

@@ -12,3 +12,6 @@ export type Property = {
 export type Properties = {
     [FieldConstants.ADDITIONAL_PROPERTIES]?: Property[];
 };
+export type FilledProperties = {
+    [FieldConstants.ADDITIONAL_PROPERTIES]: FilledProperty[];
+};

package/dist/features/network-modifications/common/properties/propertyUtils.d.ts

@@ -1,5 +1,5 @@
 import { PredefinedProperties } from '../../../../utils';
-import { FilledProperty, Properties, Property } from './properties.type';
+import { FilledProperties, FilledProperty, Properties, Property } from './properties.type';
 export type EquipmentWithProperties = {
     properties?: Record<string, string>;
 };
@@ -7,9 +7,9 @@ export declare const fetchPredefinedProperties: (networkElementType: string) =>
 export declare const emptyProperties: Properties;
 export declare const createPropertyModification: (name: string, value: string | null) => Property;
 export declare const initializedProperty: () => Property;
-export declare const getFilledPropertiesFromModification: (properties: Property[] | undefined | null) => FilledProperty[];
+export declare const getFilledPropertiesFromModification: (properties: Property[] | undefined | null, includePreviousValue?: boolean) => FilledProperty[];
 export declare const getPropertiesFromModification: (properties: Property[] | undefined | null, includePreviousValue?: boolean) => Properties;
-export declare const copyEquipmentPropertiesForCreation: (equipmentInfos: EquipmentWithProperties) => Properties;
+export declare const copyEquipmentPropertiesForCreation: (equipmentInfos: EquipmentWithProperties) => FilledProperties;
 export declare const mergeModificationAndEquipmentProperties: (modificationProperties: Property[], equipment: EquipmentWithProperties) => Property[];
 export declare function getConcatenatedProperties(equipment: EquipmentWithProperties, getValues: (name: string) => any, id?: string): any;
 export declare const toModificationProperties: (properties: Properties) => Property[] | null;

package/dist/features/network-modifications/common/properties/propertyUtils.js

@@ -29,12 +29,12 @@ const initializedProperty = () => {
 const isFilledProperty = (property) => {
   return property.value != null;
 };
-const getFilledPropertiesFromModification = (properties) => {
+const getFilledPropertiesFromModification = (properties, includePreviousValue = true) => {
   return properties?.filter(isFilledProperty).map((p) => {
     return {
       [FieldConstants.NAME]: p[FieldConstants.NAME],
       [FieldConstants.VALUE]: p[FieldConstants.VALUE],
-      [FieldConstants.PREVIOUS_VALUE]: p[FieldConstants.PREVIOUS_VALUE],
+      [FieldConstants.PREVIOUS_VALUE]: includePreviousValue ? p[FieldConstants.PREVIOUS_VALUE] : void 0,
       [FieldConstants.ADDED]: p[FieldConstants.ADDED],
       [FieldConstants.DELETION_MARK]: p[FieldConstants.DELETION_MARK]
     };

package/dist/features/network-modifications/voltageLevel/creation/voltageLevelCreation.utils.d.ts

@@ -118,28 +118,4 @@ export declare const voltageLevelCreationEmptyFormData: {
 };
 export declare const voltageLevelCreationFormToDto: (voltageLevelForm: VoltageLevelCreationFormData) => VoltageLevelCreationDto;
 export declare const translateSwitchKinds: (switchKinds: SwitchKind[] | null, intl?: IntlShape) => string;
-export declare const voltageLevelCreationDtoToForm: (voltageLevelDto: VoltageLevelCreationDto, intl?: IntlShape, includePreviousValue?: boolean) => {
-    AdditionalProperties?: import('../..').Property[];
-    equipmentID: string;
-    equipmentName: string;
-    substationId: string | null;
-    nominalV: number | null;
-    lowVoltageLimit: number | null;
-    highVoltageLimit: number | null;
-    lowShortCircuitCurrentLimit: any;
-    highShortCircuitCurrentLimit: any;
-    busbarCount: number;
-    sectionCount: number;
-    switchesBetweenSections: string;
-    couplingOmnibus: import('./voltageLevelCreation.types').CouplingDevice[];
-    switchKinds: {
-        switchKind: SwitchKind;
-    }[];
-    addSubstationCreationId: boolean;
-    substationCreationId: string | null;
-    substationName: string | null;
-    country: string | null;
-    substationCreation: import('../..').Properties;
-    hideNominalVoltage: boolean;
-    hideBusBarSection: boolean;
-};
+export declare const voltageLevelCreationDtoToForm: (voltageLevelDto: VoltageLevelCreationDto, intl?: IntlShape, includePreviousValue?: boolean) => VoltageLevelCreationFormData;

package/dist/features/network-modifications/voltageLevel/creation/voltageLevelCreation.utils.js

@@ -1,5 +1,5 @@
 import { object, array, string, ref, number, boolean } from "yup";
-import { creationPropertiesSchema, getPropertiesFromModification, emptyProperties, toModificationProperties } from "../../common/properties/propertyUtils.js";
+import { creationPropertiesSchema, getFilledPropertiesFromModification, toModificationProperties } from "../../common/properties/propertyUtils.js";
 import { FieldConstants } from "../../../../utils/constants/fieldConstants.js";
 import { SHORT_CIRCUIT_CURRENT_LIMIT_MUST_BE_GREATER_OR_EQUAL_TO_ZERO, MUST_BE_GREATER_OR_EQUAL_TO_ZERO, CREATE_SUBSTATION_IN_VOLTAGE_LEVEL_IDENTICAL_ID } from "../../../../utils/constants/translationKeys.js";
 import { convertInputValue, convertOutputValue } from "../../../../utils/conversionUtils.js";
@@ -234,7 +234,9 @@ const voltageLevelCreationFormToDto = (voltageLevelForm) => {
 const translateSwitchKinds = (switchKinds, intl) => switchKinds?.map((kind) => intl ? intl.formatMessage({ id: kind }) : kind).join(" / ") ?? "";
 const voltageLevelCreationDtoToForm = (voltageLevelDto, intl, includePreviousValue = true) => {
   const isSubstationCreation = voltageLevelDto.substationCreation?.equipmentId != null;
-  const substationProperties = isSubstationCreation ? getPropertiesFromModification(voltageLevelDto.substationCreation?.properties, includePreviousValue) : emptyProperties;
+  const substationProperties = {
+    [FieldConstants.ADDITIONAL_PROPERTIES]: isSubstationCreation ? getFilledPropertiesFromModification(voltageLevelDto.substationCreation?.properties, includePreviousValue) : []
+  };
   return {
     [FieldConstants.EQUIPMENT_ID]: voltageLevelDto.equipmentId,
     [FieldConstants.EQUIPMENT_NAME]: voltageLevelDto.equipmentName ?? "",
@@ -264,7 +266,10 @@ const voltageLevelCreationDtoToForm = (voltageLevelDto, intl, includePreviousVal
     [FieldConstants.SUBSTATION_CREATION]: substationProperties,
     [FieldConstants.HIDE_NOMINAL_VOLTAGE]: false,
     [FieldConstants.HIDE_BUS_BAR_SECTION]: false,
-    ...getPropertiesFromModification(voltageLevelDto.properties, includePreviousValue)
+    [FieldConstants.ADDITIONAL_PROPERTIES]: getFilledPropertiesFromModification(
+      voltageLevelDto.properties,
+      includePreviousValue
+    )
   };
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.276.0",
+    "version": "0.277.0",
     "description": "common react components for gridsuite applications",
     "author": "gridsuite team",
     "homepage": "https://github.com/gridsuite",