@gridsuite/commons-ui 0.57.0 → 0.59.0

package/dist/components/filter/{constants → expert}/expert-filter-constants.js

@@ -1,4 +1,4 @@
-import { OperatorType, CombinatorType, FieldType, DataType } from "../expert/expert-filter.type.js";
+import { OperatorType, CombinatorType, FieldType, DataType } from "./expert-filter.type.js";
 var RULES = /* @__PURE__ */ ((RULES2) => {
   RULES2["EMPTY_RULE"] = "emptyRule";
   RULES2["EMPTY_GROUP"] = "emptyGroup";
@@ -340,25 +340,25 @@ const FIELDS_OPTIONS = {
   },
   NOMINAL_VOLTAGE_1: {
     name: FieldType.NOMINAL_VOLTAGE_1,
-    label: "nominalVoltage1Or",
+    label: "nominalVoltage1KV",
     dataType: DataType.NUMBER,
     inputType: "number"
   },
   NOMINAL_VOLTAGE_2: {
     name: FieldType.NOMINAL_VOLTAGE_2,
-    label: "nominalVoltage2Ex",
+    label: "nominalVoltage2KV",
     dataType: DataType.NUMBER,
     inputType: "number"
   },
   RATED_VOLTAGE_1: {
     name: FieldType.RATED_VOLTAGE_1,
-    label: "ratedVoltage1Or",
+    label: "ratedVoltage1KV",
     dataType: DataType.NUMBER,
     inputType: "number"
   },
   RATED_VOLTAGE_2: {
     name: FieldType.RATED_VOLTAGE_2,
-    label: "ratedVoltage2Ex",
+    label: "ratedVoltage2KV",
     dataType: DataType.NUMBER,
     inputType: "number"
   },
@@ -517,6 +517,27 @@ const FIELDS_OPTIONS = {
     dataType: DataType.PROPERTY,
     valueEditorType: "select",
     defaultValue: ""
+  },
+  VOLTAGE_LEVEL_PROPERTY: {
+    name: FieldType.VOLTAGE_LEVEL_PROPERTY,
+    label: "voltageLevelProperty",
+    dataType: DataType.PROPERTY,
+    valueEditorType: "select",
+    defaultValue: ""
+  },
+  VOLTAGE_LEVEL_PROPERTY_1: {
+    name: FieldType.VOLTAGE_LEVEL_PROPERTY_1,
+    label: "voltageLevelProperty1",
+    dataType: DataType.PROPERTY,
+    valueEditorType: "select",
+    defaultValue: ""
+  },
+  VOLTAGE_LEVEL_PROPERTY_2: {
+    name: FieldType.VOLTAGE_LEVEL_PROPERTY_2,
+    label: "voltageLevelProperty2",
+    dataType: DataType.PROPERTY,
+    valueEditorType: "select",
+    defaultValue: ""
   }
 };
 const fields = {
@@ -555,25 +576,27 @@ const fields = {
     FIELDS_OPTIONS.SHUNT_SUSCEPTANCE_2,
     FIELDS_OPTIONS.PROPERTY,
     FIELDS_OPTIONS.SUBSTATION_PROPERTY_1,
-    FIELDS_OPTIONS.SUBSTATION_PROPERTY_2
+    FIELDS_OPTIONS.SUBSTATION_PROPERTY_2,
+    FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_1,
+    FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_2
   ],
   TWO_WINDINGS_TRANSFORMER: [
     FIELDS_OPTIONS.ID,
     FIELDS_OPTIONS.NAME,
+    FIELDS_OPTIONS.COUNTRY,
+    FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_1,
+    FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_2,
     FIELDS_OPTIONS.NOMINAL_VOLTAGE_1,
     FIELDS_OPTIONS.NOMINAL_VOLTAGE_2,
     FIELDS_OPTIONS.RATED_VOLTAGE_1,
     FIELDS_OPTIONS.RATED_VOLTAGE_2,
+    FIELDS_OPTIONS.CONNECTED_1,
+    FIELDS_OPTIONS.CONNECTED_2,
     FIELDS_OPTIONS.RATED_S,
     FIELDS_OPTIONS.SERIE_RESISTANCE,
     FIELDS_OPTIONS.SERIE_REACTANCE,
     FIELDS_OPTIONS.MAGNETIZING_CONDUCTANCE,
     FIELDS_OPTIONS.MAGNETIZING_SUSCEPTANCE,
-    FIELDS_OPTIONS.CONNECTED_1,
-    FIELDS_OPTIONS.CONNECTED_2,
-    FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_1,
-    FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_2,
-    FIELDS_OPTIONS.COUNTRY,
     FIELDS_OPTIONS.HAS_RATIO_TAP_CHANGER,
     FIELDS_OPTIONS.LOAD_TAP_CHANGING_CAPABILITIES,
     FIELDS_OPTIONS.RATIO_REGULATION_MODE,
@@ -585,7 +608,9 @@ const fields = {
     FIELDS_OPTIONS.PHASE_REGULATION_VALUE,
     FIELDS_OPTIONS.PROPERTY,
     FIELDS_OPTIONS.SUBSTATION_PROPERTY_1,
-    FIELDS_OPTIONS.SUBSTATION_PROPERTY_2
+    FIELDS_OPTIONS.SUBSTATION_PROPERTY_2,
+    FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_1,
+    FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_2
   ],
   GENERATOR: [
     FIELDS_OPTIONS.ID,
@@ -607,11 +632,13 @@ const fields = {
     FIELDS_OPTIONS.PLANNED_OUTAGE_RATE,
     FIELDS_OPTIONS.FORCED_OUTAGE_RATE,
     FIELDS_OPTIONS.PROPERTY,
-    FIELDS_OPTIONS.SUBSTATION_PROPERTY
+    FIELDS_OPTIONS.SUBSTATION_PROPERTY,
+    FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY
   ],
   LOAD: [
     FIELDS_OPTIONS.ID,
     FIELDS_OPTIONS.NAME,
+    FIELDS_OPTIONS.LOAD_TYPE,
     FIELDS_OPTIONS.COUNTRY,
     FIELDS_OPTIONS.VOLTAGE_LEVEL_ID,
     FIELDS_OPTIONS.NOMINAL_VOLTAGE,
@@ -619,7 +646,8 @@ const fields = {
     FIELDS_OPTIONS.P0,
     FIELDS_OPTIONS.Q0,
     FIELDS_OPTIONS.PROPERTY,
-    FIELDS_OPTIONS.SUBSTATION_PROPERTY
+    FIELDS_OPTIONS.SUBSTATION_PROPERTY,
+    FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY
   ],
   BATTERY: [
     FIELDS_OPTIONS.ID,
@@ -633,7 +661,8 @@ const fields = {
     FIELDS_OPTIONS.TARGET_P,
     FIELDS_OPTIONS.TARGET_Q,
     FIELDS_OPTIONS.PROPERTY,
-    FIELDS_OPTIONS.SUBSTATION_PROPERTY
+    FIELDS_OPTIONS.SUBSTATION_PROPERTY,
+    FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY
   ],
   SHUNT_COMPENSATOR: [
     FIELDS_OPTIONS.ID,
@@ -650,7 +679,8 @@ const fields = {
     FIELDS_OPTIONS.MAX_SUSCEPTANCE,
     FIELDS_OPTIONS.SWITCHED_ON_SUSCEPTANCE,
     FIELDS_OPTIONS.PROPERTY,
-    FIELDS_OPTIONS.SUBSTATION_PROPERTY
+    FIELDS_OPTIONS.SUBSTATION_PROPERTY,
+    FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY
   ]
 };
 export {

package/dist/components/filter/expert/expert-filter-edition-dialog.d.ts

@@ -1,4 +1,3 @@
-import { ElementAttributes } from '../../../utils/types.ts';
 import { elementExistsType } from '../criteria-based/criteria-based-filter-edition-dialog';
 import { UUID } from 'crypto';
 import { FunctionComponent } from 'react';
@@ -15,14 +14,9 @@ export interface ExpertFilterEditionDialogProps {
         [prop: string]: any;
     }>;
     setSelectionForCopy: (selection: any) => void;
-    createFilter: (filter: any, name: string, description: string, activeDirectory: any) => Promise<void>;
-    saveFilter: (filter: any, name: string) => Promise<void>;
     activeDirectory?: UUID;
     elementExists?: elementExistsType;
     language?: string;
-    fetchDirectoryContent: (directoryUuid: UUID, elementTypes: string[]) => Promise<ElementAttributes[]>;
-    fetchRootFolders: (types: string[]) => Promise<ElementAttributes[]>;
-    fetchElementsInfos: (ids: UUID[], elementTypes?: string[], equipmentTypes?: string[]) => Promise<ElementAttributes[]>;
 }
-export declare const ExpertFilterEditionDialog: FunctionComponent<ExpertFilterEditionDialogProps>;
+declare const ExpertFilterEditionDialog: FunctionComponent<ExpertFilterEditionDialogProps>;
 export default ExpertFilterEditionDialog;

package/dist/components/filter/expert/expert-filter-edition-dialog.js

@@ -1,20 +1,18 @@
 import "react/jsx-runtime";
 import "react";
-import "../constants/field-constants.js";
-import "../constants/equipment-types.js";
+import "../../../utils/field-constants.js";
+import "../../../utils/equipment-types.js";
 import "react-hook-form";
 import "@hookform/resolvers/yup";
 import "../../../hooks/useSnackMessage.js";
 import "../../dialogs/custom-mui-dialog.js";
 import "../../../utils/yup-config.js";
-import { E, E as E2 } from "../../../chunks/criteria-based-filter-edition-dialog.BEXoNmzz.js";
-import "../utils/filters-utils.js";
+import { E } from "../../../chunks/criteria-based-filter-edition-dialog.p2pUWzxc.js";
+import "../utils/filter-api.js";
 import "./expert-filter-utils.js";
-import "../filter-context.js";
 import "../constants/filter-constants.js";
 import "../../../utils/FetchStatus.js";
 import "yup";
 export {
-  E as ExpertFilterEditionDialog,
-  E2 as default
+  E as default
 };

package/dist/components/filter/expert/expert-filter-form.js

@@ -2,17 +2,17 @@ import "react/jsx-runtime";
 import "react";
 import "@mui/material/Grid";
 import "react-querybuilder";
-import { k, n, l, m } from "../../../chunks/criteria-based-filter-edition-dialog.BEXoNmzz.js";
+import { k, n, l, m } from "../../../chunks/criteria-based-filter-edition-dialog.p2pUWzxc.js";
 import "react-hook-form";
 import "./expert-filter-utils.js";
-import "../constants/expert-filter-constants.js";
+import "./expert-filter-constants.js";
 import "yup";
 import "./expert-filter.type.js";
 import "uuid";
 import "react-intl";
-import "../constants/field-constants.js";
-import "../../react-hook-form/select-inputs/input-with-popup-confirmation.js";
-import "../../react-hook-form/select-inputs/select-input.js";
+import "../../../utils/field-constants.js";
+import "../../inputs/react-hook-form/select-inputs/input-with-popup-confirmation.js";
+import "../../inputs/react-hook-form/select-inputs/select-input.js";
 import "../constants/filter-constants.js";
 export {
   k as EXPERT_FILTER_QUERY,

package/dist/components/filter/expert/expert-filter-utils.js

@@ -1,7 +1,7 @@
 import { defaultOperators, getParentPath, remove, findPath } from "react-querybuilder";
 import { FieldType, DataType, OperatorType } from "./expert-filter.type.js";
 import { validate } from "uuid";
-import { FIELDS_OPTIONS, OPERATOR_OPTIONS, RULES } from "../constants/expert-filter-constants.js";
+import { FIELDS_OPTIONS, OPERATOR_OPTIONS, RULES } from "./expert-filter-constants.js";
 import { isBlankOrEmpty, microUnitToUnit, unitToMicroUnit } from "../../../utils/conversion-utils.js";
 const microUnits = [
   FieldType.SHUNT_CONDUCTANCE_1,

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

@@ -87,7 +87,10 @@ export declare enum FieldType {
     PROPERTY = "FREE_PROPERTIES",
     SUBSTATION_PROPERTY = "SUBSTATION_PROPERTIES",
     SUBSTATION_PROPERTY_1 = "SUBSTATION_PROPERTIES_1",
-    SUBSTATION_PROPERTY_2 = "SUBSTATION_PROPERTIES_2"
+    SUBSTATION_PROPERTY_2 = "SUBSTATION_PROPERTIES_2",
+    VOLTAGE_LEVEL_PROPERTY = "VOLTAGE_LEVEL_PROPERTIES",
+    VOLTAGE_LEVEL_PROPERTY_1 = "VOLTAGE_LEVEL_PROPERTIES_1",
+    VOLTAGE_LEVEL_PROPERTY_2 = "VOLTAGE_LEVEL_PROPERTIES_2"
 }
 export declare enum DataType {
     STRING = "STRING",

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

@@ -84,6 +84,9 @@ var FieldType = /* @__PURE__ */ ((FieldType2) => {
   FieldType2["SUBSTATION_PROPERTY"] = "SUBSTATION_PROPERTIES";
   FieldType2["SUBSTATION_PROPERTY_1"] = "SUBSTATION_PROPERTIES_1";
   FieldType2["SUBSTATION_PROPERTY_2"] = "SUBSTATION_PROPERTIES_2";
+  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";
   return FieldType2;
 })(FieldType || {});
 var DataType = /* @__PURE__ */ ((DataType2) => {

package/dist/components/filter/explicit-naming/explicit-naming-filter-edition-dialog.d.ts

@@ -12,8 +12,6 @@ interface ExplicitNamingFilterEditionDialogProps {
     selectionForCopy: any;
     setSelectionForCopy: (selection: any) => void;
     getFilterById: (id: string) => Promise<any>;
-    createFilter: (filter: any, name: string, description: string, activeDirectory: any) => Promise<void>;
-    saveFilter: (filter: any, name: string) => Promise<void>;
     activeDirectory?: UUID;
     elementExists?: elementExistsType;
     language?: string;

package/dist/components/filter/explicit-naming/explicit-naming-filter-edition-dialog.js

@@ -1,16 +1,16 @@
 import "react/jsx-runtime";
 import "react";
 import "prop-types";
-import "../utils/filters-utils.js";
+import "../utils/filter-api.js";
 import "react-hook-form";
 import "@hookform/resolvers/yup";
 import "../../../hooks/useSnackMessage.js";
 import "../../dialogs/custom-mui-dialog.js";
 import "../../../utils/yup-config.js";
-import { a } from "../../../chunks/criteria-based-filter-edition-dialog.BEXoNmzz.js";
-import "../constants/field-constants.js";
+import { a } from "../../../chunks/criteria-based-filter-edition-dialog.p2pUWzxc.js";
+import "../../../utils/field-constants.js";
 import "uuid";
-import "../constants/equipment-types.js";
+import "../../../utils/equipment-types.js";
 import "../constants/filter-constants.js";
 import "../../../utils/FetchStatus.js";
 import "yup";

package/dist/components/filter/explicit-naming/explicit-naming-filter-form.d.ts

@@ -1,6 +1,7 @@
+import { UUID } from 'crypto';
 import { DISTRIBUTION_KEY } from '../constants/filter-constants';
 import { default as yup } from '../../../utils/yup-config';
-import { FieldConstants } from '../constants/field-constants';
+import { FieldConstants } from '../../../utils/field-constants';
 import { FunctionComponent } from 'react';
 
 export declare const FILTER_EQUIPMENTS_ATTRIBUTES = "filterEquipmentsAttributes";
@@ -18,5 +19,12 @@ interface FilterTableRow {
 export declare function getExplicitNamingFilterEmptyFormData(): {
     filterEquipmentsAttributes: FilterTableRow[];
 };
-declare const ExplicitNamingFilterForm: FunctionComponent;
+export interface FilterForExplicitConversionProps {
+    id: UUID;
+    equipmentType: String;
+}
+interface ExplicitNamingFilterFormProps {
+    sourceFilterForExplicitNamingConversion?: FilterForExplicitConversionProps;
+}
+declare const ExplicitNamingFilterForm: FunctionComponent<ExplicitNamingFilterFormProps>;
 export default ExplicitNamingFilterForm;

package/dist/components/filter/explicit-naming/explicit-naming-filter-form.js

@@ -1,19 +1,23 @@
 import "react/jsx-runtime";
 import "react";
-import "../constants/field-constants.js";
+import "../../../utils/field-constants.js";
 import "../../../utils/yup-config.js";
-import { d, f, e, g } from "../../../chunks/criteria-based-filter-edition-dialog.BEXoNmzz.js";
+import { d, f, e, g } from "../../../chunks/criteria-based-filter-edition-dialog.p2pUWzxc.js";
 import "react-intl";
 import "react-hook-form";
 import "@mui/material/Grid";
-import "../../react-hook-form/select-inputs/select-input.js";
-import "../constants/equipment-types.js";
-import "../../react-hook-form/ag-grid-table-rhf/cell-editors/numericEditor.js";
-import "../../react-hook-form/select-inputs/input-with-popup-confirmation.js";
+import "../../inputs/react-hook-form/select-inputs/select-input.js";
+import "../../../utils/equipment-types.js";
+import "../../inputs/react-hook-form/ag-grid-table/cell-editors/numericEditor.js";
+import "../../inputs/react-hook-form/select-inputs/input-with-popup-confirmation.js";
 import "uuid";
-import "../../react-hook-form/utils/functions.js";
+import "../../inputs/react-hook-form/utils/functions.js";
 import "../constants/filter-constants.js";
-import "../utils/criteria-based-utils.js";
+import "../utils/filter-form-utils.js";
+import "../../../hooks/useSnackMessage.js";
+import "../../../utils/ElementType.js";
+import "../../dialogs/modify-element-selection.js";
+import "../../../services/study.js";
 import "yup";
 export {
   d as FILTER_EQUIPMENTS_ATTRIBUTES,

package/dist/components/filter/filter-creation-dialog.d.ts

@@ -1,5 +1,3 @@
-import { ElementAttributes } from '../../utils/types.ts';
-import { StudyMetadata } from '../../hooks/predefined-properties-hook.ts';
 import { UUID } from 'crypto';
 import { elementExistsType } from './criteria-based/criteria-based-filter-edition-dialog';
 import { FunctionComponent } from 'react';
@@ -8,14 +6,12 @@ export interface FilterCreationDialogProps {
     open: boolean;
     onClose: () => void;
     activeDirectory?: UUID;
-    createFilter: (filter: any, name: string, description: string, activeDirectory: any) => Promise<void>;
-    saveFilter: (filter: any, name: string) => Promise<void>;
-    fetchAppsAndUrls: () => Promise<StudyMetadata[]>;
     elementExists?: elementExistsType;
     language?: string;
-    fetchDirectoryContent?: (directoryUuid: UUID, elementTypes: string[]) => Promise<ElementAttributes[]>;
-    fetchRootFolders?: (types: string[]) => Promise<ElementAttributes[]>;
-    fetchElementsInfos?: (ids: UUID[], elementTypes?: string[], equipmentTypes?: string[]) => Promise<ElementAttributes[]>;
+    sourceFilterForExplicitNamingConversion?: {
+        id: UUID;
+        equipmentType: string;
+    };
 }
 declare const FilterCreationDialog: FunctionComponent<FilterCreationDialogProps>;
 export default FilterCreationDialog;

package/dist/components/filter/filter-creation-dialog.js

@@ -1,15 +1,14 @@
 import "react/jsx-runtime";
 import "react";
-import "./utils/filters-utils.js";
+import "./utils/filter-api.js";
 import "react-hook-form";
 import "../../hooks/useSnackMessage.js";
 import "../dialogs/custom-mui-dialog.js";
 import "./criteria-based/criteria-based-filter-form.js";
-import { F } from "../../chunks/criteria-based-filter-edition-dialog.BEXoNmzz.js";
-import "./constants/field-constants.js";
+import { F } from "../../chunks/criteria-based-filter-edition-dialog.p2pUWzxc.js";
+import "../../utils/field-constants.js";
 import "../../utils/yup-config.js";
 import "@hookform/resolvers/yup";
-import "./filter-context.js";
 import "./constants/filter-constants.js";
 import "yup";
 export {

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

@@ -6,6 +6,10 @@ interface FilterFormProps {
     creation?: boolean;
     activeDirectory?: UUID;
     elementExists?: elementExistsType;
+    sourceFilterForExplicitNamingConversion?: {
+        id: UUID;
+        equipmentType: string;
+    };
 }
 export declare const FilterForm: FunctionComponent<FilterFormProps>;
 export {};

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

@@ -1,13 +1,14 @@
 import "react/jsx-runtime";
-import "../react-hook-form/unique-name-input.js";
-import "./constants/field-constants.js";
+import "../inputs/react-hook-form/unique-name-input.js";
+import "../../utils/field-constants.js";
 import "./criteria-based/criteria-based-filter-form.js";
-import { o } from "../../chunks/criteria-based-filter-edition-dialog.BEXoNmzz.js";
+import { o } from "../../chunks/criteria-based-filter-edition-dialog.p2pUWzxc.js";
+import "react";
 import "react-hook-form";
 import "@mui/material";
-import "../react-hook-form/radio-input.js";
+import "../inputs/react-hook-form/radio-input.js";
 import "../../utils/ElementType.js";
-import "../react-hook-form/ExpandingTextField.js";
+import "../inputs/react-hook-form/ExpandingTextField.js";
 import "./constants/filter-constants.js";
 export {
   o as FilterForm

package/dist/components/filter/utils/filter-api.d.ts

@@ -0,0 +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 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/filter/utils/{filters-utils.js → filter-api.js}

@@ -1,9 +1,10 @@
-import { FieldConstants } from "../constants/field-constants.js";
+import { FieldConstants } from "../../../utils/field-constants.js";
 import { frontToBackTweak } from "../criteria-based/criteria-based-filter-utils.js";
-import { Generator, Load } from "../constants/equipment-types.js";
+import { Generator, Load } from "../../../utils/equipment-types.js";
 import { exportExpertRules } from "../expert/expert-filter-utils.js";
 import { DISTRIBUTION_KEY, FilterType } from "../constants/filter-constants.js";
-const saveExplicitNamingFilter = (tableValues, isFilterCreation, equipmentType, name, description, id, setCreateFilterErr, handleClose, createFilter, saveFilter, activeDirectory) => {
+import { createFilter, saveFilter } from "../../../services/explore.js";
+const saveExplicitNamingFilter = (tableValues, isFilterCreation, equipmentType, name, description, id, setCreateFilterErr, handleClose, activeDirectory, token) => {
   let cleanedTableValues;
   const isGeneratorOrLoad = equipmentType === Generator.type || equipmentType === Load.type;
   if (isGeneratorOrLoad) {
@@ -25,7 +26,8 @@ const saveExplicitNamingFilter = (tableValues, isFilterCreation, equipmentType,
       },
       name,
       description,
-      activeDirectory
+      activeDirectory,
+      token
     ).then(() => {
       handleClose();
     }).catch((error) => {
@@ -39,7 +41,8 @@ const saveExplicitNamingFilter = (tableValues, isFilterCreation, equipmentType,
         equipmentType,
         filterEquipmentsAttributes: cleanedTableValues
       },
-      name
+      name,
+      token
     ).then(() => {
       handleClose();
     }).catch((error) => {
@@ -47,20 +50,21 @@ const saveExplicitNamingFilter = (tableValues, isFilterCreation, equipmentType,
     });
   }
 };
-const saveCriteriaBasedFilter = (filter, activeDirectory, onClose, onError, createFilter) => {
+const saveCriteriaBasedFilter = (filter, activeDirectory, onClose, onError, token) => {
   const filterForBack = frontToBackTweak(void 0, filter);
   createFilter(
     filterForBack,
     filter[FieldConstants.NAME],
     filter[FieldConstants.DESCRIPTION],
-    activeDirectory
+    activeDirectory,
+    token
   ).then(() => {
     onClose();
   }).catch((error) => {
     onError(error.message);
   });
 };
-const saveExpertFilter = (id, query, equipmentType, name, description, isFilterCreation, activeDirectory, onClose, onError, createFilter, saveFilter) => {
+const saveExpertFilter = (id, query, equipmentType, name, description, isFilterCreation, activeDirectory, onClose, onError, token) => {
   if (isFilterCreation) {
     createFilter(
       {
@@ -70,7 +74,8 @@ const saveExpertFilter = (id, query, equipmentType, name, description, isFilterC
       },
       name,
       description,
-      activeDirectory
+      activeDirectory,
+      token
     ).then(() => {
       onClose();
     }).catch((error) => {
@@ -84,7 +89,8 @@ const saveExpertFilter = (id, query, equipmentType, name, description, isFilterC
         equipmentType,
         rules: exportExpertRules(query)
       },
-      name
+      name,
+      token
     ).then(() => {
       onClose();
     }).catch((error) => {

package/dist/components/filter/utils/filter-form-utils.d.ts

@@ -0,0 +1,17 @@
+import { FunctionComponent } from 'react';
+
+type FormField = {
+    renderer: FunctionComponent<any>;
+    props: {
+        label: string;
+        name: string;
+    };
+};
+export type FormEquipment = {
+    id: string;
+    label: string;
+    fields: FormField[];
+};
+export declare const CONTINGENCY_LIST_EQUIPMENTS: Record<string, FormEquipment>;
+export declare const FILTER_EQUIPMENTS: Record<string, FormEquipment>;
+export {};

package/dist/components/filter/utils/{criteria-based-utils.js → filter-form-utils.js}

@@ -1,45 +1,7 @@
-import { FieldConstants } from "../constants/field-constants.js";
-import "../../../utils/yup-config.js";
-import RangeInput, { getRangeInputSchema, getRangeInputDataForm, DEFAULT_RANGE_VALUE } from "../../react-hook-form/range-input.js";
-import { CountriesInput } from "../../react-hook-form/select-inputs/countries-input.js";
-import SelectInput from "../../react-hook-form/select-inputs/select-input.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
-  }
-});
+import { FieldConstants } from "../../../utils/field-constants.js";
+import RangeInput from "../../inputs/react-hook-form/range-input.js";
+import CountriesInput from "../../inputs/react-hook-form/select-inputs/countries-input.js";
+import SelectInput from "../../inputs/react-hook-form/select-inputs/select-input.js";
 const countries = {
   renderer: CountriesInput,
   props: {
@@ -104,7 +66,7 @@ const energySource = {
     ]
   }
 };
-const CONTINGENCY_LIST_EQUIPMENTS = {
+const COMMON_EQUIPMENTS = {
   LINE: {
     id: "LINE",
     label: "Lines",
@@ -127,22 +89,25 @@ const CONTINGENCY_LIST_EQUIPMENTS = {
   },
   HVDC_LINE: {
     id: "HVDC_LINE",
-    label: "HvdcLines",
+    label: "Hvdc",
     fields: [countries1, countries2, nominalVoltage]
   },
-  BUSBAR_SECTION: {
-    id: "BUSBAR_SECTION",
-    label: "BusBarSections",
-    fields: [countries, nominalVoltage]
-  },
   DANGLING_LINE: {
     id: "DANGLING_LINE",
     label: "DanglingLines",
     fields: [countries, nominalVoltage]
   }
 };
+const CONTINGENCY_LIST_EQUIPMENTS = {
+  ...COMMON_EQUIPMENTS,
+  BUSBAR_SECTION: {
+    id: "BUSBAR_SECTION",
+    label: "BusBarSections",
+    fields: [countries, nominalVoltage]
+  }
+};
 const FILTER_EQUIPMENTS = {
-  ...CONTINGENCY_LIST_EQUIPMENTS,
+  ...COMMON_EQUIPMENTS,
   THREE_WINDINGS_TRANSFORMER: {
     id: "THREE_WINDINGS_TRANSFORMER",
     label: "ThreeWindingsTransformers",
@@ -163,16 +128,6 @@ const FILTER_EQUIPMENTS = {
     label: "Batteries",
     fields: [countries, nominalVoltage]
   },
-  LCC_CONVERTER_STATION: {
-    id: "LCC_CONVERTER_STATION",
-    label: "LccConverterStations",
-    fields: [countries, nominalVoltage]
-  },
-  VSC_CONVERTER_STATION: {
-    id: "VSC_CONVERTER_STATION",
-    label: "VscConverterStations",
-    fields: [countries, nominalVoltage]
-  },
   VOLTAGE_LEVEL: {
     id: "VOLTAGE_LEVEL",
     label: "VoltageLevels",
@@ -191,7 +146,5 @@ const FILTER_EQUIPMENTS = {
 };
 export {
   CONTINGENCY_LIST_EQUIPMENTS,
-  FILTER_EQUIPMENTS,
-  getCriteriaBasedFormData,
-  getCriteriaBasedSchema
+  FILTER_EQUIPMENTS
 };

package/dist/components/{react-hook-form/ag-grid-table-rhf → inputs/react-hook-form/ag-grid-table}/bottom-right-buttons.js

@@ -4,7 +4,7 @@ import "@mui/material/IconButton";
 import "@mui/icons-material";
 import "@mui/icons-material/ControlPoint";
 import "@mui/icons-material/Delete";
-import { B } from "../../../chunks/criteria-based-filter-edition-dialog.BEXoNmzz.js";
+import { B } from "../../../../chunks/criteria-based-filter-edition-dialog.p2pUWzxc.js";
 import "react";
 import "react-intl";
 import "@mui/material/styles";