@gridsuite/commons-ui 0.72.0 → 0.72.2

package/dist/components/checkBoxList/DraggableClickableRowItem.js

@@ -2,6 +2,9 @@ import { jsxs, jsx } from "react/jsx-runtime";
 import DragIndicatorIcon from "@mui/icons-material/DragIndicator";
 import { ListItemButton, IconButton, ListItemIcon, Checkbox, ListItemText } from "@mui/material";
 import { OverflowableText } from "../overflowableText/OverflowableText.js";
+import "@mui/icons-material";
+import { mergeSx } from "../../utils/styles.js";
+import "../../utils/yupConfig.js";
 const styles = {
   dragIcon: (theme) => ({
     padding: "unset",
@@ -36,11 +39,7 @@ function DraggableClickableRowItem({
     ListItemButton,
     {
       disableTouchRipple: !isItemClickable,
-      sx: {
-        paddingLeft: 0,
-        ...sx == null ? void 0 : sx.checkboxButton,
-        ...!isItemClickable && styles.unclickableItem
-      },
+      sx: mergeSx({ paddingLeft: 0 }, sx == null ? void 0 : sx.checkboxButton, !isItemClickable ? styles.unclickableItem : void 0),
       disabled,
       onClick: handleItemClick,
       children: [

package/dist/components/dialogs/customMuiDialog/CustomMuiDialog.d.ts

@@ -1,20 +1,19 @@
-import { MergedFormContextProps } from '../../inputs/reactHookForm/provider/CustomFormProvider';
-import { FieldErrors, UseFormReturn } from 'react-hook-form';
-import { default as React } from 'react';
+import { ObjectSchema } from 'yup';
+import { FieldErrors, FieldValues, SubmitHandler, UseFormReturn } from 'react-hook-form';
+import { MouseEvent, ReactNode } from 'react';
 
-import * as yup from 'yup';
-export interface CustomMuiDialogProps {
+export interface CustomMuiDialogProps<T extends FieldValues = FieldValues> {
     open: boolean;
-    formSchema: yup.AnySchema;
-    formMethods: UseFormReturn<any> | MergedFormContextProps;
-    onClose: (event: React.MouseEvent) => void;
-    onSave: (data: any) => void;
+    formSchema: ObjectSchema<T>;
+    formMethods: UseFormReturn<T>;
+    onClose: (event?: MouseEvent) => void;
+    onSave: SubmitHandler<T>;
     onValidationError?: (errors: FieldErrors) => void;
     titleId: string;
     disabledSave?: boolean;
     removeOptional?: boolean;
     onCancel?: () => void;
-    children: React.ReactNode;
+    children: ReactNode;
     isDataFetching?: boolean;
     language?: string;
     confirmationMessageKey?: string;
@@ -52,4 +51,4 @@ export declare const unscrollableDialogStyles: {
         padding: number;
     };
 };
-export declare function CustomMuiDialog({ open, formSchema, formMethods, onClose, onSave, isDataFetching, onValidationError, titleId, disabledSave, removeOptional, onCancel, children, language, confirmationMessageKey, unscrollableFullHeight, }: Readonly<CustomMuiDialogProps>): import("react/jsx-runtime").JSX.Element;
+export declare function CustomMuiDialog<T extends FieldValues = FieldValues>({ open, formSchema, formMethods, onClose, onSave, isDataFetching, onValidationError, titleId, disabledSave, removeOptional, onCancel, children, language, confirmationMessageKey, unscrollableFullHeight, }: Readonly<CustomMuiDialogProps<T>>): import("react/jsx-runtime").JSX.Element;

package/dist/components/dialogs/customMuiDialog/CustomMuiDialog.js

@@ -56,7 +56,7 @@ function CustomMuiDialog({
   unscrollableFullHeight = false
 }) {
   const [openConfirmationPopup, setOpenConfirmationPopup] = useState(false);
-  const [validatedData, setValidatedData] = useState(void 0);
+  const [validatedData, setValidatedData] = useState();
   const { handleSubmit } = formMethods;
   const handleCancel = useCallback(
     (event) => {
@@ -74,7 +74,7 @@ function CustomMuiDialog({
   const validate = useCallback(
     (data) => {
       onSave(data);
-      onClose(data);
+      onClose();
     },
     [onClose, onSave]
   );
@@ -91,11 +91,16 @@ function CustomMuiDialog({
   );
   const handlePopupConfirmation = useCallback(() => {
     setOpenConfirmationPopup(false);
-    validate(validatedData);
+    if (validatedData) {
+      validate(validatedData);
+    }
   }, [validate, validatedData]);
-  const handleValidationError = (errors) => {
-    onValidationError == null ? void 0 : onValidationError(errors);
-  };
+  const handleValidationError = useCallback(
+    (errors) => {
+      onValidationError == null ? void 0 : onValidationError(errors);
+    },
+    [onValidationError]
+  );
   return /* @__PURE__ */ jsxs(
     CustomFormProvider,
     {

package/dist/components/dialogs/descriptionModificationDialog/DescriptionModificationDialog.js

@@ -36,13 +36,16 @@ function DescriptionModificationDialog({
   };
   const onSubmit = useCallback(
     (data) => {
+      var _a;
       updateElement(elementUuid, {
-        [FieldConstants.DESCRIPTION]: data[FieldConstants.DESCRIPTION].trim()
+        [FieldConstants.DESCRIPTION]: ((_a = data[FieldConstants.DESCRIPTION]) == null ? void 0 : _a.trim()) ?? ""
       }).catch((error) => {
-        snackError({
-          messageTxt: error.message,
-          headerId: "descriptionModificationError"
-        });
+        if (error instanceof Object && "message" in error && typeof error.message === "string") {
+          snackError({
+            messageTxt: error.message,
+            headerId: "descriptionModificationError"
+          });
+        }
       });
     },
     [elementUuid, updateElement, snackError]

package/dist/components/directoryItemSelector/DirectoryItemSelector.js

@@ -13,14 +13,14 @@ const styles = {
     height: "18px"
   })
 };
-function sameRights(a, b) {
-  if (!a && !b) {
+function sameRights(sourceAccessRights, accessRightsToCompare) {
+  if (!sourceAccessRights && !accessRightsToCompare) {
     return true;
   }
-  if (!a || !b) {
+  if (!sourceAccessRights || !accessRightsToCompare) {
     return false;
   }
-  return a.isPrivate === b.isPrivate;
+  return sourceAccessRights.isPrivate === accessRightsToCompare.isPrivate;
 }
 function flattenDownNodes(n, cef) {
   const subs = cef(n);
@@ -29,17 +29,17 @@ function flattenDownNodes(n, cef) {
   }
   return Array.prototype.concat([n], ...subs.map((sn) => flattenDownNodes(sn, cef)));
 }
-function refreshedUpNodes(m, nn) {
-  if (!(nn == null ? void 0 : nn.elementUuid)) {
+function refreshedUpNodes(nodeMap, newElement) {
+  if (!(newElement == null ? void 0 : newElement.elementUuid)) {
     return [];
   }
-  if (nn.parentUuid === null) {
-    return [nn];
+  if (newElement.parentUuid === null) {
+    return [newElement];
   }
-  const parent = m[nn.parentUuid];
-  const nextChildren = parent.children.map((c) => c.elementUuid === nn.elementUuid ? nn : c);
+  const parent = nodeMap[newElement.parentUuid];
+  const nextChildren = parent.children.map((c) => c.elementUuid === newElement.elementUuid ? newElement : c);
   const nextParent = { ...parent, children: nextChildren };
-  return [nn, ...refreshedUpNodes(m, nextParent)];
+  return [newElement, ...refreshedUpNodes(nodeMap, nextParent)];
 }
 function updatedTree(prevRoots, prevMap, nodeId, children) {
   var _a;

package/dist/components/filter/FilterCreationDialog.js

@@ -16,7 +16,7 @@ import * as yup from "yup";
 const emptyFormData = {
   [FieldConstants.NAME]: "",
   [FieldConstants.DESCRIPTION]: "",
-  [FieldConstants.FILTER_TYPE]: FilterType.CRITERIA_BASED.id,
+  [FieldConstants.FILTER_TYPE]: FilterType.EXPERT.id,
   [FieldConstants.EQUIPMENT_TYPE]: null,
   ...criteriaBasedFilterEmptyFormData,
   ...getExplicitNamingFilterEmptyFormData(),

package/dist/components/filter/HeaderFilterForm.js

@@ -13,6 +13,7 @@ function HeaderFilterForm({
   elementExists,
   handleFilterTypeChange
 }) {
+  const filterTypes = Object.values(FilterType).filter((value) => value.id !== "CRITERIA");
   return /* @__PURE__ */ jsxs(Grid, { container: true, spacing: 2, children: [
     /* @__PURE__ */ jsx(Grid, { item: true, xs: 12, children: /* @__PURE__ */ jsx(
       UniqueNameInput,
@@ -31,7 +32,7 @@ function HeaderFilterForm({
         RadioInput,
         {
           name: FieldConstants.FILTER_TYPE,
-          options: Object.values(FilterType),
+          options: filterTypes,
           formProps: { onChange: handleFilterTypeChange }
         }
       ) })

package/dist/components/filter/criteriaBased/CriteriaBasedFilterForm.d.ts

@@ -1,13 +1,49 @@
 import { default as yup } from '../../../utils/yupConfig';
 
 export declare const criteriaBasedFilterSchema: {
-    criteriaBased: yup.ObjectSchema<{
-        [x: string]: any;
+    readonly criteriaBased: yup.ObjectSchema<{
+        nominalVoltage3: {
+            value1: number | null;
+            value2: number | null;
+            type: string;
+        };
+        nominalVoltage2: {
+            value1: number | null;
+            value2: number | null;
+            type: string;
+        };
+        nominalVoltage1: {
+            value1: number | null;
+            value2: number | null;
+            type: string;
+        };
+        nominalVoltage: {
+            value1: number | null;
+            value2: number | null;
+            type: string;
+        };
+        countries: string[] | undefined;
+        countries1: string[] | undefined;
+        countries2: string[] | undefined;
     }, yup.AnyObject, {
-        [x: string]: any;
+        nominalVoltage3: any;
+        nominalVoltage2: any;
+        nominalVoltage1: any;
+        nominalVoltage: any;
+        countries: "";
+        countries1: "";
+        countries2: "";
     }, "">;
 };
 export declare const criteriaBasedFilterEmptyFormData: {
-    criteriaBased: any;
+    readonly criteriaBased: {
+        readonly countries: any;
+        readonly countries1: any;
+        readonly countries2: any;
+        readonly nominalVoltage: any;
+        readonly nominalVoltage1: any;
+        readonly nominalVoltage2: any;
+        readonly nominalVoltage3: any;
+    };
 };
 export declare function CriteriaBasedFilterForm(): import("react/jsx-runtime").JSX.Element;

package/dist/components/filter/criteriaBased/CriteriaBasedFilterForm.js

@@ -11,7 +11,7 @@ const criteriaBasedFilterSchema = getCriteriaBasedSchema({
   [FieldConstants.ENERGY_SOURCE]: yup.string().nullable(),
   ...filterPropertiesYupSchema
 });
-const criteriaBasedFilterEmptyFormData = getCriteriaBasedFormData(null, {
+const criteriaBasedFilterEmptyFormData = getCriteriaBasedFormData(void 0, {
   [FieldConstants.ENERGY_SOURCE]: null,
   [FreePropertiesTypes.SUBSTATION_FILTER_PROPERTIES]: [],
   [FreePropertiesTypes.FREE_FILTER_PROPERTIES]: []

package/dist/components/filter/criteriaBased/criteriaBasedFilterUtils.d.ts

@@ -1,14 +1,63 @@
+import { RangeInputData } from '../../inputs/reactHookForm/numbers/RangeInput';
 import { default as yup } from '../../../utils/yupConfig';
+import { FieldConstants } from '../../../utils/constants/fieldConstants';
+import { ObjectSchema } from 'yup';
 
-export declare const getCriteriaBasedSchema: (extraFields: any) => {
-    criteriaBased: yup.ObjectSchema<{
-        [x: string]: any;
+export type CriteriaBasedData = {
+    [FieldConstants.COUNTRIES]?: string[];
+    [FieldConstants.COUNTRIES_1]?: string[];
+    [FieldConstants.COUNTRIES_2]?: string[];
+    [FieldConstants.NOMINAL_VOLTAGE]?: RangeInputData | null;
+    [FieldConstants.NOMINAL_VOLTAGE_1]?: RangeInputData | null;
+    [FieldConstants.NOMINAL_VOLTAGE_2]?: RangeInputData | null;
+    [FieldConstants.NOMINAL_VOLTAGE_3]?: RangeInputData | null;
+    [key: string]: any;
+};
+export declare function getCriteriaBasedSchema(extraFields?: Record<string, yup.AnyObject | null>): {
+    readonly criteriaBased: ObjectSchema<{
+        nominalVoltage3: {
+            value1: number | null;
+            value2: number | null;
+            type: string;
+        };
+        nominalVoltage2: {
+            value1: number | null;
+            value2: number | null;
+            type: string;
+        };
+        nominalVoltage1: {
+            value1: number | null;
+            value2: number | null;
+            type: string;
+        };
+        nominalVoltage: {
+            value1: number | null;
+            value2: number | null;
+            type: string;
+        };
+        countries: string[] | undefined;
+        countries1: string[] | undefined;
+        countries2: string[] | undefined;
     }, yup.AnyObject, {
-        [x: string]: any;
+        nominalVoltage3: any;
+        nominalVoltage2: any;
+        nominalVoltage1: any;
+        nominalVoltage: any;
+        countries: "";
+        countries1: "";
+        countries2: "";
     }, "">;
 };
-export declare const getCriteriaBasedFormData: (criteriaValues: any, extraFields: any) => {
-    criteriaBased: any;
+export declare function getCriteriaBasedFormData(criteriaValues?: Record<string, any>, extraFields?: Record<string, yup.AnyObject | null>): {
+    readonly criteriaBased: {
+        readonly countries: any;
+        readonly countries1: any;
+        readonly countries2: any;
+        readonly nominalVoltage: any;
+        readonly nominalVoltage1: any;
+        readonly nominalVoltage2: any;
+        readonly nominalVoltage3: any;
+    };
 };
 /**
  * Transform
@@ -21,9 +70,17 @@ export declare const getCriteriaBasedFormData: (criteriaValues: any, extraFields
  *  {name_property:namesB, prop_values:valuesB}]
  * @author Laurent LAUGARN modified by Florent MILLOT
  */
-export declare const backToFrontTweak: (response: any) => {
-    criteriaBased: any;
-    equipmentType: any;
+export declare function backToFrontTweak(response: any): {
+    readonly criteriaBased: {
+        readonly countries: any;
+        readonly countries1: any;
+        readonly countries2: any;
+        readonly nominalVoltage: any;
+        readonly nominalVoltage1: any;
+        readonly nominalVoltage2: any;
+        readonly nominalVoltage3: any;
+    };
+    readonly equipmentType: any;
 };
 /**
  * Transform
@@ -36,8 +93,8 @@ export declare const backToFrontTweak: (response: any) => {
  *  freeProperties2.{nameA:valuesC}}
  * @author Laurent LAUGARN modified by Florent MILLOT
  */
-export declare const frontToBackTweak: (id?: string, filter?: any) => {
+export declare function frontToBackTweak(id?: string, filter?: any): {
     id: string | undefined;
     type: string;
-    equipmentFilterForm: undefined;
+    equipmentFilterForm: any;
 };

package/dist/components/filter/criteriaBased/criteriaBasedFilterUtils.js

@@ -2,46 +2,38 @@ import { FieldConstants } from "../../../utils/constants/fieldConstants.js";
 import { PROPERTY_VALUES, PROPERTY_VALUES_1, PROPERTY_VALUES_2, PROPERTY_NAME } from "./FilterProperty.js";
 import { FilterType } from "../constants/FilterConstants.js";
 import "../../../utils/yupConfig.js";
-import { getRangeInputSchema, getRangeInputDataForm, DEFAULT_RANGE_VALUE } from "../../inputs/reactHookForm/numbers/RangeInput.js";
+import { getRangeInputSchema, DEFAULT_RANGE_VALUE } from "../../inputs/reactHookForm/numbers/RangeInput.js";
 import { FreePropertiesTypes } from "./FilterFreeProperties.js";
 import * as yup from "yup";
-const getCriteriaBasedSchema = (extraFields) => ({
-  [FieldConstants.CRITERIA_BASED]: yup.object().shape({
-    [FieldConstants.COUNTRIES]: yup.array().of(yup.string()),
-    [FieldConstants.COUNTRIES_1]: yup.array().of(yup.string()),
-    [FieldConstants.COUNTRIES_2]: yup.array().of(yup.string()),
-    ...getRangeInputSchema(FieldConstants.NOMINAL_VOLTAGE),
-    ...getRangeInputSchema(FieldConstants.NOMINAL_VOLTAGE_1),
-    ...getRangeInputSchema(FieldConstants.NOMINAL_VOLTAGE_2),
-    ...getRangeInputSchema(FieldConstants.NOMINAL_VOLTAGE_3),
-    ...extraFields
-  })
-});
-const getCriteriaBasedFormData = (criteriaValues, extraFields) => ({
-  [FieldConstants.CRITERIA_BASED]: {
-    [FieldConstants.COUNTRIES]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.COUNTRIES]) ?? [],
-    [FieldConstants.COUNTRIES_1]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.COUNTRIES_1]) ?? [],
-    [FieldConstants.COUNTRIES_2]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.COUNTRIES_2]) ?? [],
-    ...getRangeInputDataForm(
-      FieldConstants.NOMINAL_VOLTAGE,
-      (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.NOMINAL_VOLTAGE]) ?? DEFAULT_RANGE_VALUE
-    ),
-    ...getRangeInputDataForm(
-      FieldConstants.NOMINAL_VOLTAGE_1,
-      (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.NOMINAL_VOLTAGE_1]) ?? DEFAULT_RANGE_VALUE
-    ),
-    ...getRangeInputDataForm(
-      FieldConstants.NOMINAL_VOLTAGE_2,
-      (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.NOMINAL_VOLTAGE_2]) ?? DEFAULT_RANGE_VALUE
-    ),
-    ...getRangeInputDataForm(
-      FieldConstants.NOMINAL_VOLTAGE_3,
-      (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.NOMINAL_VOLTAGE_3]) ?? DEFAULT_RANGE_VALUE
-    ),
-    ...extraFields
-  }
-});
-const backToFrontTweak = (response) => {
+function getCriteriaBasedSchema(extraFields = {}) {
+  return {
+    [FieldConstants.CRITERIA_BASED]: yup.object().shape({
+      [FieldConstants.COUNTRIES]: yup.array().of(yup.string().required()),
+      [FieldConstants.COUNTRIES_1]: yup.array().of(yup.string().required()),
+      [FieldConstants.COUNTRIES_2]: yup.array().of(yup.string().required()),
+      ...getRangeInputSchema(FieldConstants.NOMINAL_VOLTAGE),
+      ...getRangeInputSchema(FieldConstants.NOMINAL_VOLTAGE_1),
+      ...getRangeInputSchema(FieldConstants.NOMINAL_VOLTAGE_2),
+      ...getRangeInputSchema(FieldConstants.NOMINAL_VOLTAGE_3),
+      ...extraFields
+    })
+  };
+}
+function getCriteriaBasedFormData(criteriaValues, extraFields = {}) {
+  return {
+    [FieldConstants.CRITERIA_BASED]: {
+      [FieldConstants.COUNTRIES]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.COUNTRIES]) ?? [],
+      [FieldConstants.COUNTRIES_1]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.COUNTRIES_1]) ?? [],
+      [FieldConstants.COUNTRIES_2]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.COUNTRIES_2]) ?? [],
+      [FieldConstants.NOMINAL_VOLTAGE]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.NOMINAL_VOLTAGE]) ?? DEFAULT_RANGE_VALUE,
+      [FieldConstants.NOMINAL_VOLTAGE_1]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.NOMINAL_VOLTAGE_1]) ?? DEFAULT_RANGE_VALUE,
+      [FieldConstants.NOMINAL_VOLTAGE_2]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.NOMINAL_VOLTAGE_2]) ?? DEFAULT_RANGE_VALUE,
+      [FieldConstants.NOMINAL_VOLTAGE_3]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.NOMINAL_VOLTAGE_3]) ?? DEFAULT_RANGE_VALUE,
+      ...extraFields
+    }
+  };
+}
+function backToFrontTweak(response) {
   const subProps = response.equipmentFilterForm.substationFreeProperties;
   const freeProps = response.equipmentFilterForm.freeProperties;
   const props1 = response.equipmentFilterForm.freeProperties1;
@@ -86,7 +78,7 @@ const backToFrontTweak = (response) => {
     }
     filterFreeProperties.push(prop);
   });
-  const ret = {
+  return {
     [FieldConstants.EQUIPMENT_TYPE]: response[FieldConstants.EQUIPMENT_TYPE],
     ...getCriteriaBasedFormData(response.equipmentFilterForm, {
       [FieldConstants.ENERGY_SOURCE]: response.equipmentFilterForm[FieldConstants.ENERGY_SOURCE],
@@ -94,8 +86,7 @@ const backToFrontTweak = (response) => {
       [FreePropertiesTypes.FREE_FILTER_PROPERTIES]: filterFreeProperties
     })
   };
-  return ret;
-};
+}
 function isNominalVoltageEmpty(nominalVoltage) {
   return nominalVoltage[FieldConstants.VALUE_1] === null && nominalVoltage[FieldConstants.VALUE_2] === null;
 }
@@ -115,18 +106,12 @@ function cleanNominalVoltages(formValues) {
   }
   return cleanedFormValues;
 }
-const frontToBackTweak = (id, filter) => {
+function frontToBackTweak(id, filter) {
   const filterSubstationProperties = filter[FieldConstants.CRITERIA_BASED][FreePropertiesTypes.SUBSTATION_FILTER_PROPERTIES];
-  const ret = {
-    id,
-    type: FilterType.CRITERIA_BASED.id,
-    equipmentFilterForm: void 0
-  };
   const eff = {
     [FieldConstants.EQUIPMENT_TYPE]: filter[FieldConstants.EQUIPMENT_TYPE],
     ...cleanNominalVoltages(filter[FieldConstants.CRITERIA_BASED])
   };
-  ret.equipmentFilterForm = eff;
   delete eff[FreePropertiesTypes.SUBSTATION_FILTER_PROPERTIES];
   const props = {};
   const props1 = {};
@@ -158,8 +143,13 @@ const frontToBackTweak = (id, filter) => {
     }
   });
   eff.freeProperties = freeProps;
-  return ret;
-};
+  return {
+    id,
+    type: FilterType.CRITERIA_BASED.id,
+    // in the back end we store everything in a field called equipmentFilterForm
+    equipmentFilterForm: eff
+  };
+}
 export {
   backToFrontTweak,
   frontToBackTweak,

package/dist/components/filter/expert/expertFilter.type.d.ts

@@ -129,7 +129,6 @@ export declare enum FieldType {
     SUBSTATION_PROPERTY = "SUBSTATION_PROPERTIES",
     SUBSTATION_PROPERTY_1 = "SUBSTATION_PROPERTIES_1",
     SUBSTATION_PROPERTY_2 = "SUBSTATION_PROPERTIES_2",
-    SUBSTATION_PROPERTY_3 = "SUBSTATION_PROPERTIES_3",
     VOLTAGE_LEVEL_PROPERTY = "VOLTAGE_LEVEL_PROPERTIES",
     VOLTAGE_LEVEL_PROPERTY_1 = "VOLTAGE_LEVEL_PROPERTIES_1",
     VOLTAGE_LEVEL_PROPERTY_2 = "VOLTAGE_LEVEL_PROPERTIES_2",

package/dist/components/filter/expert/expertFilter.type.js

@@ -128,7 +128,6 @@ var FieldType = /* @__PURE__ */ ((FieldType2) => {
   FieldType2["SUBSTATION_PROPERTY"] = "SUBSTATION_PROPERTIES";
   FieldType2["SUBSTATION_PROPERTY_1"] = "SUBSTATION_PROPERTIES_1";
   FieldType2["SUBSTATION_PROPERTY_2"] = "SUBSTATION_PROPERTIES_2";
-  FieldType2["SUBSTATION_PROPERTY_3"] = "SUBSTATION_PROPERTIES_3";
   FieldType2["VOLTAGE_LEVEL_PROPERTY"] = "VOLTAGE_LEVEL_PROPERTIES";
   FieldType2["VOLTAGE_LEVEL_PROPERTY_1"] = "VOLTAGE_LEVEL_PROPERTIES_1";
   FieldType2["VOLTAGE_LEVEL_PROPERTY_2"] = "VOLTAGE_LEVEL_PROPERTIES_2";

package/dist/components/filter/expert/expertFilterConstants.d.ts

@@ -870,13 +870,6 @@ export declare const FIELDS_OPTIONS: {
         valueEditorType: string;
         defaultValue: string;
     };
-    SUBSTATION_PROPERTY_3: {
-        name: FieldType;
-        label: string;
-        dataType: DataType;
-        valueEditorType: string;
-        defaultValue: string;
-    };
     VOLTAGE_LEVEL_PROPERTY: {
         name: FieldType;
         label: string;

package/dist/components/filter/expert/expertFilterConstants.js

@@ -830,13 +830,6 @@ const FIELDS_OPTIONS = {
     valueEditorType: "select",
     defaultValue: ""
   },
-  SUBSTATION_PROPERTY_3: {
-    name: FieldType.SUBSTATION_PROPERTY_3,
-    label: "substationProperty3Twt",
-    dataType: DataType.PROPERTY,
-    valueEditorType: "select",
-    defaultValue: ""
-  },
   VOLTAGE_LEVEL_PROPERTY: {
     name: FieldType.VOLTAGE_LEVEL_PROPERTY,
     label: "voltageLevelProperty",
@@ -1095,8 +1088,7 @@ const EXPERT_FILTER_FIELDS = {
     FIELDS_OPTIONS.PHASE_REGULATION_MODE,
     FIELDS_OPTIONS.PHASE_REGULATION_VALUE,
     FIELDS_OPTIONS.PROPERTY,
-    FIELDS_OPTIONS.SUBSTATION_PROPERTY_1,
-    FIELDS_OPTIONS.SUBSTATION_PROPERTY_2,
+    FIELDS_OPTIONS.SUBSTATION_PROPERTY,
     FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_1,
     FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_2
   ],
@@ -1178,15 +1170,7 @@ const EXPERT_FILTER_FIELDS = {
     FIELDS_OPTIONS.PHASE_REGULATION_MODE_2,
     FIELDS_OPTIONS.PHASE_REGULATION_MODE_3,
     FIELDS_OPTIONS.PROPERTY,
-    {
-      ...FIELDS_OPTIONS.SUBSTATION_PROPERTY_1,
-      label: `${FIELDS_OPTIONS.SUBSTATION_PROPERTY_1.label}Twt`
-    },
-    {
-      ...FIELDS_OPTIONS.SUBSTATION_PROPERTY_2,
-      label: `${FIELDS_OPTIONS.SUBSTATION_PROPERTY_2.label}Twt`
-    },
-    FIELDS_OPTIONS.SUBSTATION_PROPERTY_3,
+    FIELDS_OPTIONS.SUBSTATION_PROPERTY,
     {
       ...FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_1,
       label: `${FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_1.label}Twt`

package/dist/components/filter/explicitNaming/ExplicitNamingFilterEditionDialog.js

@@ -72,7 +72,7 @@ function ExplicitNamingFilterEditionDialog({
   const onSubmit = useCallback(
     (filterForm) => {
       saveExplicitNamingFilter(
-        filterForm[FILTER_EQUIPMENTS_ATTRIBUTES],
+        filterForm[FILTER_EQUIPMENTS_ATTRIBUTES] ?? [],
         false,
         filterForm[FieldConstants.EQUIPMENT_TYPE],
         filterForm[FieldConstants.NAME],

package/dist/components/filter/utils/filterApi.d.ts

@@ -1,5 +1,5 @@
 import { UUID } from 'crypto';
 
-export declare const saveExplicitNamingFilter: (tableValues: any[], isFilterCreation: boolean, equipmentType: string, name: string, description: string, id: string | null, setCreateFilterErr: (value: any) => void, handleClose: () => void, activeDirectory?: UUID, token?: string) => void;
+export declare const saveExplicitNamingFilter: (tableValues: any[], isFilterCreation: boolean, equipmentType: string, name: string, description: string, id: string | null, setCreateFilterErr: (value?: string) => void, handleClose: () => void, activeDirectory?: UUID, token?: string) => void;
 export declare const saveCriteriaBasedFilter: (filter: any, activeDirectory: any, onClose: () => void, onError: (message: string) => void, token?: string) => void;
 export declare const saveExpertFilter: (id: string | null, query: any, equipmentType: string, name: string, description: string, isFilterCreation: boolean, activeDirectory: any, onClose: () => void, onError: (message: string) => void, token?: string) => void;

package/dist/components/index.js

@@ -61,7 +61,7 @@ import { FieldErrorAlert } from "./inputs/reactHookForm/errorManagement/FieldErr
 import { MidFormError } from "./inputs/reactHookForm/errorManagement/MidFormError.js";
 import { FloatInput } from "./inputs/reactHookForm/numbers/FloatInput.js";
 import { IntegerInput } from "./inputs/reactHookForm/numbers/IntegerInput.js";
-import { DEFAULT_RANGE_VALUE, RangeInput, RangeType, getRangeInputDataForm, getRangeInputSchema } from "./inputs/reactHookForm/numbers/RangeInput.js";
+import { DEFAULT_RANGE_VALUE, RangeInput, RangeType, getRangeInputSchema } from "./inputs/reactHookForm/numbers/RangeInput.js";
 import { SliderInput } from "./inputs/reactHookForm/numbers/SliderInput.js";
 import { isFloatNumber, isIntegerNumber } from "./inputs/reactHookForm/numbers/utils.js";
 import { CustomFormContext, CustomFormProvider } from "./inputs/reactHookForm/provider/CustomFormProvider.js";
@@ -262,7 +262,6 @@ export {
   getNumberOfSiblings,
   getOperators,
   getPreLoginPath,
-  getRangeInputDataForm,
   getRangeInputSchema,
   gridItem,
   handleSigninCallback,

package/dist/components/inputs/index.js

@@ -16,7 +16,7 @@ import { FieldErrorAlert } from "./reactHookForm/errorManagement/FieldErrorAlert
 import { MidFormError } from "./reactHookForm/errorManagement/MidFormError.js";
 import { FloatInput } from "./reactHookForm/numbers/FloatInput.js";
 import { IntegerInput } from "./reactHookForm/numbers/IntegerInput.js";
-import { DEFAULT_RANGE_VALUE, RangeInput, RangeType, getRangeInputDataForm, getRangeInputSchema } from "./reactHookForm/numbers/RangeInput.js";
+import { DEFAULT_RANGE_VALUE, RangeInput, RangeType, getRangeInputSchema } from "./reactHookForm/numbers/RangeInput.js";
 import { SliderInput } from "./reactHookForm/numbers/SliderInput.js";
 import { isFloatNumber, isIntegerNumber } from "./reactHookForm/numbers/utils.js";
 import { CustomFormContext, CustomFormProvider } from "./reactHookForm/provider/CustomFormProvider.js";
@@ -105,7 +105,6 @@ export {
   ValueSelector,
   genHelperError,
   genHelperPreviousValue,
-  getRangeInputDataForm,
   getRangeInputSchema,
   gridItem,
   identity,

package/dist/components/inputs/reactHookForm/index.js

@@ -15,7 +15,7 @@ import { FieldErrorAlert } from "./errorManagement/FieldErrorAlert.js";
 import { MidFormError } from "./errorManagement/MidFormError.js";
 import { FloatInput } from "./numbers/FloatInput.js";
 import { IntegerInput } from "./numbers/IntegerInput.js";
-import { DEFAULT_RANGE_VALUE, RangeInput, RangeType, getRangeInputDataForm, getRangeInputSchema } from "./numbers/RangeInput.js";
+import { DEFAULT_RANGE_VALUE, RangeInput, RangeType, getRangeInputSchema } from "./numbers/RangeInput.js";
 import { SliderInput } from "./numbers/SliderInput.js";
 import { isFloatNumber, isIntegerNumber } from "./numbers/utils.js";
 import { CustomFormContext, CustomFormProvider } from "./provider/CustomFormProvider.js";
@@ -73,7 +73,6 @@ export {
   UniqueNameInput,
   genHelperError,
   genHelperPreviousValue,
-  getRangeInputDataForm,
   getRangeInputSchema,
   gridItem,
   identity,

package/dist/components/inputs/reactHookForm/numbers/RangeInput.d.ts

@@ -1,50 +1,40 @@
+import { FieldConstants } from '../../../../utils/constants/fieldConstants';
 import { default as yup } from '../../../../utils/yupConfig';
+import { ObjectSchema } from 'yup';
 
 export declare const RangeType: {
-    EQUALITY: {
-        id: string;
-        label: string;
+    readonly EQUALITY: {
+        readonly id: "EQUALITY";
+        readonly label: "equality";
     };
-    GREATER_THAN: {
-        id: string;
-        label: string;
+    readonly GREATER_THAN: {
+        readonly id: "GREATER_THAN";
+        readonly label: "greaterThan";
     };
-    GREATER_OR_EQUAL: {
-        id: string;
-        label: string;
+    readonly GREATER_OR_EQUAL: {
+        readonly id: "GREATER_OR_EQUAL";
+        readonly label: "greaterOrEqual";
     };
-    LESS_THAN: {
-        id: string;
-        label: string;
+    readonly LESS_THAN: {
+        readonly id: "LESS_THAN";
+        readonly label: "lessThan";
     };
-    LESS_OR_EQUAL: {
-        id: string;
-        label: string;
+    readonly LESS_OR_EQUAL: {
+        readonly id: "LESS_OR_EQUAL";
+        readonly label: "lessOrEqual";
     };
-    RANGE: {
-        id: string;
-        label: string;
+    readonly RANGE: {
+        readonly id: "RANGE";
+        readonly label: "range";
     };
 };
-export declare const DEFAULT_RANGE_VALUE: {
-    type: string;
-    value1: null;
-    value2: null;
-};
-export declare const getRangeInputDataForm: (name: string, rangeValue: unknown) => {
-    [x: string]: unknown;
-};
-export declare const getRangeInputSchema: (name: string) => {
-    [x: string]: yup.ObjectSchema<{
-        type: string | undefined;
-        value1: number | undefined;
-        value2: number | undefined;
-    }, yup.AnyObject, {
-        type: undefined;
-        value1: undefined;
-        value2: undefined;
-    }, "">;
+export type RangeInputData = {
+    [FieldConstants.OPERATION_TYPE]: string;
+    [FieldConstants.VALUE_1]: number | null;
+    [FieldConstants.VALUE_2]: number | null;
 };
+export declare const DEFAULT_RANGE_VALUE: RangeInputData;
+export declare function getRangeInputSchema<TName extends string>(name: TName): Record<TName, ObjectSchema<RangeInputData, yup.AnyObject, any, "">>;
 interface RangeInputProps {
     name: string;
     label: string;

package/dist/components/inputs/reactHookForm/numbers/RangeInput.js

@@ -1,10 +1,8 @@
-import { jsx, jsxs } from "react/jsx-runtime";
+import { jsxs, jsx } from "react/jsx-runtime";
 import { useWatch } from "react-hook-form";
 import { FormattedMessage } from "react-intl";
 import { useMemo } from "react";
-import InputLabel from "@mui/material/InputLabel";
-import { Grid } from "@mui/material";
-import FormControl from "@mui/material/FormControl";
+import { FormControl, InputLabel, Grid } from "@mui/material";
 import { FloatInput } from "./FloatInput.js";
 import "../../../../utils/yupConfig.js";
 import { MuiSelectInput } from "../selectInputs/MuiSelectInput.js";
@@ -30,11 +28,8 @@ const DEFAULT_RANGE_VALUE = {
   [FieldConstants.VALUE_1]: null,
   [FieldConstants.VALUE_2]: null
 };
-const getRangeInputDataForm = (name, rangeValue) => ({
-  [name]: rangeValue
-});
-const getRangeInputSchema = (name) => ({
-  [name]: yup.object().shape(
+function getRangeInputSchema(name) {
+  const result = yup.object().shape(
     {
       [FieldConstants.OPERATION_TYPE]: yup.string(),
       [FieldConstants.VALUE_1]: yup.number().when([FieldConstants.OPERATION_TYPE, FieldConstants.VALUE_2], {
@@ -49,60 +44,47 @@ const getRangeInputSchema = (name) => ({
       })
     },
     [[FieldConstants.VALUE_1, FieldConstants.VALUE_2]]
-  )
-});
+  );
+  return { [name]: result };
+}
 function RangeInput({ name, label }) {
-  const watchOperationType = useWatch({
-    name: `${name}.${FieldConstants.OPERATION_TYPE}`
-  });
+  const watchOperationType = useWatch({ name: `${name}.${FieldConstants.OPERATION_TYPE}` });
   const isOperationTypeRange = useMemo(() => watchOperationType === RangeType.RANGE.id, [watchOperationType]);
-  const firstValueField = /* @__PURE__ */ jsx(
-    FloatInput,
-    {
-      label: "",
-      name: `${name}.${FieldConstants.VALUE_1}`,
-      clearable: false,
-      formProps: {
-        size: "medium",
-        placeholder: isOperationTypeRange ? "Min" : ""
-      }
-    }
-  );
-  const secondValueField = /* @__PURE__ */ jsx(
-    FloatInput,
-    {
-      name: `${name}.${FieldConstants.VALUE_2}`,
-      clearable: false,
-      label: "",
-      formProps: {
-        size: "medium",
-        placeholder: "Max"
-      }
-    }
-  );
-  const operationTypeField = /* @__PURE__ */ jsx(
-    MuiSelectInput,
-    {
-      name: `${name}.${FieldConstants.OPERATION_TYPE}`,
-      options: Object.values(RangeType),
-      fullWidth: true
-    }
-  );
   return /* @__PURE__ */ jsxs(FormControl, { fullWidth: true, children: [
     /* @__PURE__ */ jsx(InputLabel, { sx: style.inputLegend, shrink: true, children: /* @__PURE__ */ jsx(FormattedMessage, { id: label }) }),
     /* @__PURE__ */ jsxs(Grid, { container: true, spacing: 0, children: [
-      /* @__PURE__ */ jsx(
-        Grid,
+      /* @__PURE__ */ jsx(Grid, { item: true, style: isOperationTypeRange ? { flex: "min-content" } : {}, children: /* @__PURE__ */ jsx(
+        MuiSelectInput,
+        {
+          name: `${name}.${FieldConstants.OPERATION_TYPE}`,
+          options: Object.values(RangeType),
+          fullWidth: true
+        }
+      ) }),
+      /* @__PURE__ */ jsx(Grid, { item: true, children: /* @__PURE__ */ jsx(
+        FloatInput,
+        {
+          label: "",
+          name: `${name}.${FieldConstants.VALUE_1}`,
+          clearable: false,
+          formProps: {
+            size: "medium",
+            placeholder: isOperationTypeRange ? "Min" : ""
+          }
+        }
+      ) }),
+      isOperationTypeRange && /* @__PURE__ */ jsx(Grid, { item: true, children: /* @__PURE__ */ jsx(
+        FloatInput,
         {
-          item: true,
-          style: isOperationTypeRange ? {
-            flex: "min-content"
-          } : {},
-          children: operationTypeField
+          name: `${name}.${FieldConstants.VALUE_2}`,
+          clearable: false,
+          label: "",
+          formProps: {
+            size: "medium",
+            placeholder: "Max"
+          }
         }
-      ),
-      /* @__PURE__ */ jsx(Grid, { item: true, children: firstValueField }),
-      isOperationTypeRange && /* @__PURE__ */ jsx(Grid, { item: true, children: secondValueField })
+      ) })
     ] })
   ] });
 }
@@ -110,6 +92,5 @@ export {
   DEFAULT_RANGE_VALUE,
   RangeInput,
   RangeType,
-  getRangeInputDataForm,
   getRangeInputSchema
 };

package/dist/components/inputs/reactHookForm/numbers/index.js

@@ -1,6 +1,6 @@
 import { FloatInput } from "./FloatInput.js";
 import { IntegerInput } from "./IntegerInput.js";
-import { DEFAULT_RANGE_VALUE, RangeInput, RangeType, getRangeInputDataForm, getRangeInputSchema } from "./RangeInput.js";
+import { DEFAULT_RANGE_VALUE, RangeInput, RangeType, getRangeInputSchema } from "./RangeInput.js";
 import { SliderInput } from "./SliderInput.js";
 import { isFloatNumber, isIntegerNumber } from "./utils.js";
 export {
@@ -10,7 +10,6 @@ export {
   RangeInput,
   RangeType,
   SliderInput,
-  getRangeInputDataForm,
   getRangeInputSchema,
   isFloatNumber,
   isIntegerNumber

package/dist/components/inputs/reactHookForm/provider/CustomFormProvider.d.ts

@@ -1,14 +1,13 @@
-import { UseFormReturn } from 'react-hook-form';
+import { ObjectSchema } from 'yup';
+import { FieldValues, UseFormReturn } from 'react-hook-form';
 import { default as React, PropsWithChildren } from 'react';
 
-import * as yup from 'yup';
-type CustomFormContextProps = {
+type CustomFormContextProps<TFieldValues extends FieldValues = FieldValues> = {
     removeOptional?: boolean;
-    validationSchema: yup.AnySchema;
+    validationSchema: ObjectSchema<TFieldValues>;
     language?: string;
 };
-export type MergedFormContextProps = UseFormReturn<any> & CustomFormContextProps;
-type CustomFormProviderProps = PropsWithChildren<MergedFormContextProps>;
-export declare const CustomFormContext: React.Context<CustomFormContextProps>;
-export declare function CustomFormProvider(props: CustomFormProviderProps): import("react/jsx-runtime").JSX.Element;
+export type MergedFormContextProps<TFieldValues extends FieldValues = FieldValues> = UseFormReturn<TFieldValues> & CustomFormContextProps<TFieldValues>;
+export declare const CustomFormContext: React.Context<CustomFormContextProps<FieldValues>>;
+export declare function CustomFormProvider<TFieldValues extends FieldValues = FieldValues>(props: PropsWithChildren<MergedFormContextProps<TFieldValues>>): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/inputs/reactHookForm/utils/SubmitButton.d.ts

@@ -1,9 +1,3 @@
-/**
- * Copyright (c) 2022, 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/.
- */
-export declare function SubmitButton({ ...buttonProps }: {
-    [x: string]: any;
-}): import("react/jsx-runtime").JSX.Element;
+import { ButtonProps } from '@mui/material';
+
+export declare function SubmitButton(buttonProps: Readonly<ButtonProps>): import("react/jsx-runtime").JSX.Element;

package/dist/components/inputs/reactHookForm/utils/SubmitButton.js

@@ -2,7 +2,7 @@ import { jsx } from "react/jsx-runtime";
 import { Button } from "@mui/material";
 import { useFormState } from "react-hook-form";
 import { FormattedMessage } from "react-intl";
-function SubmitButton({ ...buttonProps }) {
+function SubmitButton(buttonProps) {
   const { isDirty } = useFormState();
   return /* @__PURE__ */ jsx(Button, { ...buttonProps, disabled: !isDirty || ((buttonProps == null ? void 0 : buttonProps.disabled) ?? false), children: /* @__PURE__ */ jsx(FormattedMessage, { id: "validate" }) });
 }

package/dist/components/inputs/reactQueryBuilder/ValueEditor.js

@@ -80,7 +80,7 @@ function ValueEditor(props) {
   }
   if (fieldData.dataType === DataType.PROPERTY) {
     let equipmentType;
-    if (field === FieldType.SUBSTATION_PROPERTY || field === FieldType.SUBSTATION_PROPERTY_1 || field === FieldType.SUBSTATION_PROPERTY_2 || field === FieldType.SUBSTATION_PROPERTY_3) {
+    if (field === FieldType.SUBSTATION_PROPERTY || field === FieldType.SUBSTATION_PROPERTY_1 || field === FieldType.SUBSTATION_PROPERTY_2) {
       equipmentType = Substation.type;
     } else if (field === FieldType.VOLTAGE_LEVEL_PROPERTY || field === FieldType.VOLTAGE_LEVEL_PROPERTY_1 || field === FieldType.VOLTAGE_LEVEL_PROPERTY_2 || field === FieldType.VOLTAGE_LEVEL_PROPERTY_3) {
       equipmentType = VoltageLevel.type;

package/dist/index.js

@@ -62,7 +62,7 @@ import { FieldErrorAlert } from "./components/inputs/reactHookForm/errorManageme
 import { MidFormError } from "./components/inputs/reactHookForm/errorManagement/MidFormError.js";
 import { FloatInput } from "./components/inputs/reactHookForm/numbers/FloatInput.js";
 import { IntegerInput } from "./components/inputs/reactHookForm/numbers/IntegerInput.js";
-import { DEFAULT_RANGE_VALUE, RangeInput, RangeType, getRangeInputDataForm, getRangeInputSchema } from "./components/inputs/reactHookForm/numbers/RangeInput.js";
+import { DEFAULT_RANGE_VALUE, RangeInput, RangeType, getRangeInputSchema } from "./components/inputs/reactHookForm/numbers/RangeInput.js";
 import { SliderInput } from "./components/inputs/reactHookForm/numbers/SliderInput.js";
 import { isFloatNumber, isIntegerNumber } from "./components/inputs/reactHookForm/numbers/utils.js";
 import { CustomFormContext, CustomFormProvider } from "./components/inputs/reactHookForm/provider/CustomFormProvider.js";
@@ -420,7 +420,6 @@ export {
   getNumberOfSiblings,
   getOperators,
   getPreLoginPath,
-  getRangeInputDataForm,
   getRangeInputSchema,
   getRequestParamFromList,
   getSystemLanguage,

package/dist/translations/en/filterExpertEn.d.ts

@@ -94,7 +94,6 @@ export declare const filterExpertEn: {
     substationProperty2: string;
     substationProperty1Twt: string;
     substationProperty2Twt: string;
-    substationProperty3Twt: string;
     ratedVoltage1KV: string;
     ratedVoltage2KV: string;
     ratedVoltage0KVTwt: string;

package/dist/translations/en/filterExpertEn.js

@@ -88,7 +88,6 @@ const filterExpertEn = {
   substationProperty2: "Substation property 2",
   substationProperty1Twt: "Substation property 1",
   substationProperty2Twt: "Substation property 2",
-  substationProperty3Twt: "Substation property 3",
   ratedVoltage1KV: "Rated Voltage 1 (kV)",
   ratedVoltage2KV: "Rated Voltage 2 (kV)",
   ratedVoltage0KVTwt: "Rated Voltage 0 (kV)",

package/dist/translations/fr/filterExpertFr.d.ts

@@ -94,7 +94,6 @@ export declare const filterExpertFr: {
     substationProperty2: string;
     substationProperty1Twt: string;
     substationProperty2Twt: string;
-    substationProperty3Twt: string;
     ratedVoltage1KV: string;
     ratedVoltage2KV: string;
     ratedVoltage0KVTwt: string;

package/dist/translations/fr/filterExpertFr.js

@@ -88,7 +88,6 @@ const filterExpertFr = {
   substationProperty2: "Propriété site 2",
   substationProperty1Twt: "Propriété site 1",
   substationProperty2Twt: "Propriété site 2",
-  substationProperty3Twt: "Propriété site 3",
   ratedVoltage1KV: "Tension d'enroulement 1 (kV)",
   ratedVoltage2KV: "Tension d'enroulement 2 (kV)",
   ratedVoltage0KVTwt: "Tension d'enroulement 0 (kV)",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.72.0",
+    "version": "0.72.2",
     "description": "common react components for gridsuite applications",
     "engines": {
         "npm": ">=9",