@gridsuite/commons-ui 0.71.2 → 0.72.1

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,14 +1,14 @@
 import { MergedFormContextProps } from '../../inputs/reactHookForm/provider/CustomFormProvider';
-import { FieldErrors, UseFormReturn } from 'react-hook-form';
+import { FieldErrors, FieldValues, SubmitHandler, UseFormReturn } from 'react-hook-form';
 import { default as React } 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;
+    formMethods: UseFormReturn<T> | MergedFormContextProps;
+    onClose: (event?: React.MouseEvent) => void;
+    onSave: SubmitHandler<T>;
     onValidationError?: (errors: FieldErrors) => void;
     titleId: string;
     disabledSave?: boolean;
@@ -52,4 +52,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,7 +91,9 @@ function CustomMuiDialog({
   );
   const handlePopupConfirmation = useCallback(() => {
     setOpenConfirmationPopup(false);
-    validate(validatedData);
+    if (validatedData) {
+      validate(validatedData);
+    }
   }, [validate, validatedData]);
   const handleValidationError = (errors) => {
     onValidationError == null ? void 0 : onValidationError(errors);

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.d.ts

@@ -3,7 +3,7 @@ import { UUID } from 'crypto';
 
 export interface FilterCreationDialogProps {
     open: boolean;
-    onClose: (e?: unknown, nextSelectedDirectoryId?: string | null) => void;
+    onClose: () => void;
     activeDirectory?: UUID;
     elementExists?: ElementExistsType;
     language?: string;

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

@@ -2,12 +2,20 @@ import { default as yup } from '../../../utils/yupConfig';
 
 export declare const criteriaBasedFilterSchema: {
     criteriaBased: yup.ObjectSchema<{
-        [x: string]: any;
+        countries: (string | undefined)[] | undefined;
+        countries1: (string | undefined)[] | undefined;
+        countries2: (string | undefined)[] | undefined;
     }, yup.AnyObject, {
-        [x: string]: any;
+        countries: "";
+        countries1: "";
+        countries2: "";
     }, "">;
 };
 export declare const criteriaBasedFilterEmptyFormData: {
-    criteriaBased: any;
+    criteriaBased: {
+        countries: any;
+        countries1: any;
+        countries2: any;
+    };
 };
 export declare function CriteriaBasedFilterForm(): import("react/jsx-runtime").JSX.Element;

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

@@ -1,14 +1,22 @@
 import { default as yup } from '../../../utils/yupConfig';
 
-export declare const getCriteriaBasedSchema: (extraFields: any) => {
+export declare const getCriteriaBasedSchema: (extraFields: Record<string, yup.AnyObject | null>) => {
     criteriaBased: yup.ObjectSchema<{
-        [x: string]: any;
+        countries: (string | undefined)[] | undefined;
+        countries1: (string | undefined)[] | undefined;
+        countries2: (string | undefined)[] | undefined;
     }, yup.AnyObject, {
-        [x: string]: any;
+        countries: "";
+        countries1: "";
+        countries2: "";
     }, "">;
 };
-export declare const getCriteriaBasedFormData: (criteriaValues: any, extraFields: any) => {
-    criteriaBased: any;
+export declare const getCriteriaBasedFormData: (criteriaValues: any, extraFields: Record<string, yup.AnyObject | null>) => {
+    criteriaBased: {
+        countries: any;
+        countries1: any;
+        countries2: any;
+    };
 };
 /**
  * Transform
@@ -22,7 +30,11 @@ export declare const getCriteriaBasedFormData: (criteriaValues: any, extraFields
  * @author Laurent LAUGARN modified by Florent MILLOT
  */
 export declare const backToFrontTweak: (response: any) => {
-    criteriaBased: any;
+    criteriaBased: {
+        countries: any;
+        countries1: any;
+        countries2: any;
+    };
     equipmentType: any;
 };
 /**

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/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/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.71.2",
+    "version": "0.72.1",
     "description": "common react components for gridsuite applications",
     "engines": {
         "npm": ">=9",