@gridsuite/commons-ui 0.63.4 → 0.63.5

package/dist/components/TreeViewFinder/TreeViewFinder.js

@@ -57,12 +57,8 @@ function TreeViewFinder(props) {
     expanded: expandedProp
   } = props;
   const [mapPrintedNodes, setMapPrintedNodes] = useState({});
-  const [expanded, setExpanded] = useState(
-    defaultExpanded ?? []
-  );
-  const [selected, setSelected] = useState(
-    defaultSelected ?? []
-  );
+  const [expanded, setExpanded] = useState(defaultExpanded ?? []);
+  const [selected, setSelected] = useState(defaultSelected ?? []);
   const scrollRef = useRef([]);
   const [autoScrollAllowed, setAutoScrollAllowed] = useState(true);
   const isLeaf = (node) => {
@@ -74,22 +70,16 @@ function TreeViewFinder(props) {
   const isValidationDisabled = () => {
     return (selected == null ? void 0 : selected.length) === 0 || (selected == null ? void 0 : selected.length) === (selectedProp == null ? void 0 : selectedProp.length) && (selected == null ? void 0 : selected.every((nodeId) => selectedProp == null ? void 0 : selectedProp.includes(nodeId)));
   };
-  const computeMapPrintedNodes = useCallback(
-    (nodes) => {
-      const newMapPrintedNodes = {};
-      nodes == null ? void 0 : nodes.forEach((node) => {
-        newMapPrintedNodes[node.id] = node;
-        if (!isLeaf(node)) {
-          Object.assign(
-            newMapPrintedNodes,
-            computeMapPrintedNodes(node.children)
-          );
-        }
-      });
-      return newMapPrintedNodes;
-    },
-    []
-  );
+  const computeMapPrintedNodes = useCallback((nodes) => {
+    const newMapPrintedNodes = {};
+    nodes == null ? void 0 : nodes.forEach((node) => {
+      newMapPrintedNodes[node.id] = node;
+      if (!isLeaf(node)) {
+        Object.assign(newMapPrintedNodes, computeMapPrintedNodes(node.children));
+      }
+    });
+    return newMapPrintedNodes;
+  }, []);
   useEffect(() => {
     const newMapPrintedNodes = computeMapPrintedNodes(data);
     setMapPrintedNodes(newMapPrintedNodes);
@@ -117,10 +107,7 @@ function TreeViewFinder(props) {
       return;
     }
     if (selectedProp.length > 0) {
-      setSelected((oldSelectedNodes) => [
-        ...oldSelectedNodes ?? [],
-        ...selectedProp
-      ]);
+      setSelected((oldSelectedNodes) => [...oldSelectedNodes ?? [], ...selectedProp]);
     }
   }, [selectedProp]);
   useEffect(() => {
@@ -128,10 +115,7 @@ function TreeViewFinder(props) {
       return;
     }
     if (expandedProp.length > 0) {
-      setExpanded((oldExpandedNodes) => [
-        ...oldExpandedNodes ?? [],
-        ...expandedProp
-      ]);
+      setExpanded((oldExpandedNodes) => [...oldExpandedNodes ?? [], ...expandedProp]);
     }
   }, [expandedProp]);
   useEffect(() => {
@@ -139,9 +123,7 @@ function TreeViewFinder(props) {
       return;
     }
     if (selectedProp.length > 0 && autoScrollAllowed) {
-      const isNodeExpanded = expandedProp == null ? void 0 : expandedProp.every(
-        (nodeId) => expanded == null ? void 0 : expanded.includes(nodeId)
-      );
+      const isNodeExpanded = expandedProp == null ? void 0 : expandedProp.every((nodeId) => expanded == null ? void 0 : expanded.includes(nodeId));
       const lastScrollRef = scrollRef.current[scrollRef.current.length - 1];
       if (isNodeExpanded && lastScrollRef) {
         lastScrollRef.scrollIntoView({
@@ -155,16 +137,12 @@ function TreeViewFinder(props) {
   }, [expanded, selectedProp, expandedProp, data, autoScrollAllowed]);
   const handleNodeSelect = (_e, values) => {
     if (multiSelect && Array.isArray(values)) {
-      setSelected(
-        values.filter((nodeId) => isSelectable(mapPrintedNodes[nodeId]))
-      );
+      setSelected(values.filter((nodeId) => isSelectable(mapPrintedNodes[nodeId])));
     } else if (!Array.isArray(values)) {
       if (selected == null ? void 0 : selected.includes(values)) {
         setSelected([]);
       } else {
-        setSelected(
-          isSelectable(mapPrintedNodes[values]) ? [values] : []
-        );
+        setSelected(isSelectable(mapPrintedNodes[values]) ? [values] : []);
       }
     }
   };
@@ -214,9 +192,7 @@ function TreeViewFinder(props) {
     if (Array.isArray(node.children)) {
       if (node.children.length) {
         const sortedChildren = node.children.sort(sortMethod);
-        childrenNodes = sortedChildren.map(
-          (child) => renderTree(child)
-        );
+        childrenNodes = sortedChildren.map((child) => renderTree(child));
       } else {
         childrenNodes = [false];
       }
@@ -226,18 +202,8 @@ function TreeViewFinder(props) {
       {
         nodeId: node.id,
         label: renderTreeItemLabel(node),
-        expandIcon: showChevron(node) ? /* @__PURE__ */ jsx(
-          ChevronRight,
-          {
-            className: composeClasses(classes, cssIcon)
-          }
-        ) : null,
-        collapseIcon: showChevron(node) ? /* @__PURE__ */ jsx(
-          ExpandMore,
-          {
-            className: composeClasses(classes, cssIcon)
-          }
-        ) : null,
+        expandIcon: showChevron(node) ? /* @__PURE__ */ jsx(ChevronRight, { className: composeClasses(classes, cssIcon) }) : null,
+        collapseIcon: showChevron(node) ? /* @__PURE__ */ jsx(ExpandMore, { className: composeClasses(classes, cssIcon) }) : null,
         ref: (element) => {
           if (selectedProp == null ? void 0 : selectedProp.includes(node.id)) {
             scrollRef.current.push(element);
@@ -276,15 +242,9 @@ function TreeViewFinder(props) {
         paper: composeClasses(classes, cssDialogPaper)
       },
       children: [
-        /* @__PURE__ */ jsx(DialogTitle, { id: "TreeViewFindertitle", children: title ?? intl.formatMessage(
-          { id: "treeview_finder/finderTitle" },
-          { multiSelect }
-        ) }),
+        /* @__PURE__ */ jsx(DialogTitle, { id: "TreeViewFindertitle", children: title ?? intl.formatMessage({ id: "treeview_finder/finderTitle" }, { multiSelect }) }),
         /* @__PURE__ */ jsxs(DialogContent, { children: [
-          /* @__PURE__ */ jsx(DialogContentText, { children: contentText ?? intl.formatMessage(
-            { id: "treeview_finder/contentText" },
-            { multiSelect }
-          ) }),
+          /* @__PURE__ */ jsx(DialogContentText, { children: contentText ?? intl.formatMessage({ id: "treeview_finder/contentText" }, { multiSelect }) }),
           /* @__PURE__ */ jsx(
             TreeView,
             {
@@ -328,10 +288,7 @@ function TreeViewFinder(props) {
     }
   );
 }
-const nestedGlobalSelectorsStyles = toNestedGlobalSelectors(
-  defaultStyles,
-  generateTreeViewFinderClass
-);
+const nestedGlobalSelectorsStyles = toNestedGlobalSelectors(defaultStyles, generateTreeViewFinderClass);
 const TreeViewFinder$1 = styled(TreeViewFinder)(nestedGlobalSelectorsStyles);
 export {
   TreeViewFinder$1 as default,

package/dist/components/TreeViewFinder/index.d.ts

@@ -4,5 +4,5 @@
  * 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 { default as TreeViewFinder, generateTreeViewFinderClass, } from './TreeViewFinder';
-export type { TreeViewFinderProps, TreeViewFinderNodeProps, } from './TreeViewFinder';
+export { default as TreeViewFinder, generateTreeViewFinderClass } from './TreeViewFinder';
+export type { TreeViewFinderProps, TreeViewFinderNodeProps } from './TreeViewFinder';

package/dist/components/dialogs/custom-mui-dialog.d.ts

@@ -17,6 +17,7 @@ interface ICustomMuiDialog {
     children: React.ReactNode;
     isDataFetching?: boolean;
     language?: string;
+    confirmationMessageKey?: string;
 }
-declare function CustomMuiDialog({ open, formSchema, formMethods, onClose, onSave, isDataFetching, onValidationError, titleId, disabledSave, removeOptional, onCancel, children, language, }: ICustomMuiDialog): import("react/jsx-runtime").JSX.Element;
+declare function CustomMuiDialog({ open, formSchema, formMethods, onClose, onSave, isDataFetching, onValidationError, titleId, disabledSave, removeOptional, onCancel, children, language, confirmationMessageKey, }: ICustomMuiDialog): import("react/jsx-runtime").JSX.Element;
 export default CustomMuiDialog;

package/dist/components/dialogs/custom-mui-dialog.js

@@ -1,9 +1,11 @@
-import { jsx, jsxs } from "react/jsx-runtime";
+import { jsxs, jsx } from "react/jsx-runtime";
+import { useState, useCallback } from "react";
 import { FormattedMessage } from "react-intl";
 import { Dialog, LinearProgress, DialogTitle, Grid, DialogContent, DialogActions } from "@mui/material";
 import SubmitButton from "../inputs/react-hook-form/utils/submit-button.js";
 import CancelButton from "../inputs/react-hook-form/utils/cancel-button.js";
 import CustomFormProvider from "../inputs/react-hook-form/provider/custom-form-provider.js";
+import PopupConfirmationDialog from "./popup-confirmation-dialog.js";
 const styles = {
   dialogPaper: {
     ".MuiDialog-paper": {
@@ -26,61 +28,84 @@ function CustomMuiDialog({
   removeOptional = false,
   onCancel,
   children,
-  language
+  language,
+  confirmationMessageKey
 }) {
+  const [openConfirmationPopup, setOpenConfirmationPopup] = useState(false);
+  const [validatedData, setValidatedData] = useState(void 0);
   const { handleSubmit } = formMethods;
-  const handleCancel = (event) => {
-    onCancel == null ? void 0 : onCancel();
-    onClose(event);
-  };
+  const handleCancel = useCallback(
+    (event) => {
+      onCancel == null ? void 0 : onCancel();
+      onClose(event);
+    },
+    [onCancel, onClose]
+  );
   const handleClose = (event, reason) => {
     if (reason === "backdropClick" && onCancel) {
       onCancel();
     }
     onClose(event);
   };
-  const handleValidate = (data) => {
-    onSave(data);
-    onClose(data);
-  };
+  const validate = useCallback(
+    (data) => {
+      onSave(data);
+      onClose(data);
+    },
+    [onClose, onSave]
+  );
+  const handleValidate = useCallback(
+    (data) => {
+      if (confirmationMessageKey) {
+        setValidatedData(data);
+        setOpenConfirmationPopup(true);
+      } else {
+        validate(data);
+      }
+    },
+    [confirmationMessageKey, validate]
+  );
+  const handlePopupConfirmation = useCallback(() => {
+    setOpenConfirmationPopup(false);
+    validate(validatedData);
+  }, [validate, validatedData]);
   const handleValidationError = (errors) => {
     onValidationError == null ? void 0 : onValidationError(errors);
   };
-  return /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsxs(
     CustomFormProvider,
     {
       ...formMethods,
       validationSchema: formSchema,
       removeOptional,
       language,
-      children: /* @__PURE__ */ jsxs(
-        Dialog,
-        {
-          sx: styles.dialogPaper,
-          open,
-          onClose: handleClose,
-          fullWidth: true,
-          children: [
-            isDataFetching && /* @__PURE__ */ jsx(LinearProgress, {}),
-            /* @__PURE__ */ jsx(DialogTitle, { children: /* @__PURE__ */ jsx(Grid, { item: true, xs: 11, children: /* @__PURE__ */ jsx(FormattedMessage, { id: titleId }) }) }),
-            /* @__PURE__ */ jsx(DialogContent, { children }),
-            /* @__PURE__ */ jsxs(DialogActions, { children: [
-              /* @__PURE__ */ jsx(CancelButton, { onClick: handleCancel }),
-              /* @__PURE__ */ jsx(
-                SubmitButton,
-                {
-                  variant: "outlined",
-                  disabled: disabledSave,
-                  onClick: handleSubmit(
-                    handleValidate,
-                    handleValidationError
-                  )
-                }
-              )
-            ] })
-          ]
-        }
-      )
+      children: [
+        /* @__PURE__ */ jsxs(Dialog, { sx: styles.dialogPaper, open, onClose: handleClose, fullWidth: true, children: [
+          isDataFetching && /* @__PURE__ */ jsx(LinearProgress, {}),
+          /* @__PURE__ */ jsx(DialogTitle, { children: /* @__PURE__ */ jsx(Grid, { item: true, xs: 11, children: /* @__PURE__ */ jsx(FormattedMessage, { id: titleId }) }) }),
+          /* @__PURE__ */ jsx(DialogContent, { children }),
+          /* @__PURE__ */ jsxs(DialogActions, { children: [
+            /* @__PURE__ */ jsx(CancelButton, { onClick: handleCancel }),
+            /* @__PURE__ */ jsx(
+              SubmitButton,
+              {
+                variant: "outlined",
+                disabled: disabledSave,
+                onClick: handleSubmit(handleValidate, handleValidationError)
+              }
+            )
+          ] })
+        ] }),
+        confirmationMessageKey && /* @__PURE__ */ jsx(
+          PopupConfirmationDialog,
+          {
+            message: confirmationMessageKey,
+            openConfirmationPopup,
+            setOpenConfirmationPopup,
+            handlePopupConfirmation
+          }
+        )
+      ]
     }
   );
 }

package/dist/components/dialogs/modify-element-selection.js

@@ -27,9 +27,7 @@ function ModifyElementSelection(props) {
   useEffect(() => {
     if (directory) {
       fetchDirectoryElementPath(directory).then((res) => {
-        setActiveDirectoryName(
-          res.map((element) => element.elementName.trim()).join("/")
-        );
+        setActiveDirectoryName(res.map((element) => element.elementName.trim()).join("/"));
       });
     }
   }, [directory]);

package/dist/components/dialogs/popup-confirmation-dialog.d.ts

@@ -6,7 +6,7 @@
  */
 export interface PopupConfirmationDialogProps {
     message: string;
-    validateButtonLabel: string;
+    validateButtonLabel?: string;
     openConfirmationPopup: boolean;
     setOpenConfirmationPopup: (value: boolean) => void;
     handlePopupConfirmation: () => void;

package/dist/components/dialogs/popup-confirmation-dialog.js

@@ -14,21 +14,14 @@ function PopupConfirmationDialog({
   setOpenConfirmationPopup,
   handlePopupConfirmation
 }) {
-  return /* @__PURE__ */ jsxs(
-    Dialog,
-    {
-      open: openConfirmationPopup,
-      "aria-labelledby": "dialog-title-change-equipment-type",
-      children: [
-        /* @__PURE__ */ jsx(DialogTitle, { id: "dialog-title-change-equipment-type", children: "Confirmation" }),
-        /* @__PURE__ */ jsx(DialogContent, { children: /* @__PURE__ */ jsx(DialogContentText, { children: /* @__PURE__ */ jsx(FormattedMessage, { id: message }) }) }),
-        /* @__PURE__ */ jsxs(DialogActions, { children: [
-          /* @__PURE__ */ jsx(CancelButton, { onClick: () => setOpenConfirmationPopup(false) }),
-          /* @__PURE__ */ jsx(Button, { onClick: handlePopupConfirmation, variant: "outlined", children: /* @__PURE__ */ jsx(FormattedMessage, { id: validateButtonLabel ?? "validate" }) })
-        ] })
-      ]
-    }
-  );
+  return /* @__PURE__ */ jsxs(Dialog, { open: openConfirmationPopup, "aria-labelledby": "dialog-title-change-equipment-type", children: [
+    /* @__PURE__ */ jsx(DialogTitle, { id: "dialog-title-change-equipment-type", children: "Confirmation" }),
+    /* @__PURE__ */ jsx(DialogContent, { children: /* @__PURE__ */ jsx(DialogContentText, { children: message && /* @__PURE__ */ jsx(FormattedMessage, { id: message }) }) }),
+    /* @__PURE__ */ jsxs(DialogActions, { children: [
+      /* @__PURE__ */ jsx(CancelButton, { onClick: () => setOpenConfirmationPopup(false) }),
+      /* @__PURE__ */ jsx(Button, { onClick: handlePopupConfirmation, variant: "outlined", children: /* @__PURE__ */ jsx(FormattedMessage, { id: validateButtonLabel ?? "validate" }) })
+    ] })
+  ] });
 }
 export {
   PopupConfirmationDialog as default

package/dist/components/filter/criteria-based/criteria-based-filter-edition-dialog.js

@@ -72,10 +72,7 @@ function CriteriaBasedFilterEditionDialog({
   }, [id, name, open, reset, snackError, getFilterById]);
   const onSubmit = useCallback(
     (filterForm) => {
-      saveFilter(
-        frontToBackTweak(id, filterForm),
-        filterForm[FieldConstants.NAME]
-      ).then(() => {
+      saveFilter(frontToBackTweak(id, filterForm), filterForm[FieldConstants.NAME]).then(() => {
         if (selectionForCopy.sourceItemUuid === id) {
           setSelelectionForCopy(noSelectionForCopy);
           broadcastChannel.postMessage({
@@ -88,13 +85,7 @@ function CriteriaBasedFilterEditionDialog({
         });
       });
     },
-    [
-      broadcastChannel,
-      id,
-      selectionForCopy.sourceItemUuid,
-      snackError,
-      setSelelectionForCopy
-    ]
+    [broadcastChannel, id, selectionForCopy.sourceItemUuid, snackError, setSelelectionForCopy]
   );
   const isDataReady = dataFetchStatus === FetchStatus.FETCH_SUCCESS;
   return /* @__PURE__ */ jsx(
@@ -110,13 +101,7 @@ function CriteriaBasedFilterEditionDialog({
       disabledSave: !!nameError || !!isValidating,
       isDataFetching: dataFetchStatus === FetchStatus.FETCHING,
       language,
-      children: isDataReady && /* @__PURE__ */ jsx(
-        FilterForm,
-        {
-          activeDirectory,
-          elementExists
-        }
-      )
+      children: isDataReady && /* @__PURE__ */ jsx(FilterForm, { activeDirectory, elementExists })
     }
   );
 }

package/dist/components/filter/criteria-based/criteria-based-filter-utils.js

@@ -104,19 +104,13 @@ function cleanNominalVoltages(formValues) {
   if (isNominalVoltageEmpty(cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE])) {
     cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE] = null;
   }
-  if (isNominalVoltageEmpty(
-    cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE_1]
-  )) {
+  if (isNominalVoltageEmpty(cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE_1])) {
     cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE_1] = null;
   }
-  if (isNominalVoltageEmpty(
-    cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE_2]
-  )) {
+  if (isNominalVoltageEmpty(cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE_2])) {
     cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE_2] = null;
   }
-  if (isNominalVoltageEmpty(
-    cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE_3]
-  )) {
+  if (isNominalVoltageEmpty(cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE_3])) {
     cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE_3] = null;
   }
   return cleanedFormValues;

package/dist/components/filter/criteria-based/criteria-based-form.d.ts

@@ -4,5 +4,5 @@ export interface CriteriaBasedFormProps {
     equipments: Record<string, FormEquipment>;
     defaultValues: Record<string, any>;
 }
-declare function CriteriaBasedForm({ equipments, defaultValues, }: CriteriaBasedFormProps): import("react/jsx-runtime").JSX.Element;
+declare function CriteriaBasedForm({ equipments, defaultValues }: CriteriaBasedFormProps): import("react/jsx-runtime").JSX.Element;
 export default CriteriaBasedForm;

package/dist/components/filter/criteria-based/criteria-based-form.js

@@ -6,10 +6,7 @@ import FieldConstants from "../../../utils/field-constants.js";
 import SelectInput from "../../inputs/react-hook-form/select-inputs/select-input.js";
 import InputWithPopupConfirmation from "../../inputs/react-hook-form/select-inputs/input-with-popup-confirmation.js";
 import { useSnackMessage } from "../../../hooks/useSnackMessage.js";
-function CriteriaBasedForm({
-  equipments,
-  defaultValues
-}) {
+function CriteriaBasedForm({ equipments, defaultValues }) {
   const { getValues, setValue } = useFormContext();
   const { snackError } = useSnackMessage();
   const watchEquipmentType = useWatch({
@@ -27,10 +24,7 @@ function CriteriaBasedForm({
   };
   const handleResetOnConfirmation = () => {
     Object.keys(defaultValues).forEach(
-      (field) => setValue(
-        `${FieldConstants.CRITERIA_BASED}.${field}`,
-        defaultValues[field]
-      )
+      (field) => setValue(`${FieldConstants.CRITERIA_BASED}.${field}`, defaultValues[field])
     );
   };
   return /* @__PURE__ */ jsxs(Grid, { container: true, item: true, spacing: 2, children: [
@@ -47,13 +41,11 @@ function CriteriaBasedForm({
         validateButtonLabel: "button.changeType"
       }
     ) }),
-    watchEquipmentType && equipments[watchEquipmentType] && equipments[watchEquipmentType].fields.map(
-      (equipment, index) => {
-        const EquipmentForm = equipment.renderer;
-        const uniqueKey = `${watchEquipmentType}-${index}`;
-        return /* @__PURE__ */ jsx(Grid, { item: true, xs: 12, flexGrow: 1, children: /* @__PURE__ */ jsx(EquipmentForm, { ...equipment.props }) }, uniqueKey);
-      }
-    )
+    watchEquipmentType && equipments[watchEquipmentType] && equipments[watchEquipmentType].fields.map((equipment, index) => {
+      const EquipmentForm = equipment.renderer;
+      const uniqueKey = `${watchEquipmentType}-${index}`;
+      return /* @__PURE__ */ jsx(Grid, { item: true, xs: 12, flexGrow: 1, children: /* @__PURE__ */ jsx(EquipmentForm, { ...equipment.props }) }, uniqueKey);
+    })
   ] });
 }
 export {

package/dist/components/filter/criteria-based/filter-free-properties.d.ts

@@ -8,5 +8,5 @@ interface FilterFreePropertiesProps {
     freePropertiesType: FreePropertiesTypes;
     predefined: PredefinedProperties;
 }
-declare function FilterFreeProperties({ freePropertiesType, predefined, }: FilterFreePropertiesProps): import("react/jsx-runtime").JSX.Element;
+declare function FilterFreeProperties({ freePropertiesType, predefined }: FilterFreePropertiesProps): import("react/jsx-runtime").JSX.Element;
 export default FilterFreeProperties;

package/dist/components/filter/criteria-based/filter-free-properties.js

@@ -14,10 +14,7 @@ var FreePropertiesTypes = /* @__PURE__ */ ((FreePropertiesTypes2) => {
   FreePropertiesTypes2["FREE_FILTER_PROPERTIES"] = "freeProperties";
   return FreePropertiesTypes2;
 })(FreePropertiesTypes || {});
-function FilterFreeProperties({
-  freePropertiesType,
-  predefined
-}) {
+function FilterFreeProperties({ freePropertiesType, predefined }) {
   const watchEquipmentType = useWatch({
     name: FieldConstants.EQUIPMENT_TYPE
   });

package/dist/components/filter/criteria-based/filter-properties.js

@@ -45,19 +45,15 @@ const filterPropertiesYupSchema = {
         (values, context) => propertyValuesTest(values, context, true)
       )
     })
-  ).test(
-    "distinct names",
-    "filterPropertiesNameUniquenessError",
-    (properties, context) => {
-      const rootLevelForm = context.from[context.from.length - 1];
-      const filterType = rootLevelForm.value[FieldConstants.FILTER_TYPE];
-      if (filterType !== FilterType.CRITERIA_BASED.id) {
-        return true;
-      }
-      const names = properties.filter((prop) => !!prop[PROPERTY_NAME]).map((prop) => prop[PROPERTY_NAME]);
-      return areArrayElementsUnique(names);
+  ).test("distinct names", "filterPropertiesNameUniquenessError", (properties, context) => {
+    const rootLevelForm = context.from[context.from.length - 1];
+    const filterType = rootLevelForm.value[FieldConstants.FILTER_TYPE];
+    if (filterType !== FilterType.CRITERIA_BASED.id) {
+      return true;
     }
-  ),
+    const names = properties.filter((prop) => !!prop[PROPERTY_NAME]).map((prop) => prop[PROPERTY_NAME]);
+    return areArrayElementsUnique(names);
+  }),
   [FreePropertiesTypes.FREE_FILTER_PROPERTIES]: yup.array().of(
     yup.object().shape({
       [PROPERTY_NAME]: yup.string().required(),
@@ -67,19 +63,15 @@ const filterPropertiesYupSchema = {
         (values, context) => propertyValuesTest(values, context, false)
       )
     })
-  ).test(
-    "distinct names",
-    "filterPropertiesNameUniquenessError",
-    (properties, context) => {
-      const rootLevelForm = context.from[context.from.length - 1];
-      const filterType = rootLevelForm.value[FieldConstants.FILTER_TYPE];
-      if (filterType !== FilterType.CRITERIA_BASED.id) {
-        return true;
-      }
-      const names = properties.filter((prop) => !!prop[PROPERTY_NAME]).map((prop) => prop[PROPERTY_NAME]);
-      return areArrayElementsUnique(names);
+  ).test("distinct names", "filterPropertiesNameUniquenessError", (properties, context) => {
+    const rootLevelForm = context.from[context.from.length - 1];
+    const filterType = rootLevelForm.value[FieldConstants.FILTER_TYPE];
+    if (filterType !== FilterType.CRITERIA_BASED.id) {
+      return true;
     }
-  )
+    const names = properties.filter((prop) => !!prop[PROPERTY_NAME]).map((prop) => prop[PROPERTY_NAME]);
+    return areArrayElementsUnique(names);
+  })
 };
 function FilterProperties() {
   const watchEquipmentType = useWatch({

package/dist/components/filter/criteria-based/filter-property.js

@@ -29,10 +29,7 @@ function FilterProperty(props) {
   }, [watchName, predefined]);
   const onNameChange = useCallback(() => {
     valuesFields.forEach(
-      (valuesField) => setValue(
-        `${FieldConstants.CRITERIA_BASED}.${propertyType}[${index}].${valuesField.name}`,
-        []
-      )
+      (valuesField) => setValue(`${FieldConstants.CRITERIA_BASED}.${propertyType}[${index}].${valuesField.name}`, [])
     );
   }, [setValue, index, valuesFields, propertyType]);
   return /* @__PURE__ */ jsxs(Grid, { container: true, item: true, spacing: 1, columns: 21, children: [

package/dist/components/filter/expert/expert-filter-constants.d.ts

@@ -244,7 +244,6 @@ export declare const FIELDS_OPTIONS: {
         label: string;
         dataType: DataType;
         valueEditorType: string;
-        defaultValue: string;
     };
     VOLTAGE_REGULATOR_ON: {
         name: FieldType;
@@ -485,14 +484,12 @@ export declare const FIELDS_OPTIONS: {
         label: string;
         dataType: DataType;
         valueEditorType: string;
-        defaultValue: string;
     };
     COUNTRY_2: {
         name: FieldType;
         label: string;
         dataType: DataType;
         valueEditorType: string;
-        defaultValue: string;
     };
     SERIE_RESISTANCE: {
         name: FieldType;
@@ -1069,5 +1066,15 @@ export declare const FIELDS_OPTIONS: {
         dataType: DataType;
         inputType: string;
     };
+    PAIRING_KEY: {
+        name: FieldType;
+        label: string;
+        dataType: DataType;
+    };
+    TIE_LINE_ID: {
+        name: FieldType;
+        label: string;
+        dataType: DataType;
+    };
 };
 export declare const fields: Record<string, Field[]>;