@gridsuite/commons-ui 0.132.0 → 0.134.0

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

@@ -17,6 +17,7 @@ import { catchErrorHandler } from "../../../services/utils.js";
 import "../../../utils/conversionUtils.js";
 import "@mui/icons-material";
 import "../../../utils/types/equipmentType.js";
+import { CustomError } from "../../../services/businessErrorCode.js";
 import { EXPERT_FILTER_QUERY } from "./expertFilterConstants.js";
 import * as yup from "yup";
 const formSchema = yup.object().shape({
@@ -37,7 +38,6 @@ function ExpertFilterEditionDialog({
   language,
   description
 }) {
-  var _a;
   const { snackError } = useSnackMessage();
   const [dataFetchStatus, setDataFetchStatus] = useState(FetchStatus.IDLE);
   const formMethods = useForm({
@@ -48,7 +48,7 @@ function ExpertFilterEditionDialog({
     formState: { errors }
   } = formMethods;
   const nameError = errors[FieldConstants.NAME];
-  const isValidating = (_a = errors.root) == null ? void 0 : _a.isValidating;
+  const isValidating = errors.root?.isValidating;
   useEffect(() => {
     if (id && open) {
       setDataFetchStatus(FetchStatus.FETCHING);
@@ -83,10 +83,17 @@ function ExpertFilterEditionDialog({
         null,
         onClose,
         (error) => {
-          snackError({
-            messageTxt: error.message,
-            headerId: "cannotSaveFilter"
-          });
+          if (error instanceof CustomError && error.businessErrorCode != null) {
+            snackError({
+              messageId: error.businessErrorCode,
+              headerId: "cannotSaveFilter"
+            });
+          } else {
+            snackError({
+              messageTxt: error.message,
+              headerId: "cannotSaveFilter"
+            });
+          }
         }
       );
       if (itemSelectionForCopy.sourceItemUuid === id) {

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

@@ -1,6 +1,5 @@
 import { FieldType } from '../../../utils/types/fieldType';
 import * as yup from 'yup';
-export declare const rqbQuerySchemaValidator: (schema: yup.Schema) => yup.Schema<any, any, any, "">;
 export declare const expertFilterSchema: {
     rules: yup.ObjectSchema<{}, yup.AnyObject, {}, "">;
 };

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

@@ -6,11 +6,10 @@ import * as yup from "yup";
 import { v4 } from "uuid";
 import { Box } from "@mui/material";
 import { testQuery } from "./expertFilterUtils.js";
-import { EXPERT_FILTER_QUERY, OPERATOR_OPTIONS, RULES, EXPERT_FILTER_EQUIPMENTS, COMBINATOR_OPTIONS, EXPERT_FILTER_FIELDS } from "./expertFilterConstants.js";
+import { EXPERT_FILTER_QUERY, RULES, OPERATOR_OPTIONS, COMBINATOR_OPTIONS, EXPERT_FILTER_FIELDS, EXPERT_FILTER_EQUIPMENTS } from "./expertFilterConstants.js";
 import { FieldConstants } from "../../../utils/constants/fieldConstants.js";
 import { InputWithPopupConfirmation } from "../../inputs/reactHookForm/selectInputs/InputWithPopupConfirmation.js";
 import { SelectInput } from "../../inputs/reactHookForm/selectInputs/SelectInput.js";
-import { FilterType } from "../constants/FilterConstants.js";
 import { CustomReactQueryBuilder } from "../../inputs/reactQueryBuilder/CustomReactQueryBuilder.js";
 import { unscrollableDialogStyles } from "../../dialogs/customMuiDialog/CustomMuiDialog.js";
 import "../../dialogs/descriptionModificationDialog/DescriptionModificationDialog.js";
@@ -39,22 +38,15 @@ yup.setLocale({
 import '../../../assets/ExpertFilterForm.css';function isSupportedEquipmentType(equipmentType) {
   return Object.values(EXPERT_FILTER_EQUIPMENTS).map((equipments) => equipments.id).includes(equipmentType);
 }
-const rqbQuerySchemaValidator = (schema) => schema.test(RULES.EMPTY_GROUP, RULES.EMPTY_GROUP, (query) => {
-  return testQuery(RULES.EMPTY_GROUP, query);
-}).test(RULES.EMPTY_RULE, RULES.EMPTY_RULE, (query) => {
-  return testQuery(RULES.EMPTY_RULE, query);
-}).test(RULES.INCORRECT_RULE, RULES.INCORRECT_RULE, (query) => {
-  return testQuery(RULES.INCORRECT_RULE, query);
-}).test(RULES.BETWEEN_RULE, RULES.BETWEEN_RULE, (query) => {
-  return testQuery(RULES.BETWEEN_RULE, query);
-});
 const expertFilterSchema = {
-  [EXPERT_FILTER_QUERY]: yup.object().when([FieldConstants.FILTER_TYPE], {
-    is: FilterType.EXPERT.id,
-    then: (schema) => schema.when([FieldConstants.EQUIPMENT_TYPE], {
-      is: (equipmentType) => isSupportedEquipmentType(equipmentType),
-      then: rqbQuerySchemaValidator
-    })
+  [EXPERT_FILTER_QUERY]: yup.object().test(RULES.EMPTY_GROUP, RULES.EMPTY_GROUP, (query) => {
+    return testQuery(RULES.EMPTY_GROUP, query);
+  }).test(RULES.EMPTY_RULE, RULES.EMPTY_RULE, (query) => {
+    return testQuery(RULES.EMPTY_RULE, query);
+  }).test(RULES.INCORRECT_RULE, RULES.INCORRECT_RULE, (query) => {
+    return testQuery(RULES.INCORRECT_RULE, query);
+  }).test(RULES.BETWEEN_RULE, RULES.BETWEEN_RULE, (query) => {
+    return testQuery(RULES.BETWEEN_RULE, query);
   })
 };
 const defaultQuery = {
@@ -86,8 +78,7 @@ function ExpertFilterForm() {
   });
   const formatLabelWithUnit = useFormatLabelWithUnit();
   const translatedFields = useMemo(() => {
-    var _a;
-    return (_a = EXPERT_FILTER_FIELDS[watchEquipmentType]) == null ? void 0 : _a.map((field) => {
+    return EXPERT_FILTER_FIELDS[watchEquipmentType]?.map((field) => {
       return {
         ...field,
         label: formatLabelWithUnit(field)
@@ -116,6 +107,5 @@ function ExpertFilterForm() {
 export {
   ExpertFilterForm,
   expertFilterSchema,
-  getExpertFilterEmptyFormData,
-  rqbQuerySchemaValidator
+  getExpertFilterEmptyFormData
 };

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

@@ -1,6 +1,7 @@
 import { Field } from 'react-querybuilder';
 import { CombinatorType, DataType, OperatorType } from './expertFilter.type';
 import { FieldType } from '../../../utils/types/fieldType';
+import { EquipmentType } from '../../../utils';
 export declare enum RULES {
     EMPTY_RULE = "emptyRule",
     EMPTY_GROUP = "emptyGroup",
@@ -10,51 +11,51 @@ export declare enum RULES {
 export declare const EXPERT_FILTER_QUERY = "rules";
 export declare const EXPERT_FILTER_EQUIPMENTS: {
     SUBSTATION: {
-        id: string;
+        id: EquipmentType;
         label: string;
     };
     VOLTAGE_LEVEL: {
-        id: string;
+        id: EquipmentType;
         label: string;
     };
     LINE: {
-        id: string;
+        id: EquipmentType;
         label: string;
     };
     TWO_WINDINGS_TRANSFORMER: {
-        id: string;
+        id: EquipmentType;
         label: string;
     };
     THREE_WINDINGS_TRANSFORMER: {
-        id: string;
+        id: EquipmentType;
         label: string;
     };
     GENERATOR: {
-        id: string;
+        id: EquipmentType;
         label: string;
     };
     BATTERY: {
-        id: string;
+        id: EquipmentType;
         label: string;
     };
     LOAD: {
-        id: string;
+        id: EquipmentType;
         label: string;
     };
     SHUNT_COMPENSATOR: {
-        id: string;
+        id: EquipmentType;
         label: string;
     };
     STATIC_VAR_COMPENSATOR: {
-        id: string;
+        id: EquipmentType;
         label: string;
     };
     HVDC_LINE: {
-        id: string;
+        id: EquipmentType;
         label: string;
     };
     DANGLING_LINE: {
-        id: string;
+        id: EquipmentType;
         label: string;
     };
 };

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

@@ -1,6 +1,11 @@
 import { OperatorType, CombinatorType, DataType } from "./expertFilter.type.js";
 import { FieldType } from "../../../utils/types/fieldType.js";
 import { KILO_AMPERE, KILO_VOLT, MICRO_SIEMENS, SIEMENS, MEGA_VAR, MEGA_WATT, OHM, MEGA_VOLT_AMPERE } from "../../../utils/constants/unitsConstants.js";
+import "../../../utils/conversionUtils.js";
+import "react/jsx-runtime";
+import "@mui/icons-material";
+import { EquipmentType, ALL_EQUIPMENTS } from "../../../utils/types/equipmentType.js";
+import "../../../utils/yupConfig.js";
 var RULES = /* @__PURE__ */ ((RULES2) => {
   RULES2["EMPTY_RULE"] = "emptyRule";
   RULES2["EMPTY_GROUP"] = "emptyGroup";
@@ -10,54 +15,18 @@ var RULES = /* @__PURE__ */ ((RULES2) => {
 })(RULES || {});
 const EXPERT_FILTER_QUERY = "rules";
 const EXPERT_FILTER_EQUIPMENTS = {
-  SUBSTATION: {
-    id: "SUBSTATION",
-    label: "Substations"
-  },
-  VOLTAGE_LEVEL: {
-    id: "VOLTAGE_LEVEL",
-    label: "VoltageLevels"
-  },
-  LINE: {
-    id: "LINE",
-    label: "Lines"
-  },
-  TWO_WINDINGS_TRANSFORMER: {
-    id: "TWO_WINDINGS_TRANSFORMER",
-    label: "TwoWindingsTransformers"
-  },
-  THREE_WINDINGS_TRANSFORMER: {
-    id: "THREE_WINDINGS_TRANSFORMER",
-    label: "ThreeWindingsTransformers"
-  },
-  GENERATOR: {
-    id: "GENERATOR",
-    label: "Generators"
-  },
-  BATTERY: {
-    id: "BATTERY",
-    label: "Batteries"
-  },
-  LOAD: {
-    id: "LOAD",
-    label: "Loads"
-  },
-  SHUNT_COMPENSATOR: {
-    id: "SHUNT_COMPENSATOR",
-    label: "ShuntCompensators"
-  },
-  STATIC_VAR_COMPENSATOR: {
-    id: "STATIC_VAR_COMPENSATOR",
-    label: "StaticVarCompensators"
-  },
-  HVDC_LINE: {
-    id: "HVDC_LINE",
-    label: "Hvdc"
-  },
-  DANGLING_LINE: {
-    id: "DANGLING_LINE",
-    label: "DanglingLines"
-  }
+  [EquipmentType.SUBSTATION]: ALL_EQUIPMENTS[EquipmentType.SUBSTATION],
+  [EquipmentType.VOLTAGE_LEVEL]: ALL_EQUIPMENTS[EquipmentType.VOLTAGE_LEVEL],
+  [EquipmentType.LINE]: ALL_EQUIPMENTS[EquipmentType.LINE],
+  [EquipmentType.TWO_WINDINGS_TRANSFORMER]: ALL_EQUIPMENTS[EquipmentType.TWO_WINDINGS_TRANSFORMER],
+  [EquipmentType.THREE_WINDINGS_TRANSFORMER]: ALL_EQUIPMENTS[EquipmentType.THREE_WINDINGS_TRANSFORMER],
+  [EquipmentType.GENERATOR]: ALL_EQUIPMENTS[EquipmentType.GENERATOR],
+  [EquipmentType.BATTERY]: ALL_EQUIPMENTS[EquipmentType.BATTERY],
+  [EquipmentType.LOAD]: ALL_EQUIPMENTS[EquipmentType.LOAD],
+  [EquipmentType.SHUNT_COMPENSATOR]: ALL_EQUIPMENTS[EquipmentType.SHUNT_COMPENSATOR],
+  [EquipmentType.STATIC_VAR_COMPENSATOR]: ALL_EQUIPMENTS[EquipmentType.STATIC_VAR_COMPENSATOR],
+  [EquipmentType.HVDC_LINE]: ALL_EQUIPMENTS[EquipmentType.HVDC_LINE],
+  [EquipmentType.DANGLING_LINE]: ALL_EQUIPMENTS[EquipmentType.DANGLING_LINE]
 };
 const ENERGY_SOURCE_OPTIONS = [
   { name: "HYDRO", label: "Hydro" },

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

@@ -1,17 +1,21 @@
 import { defaultOperators, getParentPath, findPath, remove } from "react-querybuilder";
 import { validate } from "uuid";
 import { DataType } from "./expertFilter.type.js";
-import { OPERATOR_OPTIONS, RULES, FIELDS_OPTIONS, EXPERT_FILTER_EQUIPMENTS } from "./expertFilterConstants.js";
+import { OPERATOR_OPTIONS, RULES, FIELDS_OPTIONS } from "./expertFilterConstants.js";
 import { isBlankOrEmpty, convertOutputValue, convertInputValue } from "../../../utils/conversionUtils.js";
 import { FieldType } from "../../../utils/types/fieldType.js";
+import "react/jsx-runtime";
+import "@mui/icons-material";
+import { ALL_EQUIPMENTS } from "../../../utils/types/equipmentType.js";
+import "../../../utils/yupConfig.js";
 const searchTree = (tree, key, value) => {
   const stack = Object.values(tree);
   while (stack.length) {
     const node = stack.shift();
-    if ((node == null ? void 0 : node[key]) === value) {
+    if (node?.[key] === value) {
       return node;
     }
-    if (node == null ? void 0 : node.children) {
+    if (node?.children) {
       stack.push(...Object.values(node.children));
     }
   }
@@ -28,11 +32,11 @@ const getDataType = (fieldName, operator) => {
     return DataType.BOOLEAN;
   }
   const fieldData = getFieldData(fieldName);
-  return fieldData == null ? void 0 : fieldData.dataType;
+  return fieldData?.dataType;
 };
 const getOperators = (fieldName, intl) => {
   const field = Object.values(FIELDS_OPTIONS).find((fieldOption) => fieldOption.name === fieldName);
-  switch (field == null ? void 0 : field.dataType) {
+  switch (field?.dataType) {
     case DataType.STRING: {
       let stringOperators = [
         OPERATOR_OPTIONS.CONTAINS,
@@ -117,7 +121,6 @@ const getOperators = (fieldName, intl) => {
 };
 function exportExpertRules(query) {
   function transformRule(rule) {
-    var _a;
     const isValueAnArray = Array.isArray(rule.value);
     const dataType = getDataType(rule.field, rule.operator);
     if (dataType === DataType.COMBINATOR) {
@@ -126,7 +129,7 @@ function exportExpertRules(query) {
     return {
       id: rule.id,
       field: rule.field,
-      operator: dataType !== DataType.PROPERTY ? (_a = Object.values(OPERATOR_OPTIONS).find((operator) => operator.name === rule.operator)) == null ? void 0 : _a.customName : rule.value.propertyOperator,
+      operator: dataType !== DataType.PROPERTY ? Object.values(OPERATOR_OPTIONS).find((operator) => operator.name === rule.operator)?.customName : rule.value.propertyOperator,
       value: !isValueAnArray && rule.operator !== OPERATOR_OPTIONS.EXISTS.name && rule.operator !== OPERATOR_OPTIONS.NOT_EXISTS.name && dataType !== DataType.PROPERTY ? convertOutputValue(rule.field, rule.value) : void 0,
       values: isValueAnArray && dataType !== DataType.PROPERTY ? convertOutputValue(rule.field, rule.value) : void 0,
       dataType,
@@ -135,7 +138,6 @@ function exportExpertRules(query) {
     };
   }
   function transformCompositeRule(compositeRule) {
-    var _a;
     const compositeGroup = compositeRule.value;
     const transformedRules = Object.entries(compositeGroup.rules).map(
       ([field, rule]) => transformRule({
@@ -151,7 +153,7 @@ function exportExpertRules(query) {
       dataType: DataType.COMBINATOR,
       rules: transformedRules,
       // two additional attributes to distinct a composite rule from a normal rule group
-      operator: (_a = Object.values(OPERATOR_OPTIONS).find((operator) => operator.name === compositeRule.operator)) == null ? void 0 : _a.customName,
+      operator: Object.values(OPERATOR_OPTIONS).find((operator) => operator.name === compositeRule.operator)?.customName,
       field: compositeRule.field
     };
   }
@@ -190,16 +192,14 @@ function importExpertRules(query) {
     return rule.value;
   }
   function transformRule(rule) {
-    var _a;
     return {
       id: rule.id,
       field: rule.field,
-      operator: rule.dataType !== DataType.PROPERTY ? (_a = Object.values(OPERATOR_OPTIONS).find((operator) => operator.customName === rule.operator)) == null ? void 0 : _a.name : OPERATOR_OPTIONS.IS.name,
+      operator: rule.dataType !== DataType.PROPERTY ? Object.values(OPERATOR_OPTIONS).find((operator) => operator.customName === rule.operator)?.name : OPERATOR_OPTIONS.IS.name,
       value: parseValue(rule)
     };
   }
   function transformCompositeGroup(group) {
-    var _a;
     const transformedRules = group.rules.map((rule) => transformRule(rule)).reduce(
       (obj, transformedRule) => ({
         ...obj,
@@ -213,7 +213,7 @@ function importExpertRules(query) {
     return {
       id: group.id,
       field: group.field,
-      operator: (_a = Object.values(OPERATOR_OPTIONS).find((operator) => operator.customName === group.operator)) == null ? void 0 : _a.name,
+      operator: Object.values(OPERATOR_OPTIONS).find((operator) => operator.customName === group.operator)?.name,
       value: {
         combinator: group.combinator,
         rules: transformedRules
@@ -254,7 +254,6 @@ const queryValidator = (query) => {
     return result;
   }
   const validateRule = (rule) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const isValueAnArray = Array.isArray(rule.value);
     const dataType = getDataType(rule.field, rule.operator);
     const isNumberInput = dataType === DataType.NUMBER && !isValueAnArray;
@@ -265,7 +264,7 @@ const queryValidator = (query) => {
         reasons: void 0
       };
     } else if (rule.id && rule.operator === OPERATOR_OPTIONS.BETWEEN.name) {
-      if (!((_a = rule.value) == null ? void 0 : _a[0]) || !((_b = rule.value) == null ? void 0 : _b[1])) {
+      if (!rule.value?.[0] || !rule.value?.[1]) {
         result[rule.id] = {
           valid: false,
           reasons: [RULES.EMPTY_RULE]
@@ -281,7 +280,7 @@ const queryValidator = (query) => {
           reasons: [RULES.BETWEEN_RULE]
         };
       }
-    } else if (rule.id && rule.operator === OPERATOR_OPTIONS.IN.name && !((_c = rule.value) == null ? void 0 : _c.length)) {
+    } else if (rule.id && rule.operator === OPERATOR_OPTIONS.IN.name && !rule.value?.length) {
       result[rule.id] = {
         valid: false,
         reasons: [RULES.EMPTY_RULE]
@@ -296,12 +295,12 @@ const queryValidator = (query) => {
         valid: false,
         reasons: [RULES.INCORRECT_RULE]
       };
-    } else if (rule.id && dataType === DataType.FILTER_UUID && (!((_d = rule.value) == null ? void 0 : _d.length) || !validate(rule.value[0]))) {
+    } else if (rule.id && dataType === DataType.FILTER_UUID && (!rule.value?.length || !validate(rule.value[0]))) {
       result[rule.id] = {
         valid: false,
         reasons: [RULES.EMPTY_RULE]
       };
-    } else if (rule.id && dataType === DataType.PROPERTY && (isBlankOrEmpty((_e = rule.value) == null ? void 0 : _e.propertyName) || isBlankOrEmpty((_f = rule.value) == null ? void 0 : _f.propertyOperator) || isBlankOrEmpty((_g = rule.value) == null ? void 0 : _g.propertyValues) || !((_i = (_h = rule.value) == null ? void 0 : _h.propertyValues) == null ? void 0 : _i.length))) {
+    } else if (rule.id && dataType === DataType.PROPERTY && (isBlankOrEmpty(rule.value?.propertyName) || isBlankOrEmpty(rule.value?.propertyOperator) || isBlankOrEmpty(rule.value?.propertyValues) || !rule.value?.propertyValues?.length)) {
       result[rule.id] = {
         valid: false,
         reasons: [RULES.EMPTY_RULE]
@@ -310,12 +309,11 @@ const queryValidator = (query) => {
       const childrenFields = Object.keys(getFieldData(rule.field).children ?? {});
       const compositeGroup = rule.value;
       childrenFields.forEach((field) => {
-        var _a2, _b2, _c2, _d2;
         validateRule({
           ...rule,
           field,
-          operator: (_b2 = (_a2 = compositeGroup == null ? void 0 : compositeGroup.rules) == null ? void 0 : _a2[field]) == null ? void 0 : _b2.operator,
-          value: (_d2 = (_c2 = compositeGroup == null ? void 0 : compositeGroup.rules) == null ? void 0 : _c2[field]) == null ? void 0 : _d2.value
+          operator: compositeGroup?.rules?.[field]?.operator,
+          value: compositeGroup?.rules?.[field]?.value
         });
       });
     }
@@ -351,10 +349,9 @@ const testQuery = (check, query) => {
   });
 };
 function getNumberOfSiblings(path, query) {
-  var _a;
   const parentPath = getParentPath(path);
   const parentGroup = findPath(parentPath, query);
-  return (_a = parentGroup == null ? void 0 : parentGroup.rules) == null ? void 0 : _a.length;
+  return parentGroup?.rules?.length;
 }
 function recursiveRemove(query, path) {
   if (getNumberOfSiblings(path, query) === 1 && path.toString() !== [0].toString()) {
@@ -363,11 +360,10 @@ function recursiveRemove(query, path) {
   return remove(query, path);
 }
 function getFilterEquipmentTypeLabel(equipmentType) {
-  var _a;
   if (!equipmentType) {
     return "";
   }
-  return ((_a = EXPERT_FILTER_EQUIPMENTS[equipmentType]) == null ? void 0 : _a.label) ?? "";
+  return ALL_EQUIPMENTS[equipmentType]?.label ?? "";
 }
 export {
   countRules,

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

@@ -1,5 +1,5 @@
 import { ExpertFilterEditionDialog } from "./ExpertFilterEditionDialog.js";
-import { ExpertFilterForm, expertFilterSchema, getExpertFilterEmptyFormData, rqbQuerySchemaValidator } from "./ExpertFilterForm.js";
+import { ExpertFilterForm, expertFilterSchema, getExpertFilterEmptyFormData } from "./ExpertFilterForm.js";
 import { CombinatorType, DataType, OperatorType } from "./expertFilter.type.js";
 import { COMBINATOR_OPTIONS, CONVERTERS_MODE_OPTIONS, ENERGY_SOURCE_OPTIONS, EXPERT_FILTER_EQUIPMENTS, EXPERT_FILTER_FIELDS, EXPERT_FILTER_QUERY, FIELDS_OPTIONS, LOAD_TYPE_OPTIONS, OPERATOR_OPTIONS, PHASE_REGULATION_MODE_OPTIONS, RATIO_REGULATION_MODE_OPTIONS, REGULATION_TYPE_OPTIONS, RULES, SHUNT_COMPENSATOR_TYPE_OPTIONS, SVAR_REGULATION_MODE_OPTIONS } from "./expertFilterConstants.js";
 import { countRules, exportExpertRules, getFilterEquipmentTypeLabel, getNumberOfSiblings, getOperators, importExpertRules, queryValidator, recursiveRemove, testQuery } from "./expertFilterUtils.js";
@@ -34,6 +34,5 @@ export {
   importExpertRules,
   queryValidator,
   recursiveRemove,
-  rqbQuerySchemaValidator,
   testQuery
 };

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

@@ -34,7 +34,6 @@ function ExplicitNamingFilterEditionDialog({
   language,
   description
 }) {
-  var _a;
   const { snackError } = useSnackMessage();
   const [dataFetchStatus, setDataFetchStatus] = useState(FetchStatus.IDLE);
   const formMethods = useForm({
@@ -45,18 +44,17 @@ function ExplicitNamingFilterEditionDialog({
     formState: { errors }
   } = formMethods;
   const nameError = errors[FieldConstants.NAME];
-  const isValidating = (_a = errors.root) == null ? void 0 : _a.isValidating;
+  const isValidating = errors.root?.isValidating;
   useEffect(() => {
     if (id && open) {
       setDataFetchStatus(FetchStatus.FETCHING);
       getFilterById(id).then((response) => {
-        var _a2;
         setDataFetchStatus(FetchStatus.FETCH_SUCCESS);
         reset({
           [FieldConstants.NAME]: name,
           [FieldConstants.DESCRIPTION]: description,
           [FieldConstants.EQUIPMENT_TYPE]: response[FieldConstants.EQUIPMENT_TYPE],
-          [FILTER_EQUIPMENTS_ATTRIBUTES]: (_a2 = response[FILTER_EQUIPMENTS_ATTRIBUTES]) == null ? void 0 : _a2.map((row) => ({
+          [FILTER_EQUIPMENTS_ATTRIBUTES]: response[FILTER_EQUIPMENTS_ATTRIBUTES]?.map((row) => ({
             [FieldConstants.AG_GRID_ROW_UUID]: v4(),
             ...row
           }))

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

@@ -12,7 +12,7 @@ import { Generator, Load } from "../../../utils/types/equipmentTypes.js";
 import { NumericEditor } from "../../inputs/reactHookForm/agGridTable/cellEditors/numericEditor.js";
 import { InputWithPopupConfirmation } from "../../inputs/reactHookForm/selectInputs/InputWithPopupConfirmation.js";
 import { toFloatOrNullValue } from "../../inputs/reactHookForm/utils/functions.js";
-import { DISTRIBUTION_KEY, FilterType } from "../constants/FilterConstants.js";
+import { DISTRIBUTION_KEY } from "../constants/FilterConstants.js";
 import { FILTER_EQUIPMENTS } from "../utils/filterFormUtils.js";
 import { useSnackMessage } from "../../../hooks/useSnackMessage.js";
 import { ElementType } from "../../../utils/types/elementType.js";
@@ -33,15 +33,12 @@ const explicitNamingFilterSchema = {
       [FieldConstants.EQUIPMENT_ID]: yup.string().nullable(),
       [DISTRIBUTION_KEY]: yup.number().nullable()
     })
-  ).compact((row) => !row[DISTRIBUTION_KEY] && !row[FieldConstants.EQUIPMENT_ID]).when([FieldConstants.FILTER_TYPE], {
-    is: FilterType.EXPLICIT_NAMING.id,
-    then: (schema) => schema.min(1, "emptyFilterError").when([FieldConstants.EQUIPMENT_TYPE], {
-      is: (equipmentType) => isGeneratorOrLoad(equipmentType),
-      then: (innerSchema) => innerSchema.test("noKeyWithoutId", "distributionKeyWithMissingIdError", (array) => {
-        return !array.some((row) => !row[FieldConstants.EQUIPMENT_ID]);
-      }).test("ifOneKeyThenKeyEverywhere", "missingDistributionKeyError", (array) => {
-        return !(array.some((row) => row[DISTRIBUTION_KEY]) && array.some((row) => !row[DISTRIBUTION_KEY]));
-      })
+  ).compact((row) => !row[DISTRIBUTION_KEY] && !row[FieldConstants.EQUIPMENT_ID]).min(1, "emptyFilterError").when([FieldConstants.EQUIPMENT_TYPE], {
+    is: (equipmentType) => isGeneratorOrLoad(equipmentType),
+    then: (innerSchema) => innerSchema.test("noKeyWithoutId", "distributionKeyWithMissingIdError", (array) => {
+      return !array.some((row) => !row[FieldConstants.EQUIPMENT_ID]);
+    }).test("ifOneKeyThenKeyEverywhere", "missingDistributionKeyError", (array) => {
+      return !(array.some((row) => row[DISTRIBUTION_KEY]) && array.some((row) => !row[DISTRIBUTION_KEY]));
     })
   })
 };
@@ -91,10 +88,7 @@ function ExplicitNamingFilterForm({ sourceFilterForExplicitNamingConversion }) {
         editable: true,
         singleClickEdit: true,
         flex: 1,
-        valueParser: (params) => {
-          var _a;
-          return ((_a = params.newValue) == null ? void 0 : _a.trim()) ?? null;
-        }
+        valueParser: (params) => params.newValue?.trim() ?? null
       }
     ];
     if (forGeneratorOrLoad) {
@@ -125,11 +119,10 @@ function ExplicitNamingFilterForm({ sourceFilterForExplicitNamingConversion }) {
   const getDataFromCsvFile = useCallback((csvData) => {
     if (csvData) {
       return csvData.map((value) => {
-        var _a, _b;
         return {
           [FieldConstants.AG_GRID_ROW_UUID]: v4(),
-          [FieldConstants.EQUIPMENT_ID]: (_a = value[0]) == null ? void 0 : _a.trim(),
-          [DISTRIBUTION_KEY]: toFloatOrNullValue((_b = value[1]) == null ? void 0 : _b.trim())
+          [FieldConstants.EQUIPMENT_ID]: value[0]?.trim(),
+          [DISTRIBUTION_KEY]: toFloatOrNullValue(value[1]?.trim())
         };
       });
     }
@@ -144,7 +137,7 @@ function ExplicitNamingFilterForm({ sourceFilterForExplicitNamingConversion }) {
     setValue(FILTER_EQUIPMENTS_ATTRIBUTES, makeDefaultTableRows());
   };
   const onStudySelected = (studyUuid) => {
-    exportFilter(studyUuid, sourceFilterForExplicitNamingConversion == null ? void 0 : sourceFilterForExplicitNamingConversion.id).then((matchingEquipments) => {
+    exportFilter(studyUuid, sourceFilterForExplicitNamingConversion?.id).then((matchingEquipments) => {
       setValue(
         FILTER_EQUIPMENTS_ATTRIBUTES,
         matchingEquipments.length === 0 ? makeDefaultTableRows() : matchingEquipments.map((equipment) => ({

package/dist/components/filter/index.js

@@ -4,7 +4,7 @@ import { DISTRIBUTION_KEY, FilterType, NO_ITEM_SELECTION_FOR_COPY } from "./cons
 import { CriteriaBasedForm } from "../contingencyList/criteriaBased/CriteriaBasedForm.js";
 import { getCriteriaBasedFormData, getCriteriaBasedSchema } from "../contingencyList/criteriaBased/criteriaBasedUtils.js";
 import { ExpertFilterEditionDialog } from "./expert/ExpertFilterEditionDialog.js";
-import { ExpertFilterForm, expertFilterSchema, getExpertFilterEmptyFormData, rqbQuerySchemaValidator } from "./expert/ExpertFilterForm.js";
+import { ExpertFilterForm, expertFilterSchema, getExpertFilterEmptyFormData } from "./expert/ExpertFilterForm.js";
 import { CombinatorType, DataType, OperatorType } from "./expert/expertFilter.type.js";
 import { COMBINATOR_OPTIONS, CONVERTERS_MODE_OPTIONS, ENERGY_SOURCE_OPTIONS, EXPERT_FILTER_EQUIPMENTS, EXPERT_FILTER_FIELDS, EXPERT_FILTER_QUERY, FIELDS_OPTIONS, LOAD_TYPE_OPTIONS, OPERATOR_OPTIONS, PHASE_REGULATION_MODE_OPTIONS, RATIO_REGULATION_MODE_OPTIONS, REGULATION_TYPE_OPTIONS, RULES, SHUNT_COMPENSATOR_TYPE_OPTIONS, SVAR_REGULATION_MODE_OPTIONS } from "./expert/expertFilterConstants.js";
 import { countRules, exportExpertRules, getFilterEquipmentTypeLabel, getNumberOfSiblings, getOperators, importExpertRules, queryValidator, recursiveRemove, testQuery } from "./expert/expertFilterUtils.js";
@@ -59,7 +59,6 @@ export {
   importExpertRules,
   queryValidator,
   recursiveRemove,
-  rqbQuerySchemaValidator,
   saveExpertFilter,
   saveExplicitNamingFilter,
   testQuery

package/dist/components/filter/utils/filterApi.js

@@ -73,9 +73,13 @@ const saveExpertFilter = (id, query, equipmentType, name, description, isFilterC
     ).then(() => {
       onClose();
     }).catch((error) => {
-      catchErrorHandler(error, (message) => {
-        onError(new Error(message));
-      });
+      if (error instanceof Error) {
+        onError(error);
+      } else {
+        catchErrorHandler(error, (message) => {
+          onError(new Error(message));
+        });
+      }
     });
   } else {
     saveFilter(
@@ -91,9 +95,13 @@ const saveExpertFilter = (id, query, equipmentType, name, description, isFilterC
     ).then(() => {
       onClose();
     }).catch((error) => {
-      catchErrorHandler(error, (message) => {
-        onError(new Error(message));
-      });
+      if (error instanceof Error) {
+        onError(error);
+      } else {
+        catchErrorHandler(error, (message) => {
+          onError(new Error(message));
+        });
+      }
     });
   }
 };

package/dist/components/flatParameters/FlatParameters.js

@@ -50,7 +50,7 @@ function extractDefault(paramDescription) {
   return d ?? null;
 }
 function longestCommonPrefix(stringList) {
-  if (!(stringList == null ? void 0 : stringList.length)) {
+  if (!stringList?.length) {
     return "";
   }
   let prefix = stringList.reduce((acc, str) => str.length < acc.length ? str : acc);
@@ -169,7 +169,7 @@ function FlatParameters({
     return extractDefault(param);
   }
   const outputTransformFloatString = (value) => {
-    return (value == null ? void 0 : value.replace(",", ".")) || "";
+    return value?.replace(",", ".") || "";
   };
   const getStringListValue = (allValues, selectValues) => {
     if (!selectValues || !selectValues.length) {