@gridsuite/commons-ui 0.75.0 → 0.76.0

package/dist/components/{filter → contingencyList}/criteriaBased/CriteriaBasedForm.d.ts

@@ -1,4 +1,4 @@
-import { FormEquipment } from '../utils/filterFormUtils';
+import { FormEquipment } from '../../filter/utils/filterFormUtils';
 import { ReactElement } from 'react';
 
 export interface CriteriaBasedFormProps {

package/dist/components/{filter/criteriaBased/criteriaBasedFilterUtils.d.ts → contingencyList/criteriaBased/criteriaBasedUtils.d.ts}

@@ -59,42 +59,3 @@ export declare function getCriteriaBasedFormData(criteriaValues?: Record<string,
         readonly nominalVoltage3: any;
     };
 };
-/**
- * Transform
- * from obj.equipmentFilterForm.{
- *  freeProperties.{nameB:valuesB},
- *  freeProperties1.{nameA:valuesA},
- *  freeProperties2.{nameA:valuesC}}
- * to a obj.criteriaBased.freeProperties.[
- *  {name_property:nameA, prop_values1:valuesA, prop_values2:valuesC},
- *  {name_property:namesB, prop_values:valuesB}]
- * @author Laurent LAUGARN modified by Florent MILLOT
- */
-export declare function backToFrontTweak(response: any): {
-    readonly criteriaBased: {
-        readonly countries: any;
-        readonly countries1: any;
-        readonly countries2: any;
-        readonly nominalVoltage: any;
-        readonly nominalVoltage1: any;
-        readonly nominalVoltage2: any;
-        readonly nominalVoltage3: any;
-    };
-    readonly equipmentType: any;
-};
-/**
- * Transform
- * from obj.criteriaBased.freeProperties.[
- *  {name_property:nameA, prop_values1:valuesA, prop_values2:valuesC},
- *  {name_property:namesB, prop_values:valuesB}]
- * to obj.equipmentFilterForm.{
- *  freeProperties.{nameB:valuesB},
- *  freeProperties1.{nameA:valuesA},
- *  freeProperties2.{nameA:valuesC}}
- * @author Laurent LAUGARN modified by Florent MILLOT
- */
-export declare function frontToBackTweak(id?: string, filter?: any): {
-    id: string | undefined;
-    type: string;
-    equipmentFilterForm: any;
-};

package/dist/components/contingencyList/criteriaBased/criteriaBasedUtils.js

@@ -0,0 +1,36 @@
+import { FieldConstants } from "../../../utils/constants/fieldConstants.js";
+import "../../../utils/yupConfig.js";
+import { getRangeInputSchema, DEFAULT_RANGE_VALUE } from "../../inputs/reactHookForm/numbers/RangeInput.js";
+import * as yup from "yup";
+function getCriteriaBasedSchema(extraFields = {}) {
+  return {
+    [FieldConstants.CRITERIA_BASED]: yup.object().shape({
+      [FieldConstants.COUNTRIES]: yup.array().of(yup.string().required()),
+      [FieldConstants.COUNTRIES_1]: yup.array().of(yup.string().required()),
+      [FieldConstants.COUNTRIES_2]: yup.array().of(yup.string().required()),
+      ...getRangeInputSchema(FieldConstants.NOMINAL_VOLTAGE),
+      ...getRangeInputSchema(FieldConstants.NOMINAL_VOLTAGE_1),
+      ...getRangeInputSchema(FieldConstants.NOMINAL_VOLTAGE_2),
+      ...getRangeInputSchema(FieldConstants.NOMINAL_VOLTAGE_3),
+      ...extraFields
+    })
+  };
+}
+function getCriteriaBasedFormData(criteriaValues, extraFields = {}) {
+  return {
+    [FieldConstants.CRITERIA_BASED]: {
+      [FieldConstants.COUNTRIES]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.COUNTRIES]) ?? [],
+      [FieldConstants.COUNTRIES_1]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.COUNTRIES_1]) ?? [],
+      [FieldConstants.COUNTRIES_2]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.COUNTRIES_2]) ?? [],
+      [FieldConstants.NOMINAL_VOLTAGE]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.NOMINAL_VOLTAGE]) ?? DEFAULT_RANGE_VALUE,
+      [FieldConstants.NOMINAL_VOLTAGE_1]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.NOMINAL_VOLTAGE_1]) ?? DEFAULT_RANGE_VALUE,
+      [FieldConstants.NOMINAL_VOLTAGE_2]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.NOMINAL_VOLTAGE_2]) ?? DEFAULT_RANGE_VALUE,
+      [FieldConstants.NOMINAL_VOLTAGE_3]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.NOMINAL_VOLTAGE_3]) ?? DEFAULT_RANGE_VALUE,
+      ...extraFields
+    }
+  };
+}
+export {
+  getCriteriaBasedFormData,
+  getCriteriaBasedSchema
+};

package/dist/components/{filter → contingencyList}/criteriaBased/index.d.ts

@@ -4,10 +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 * from './CriteriaBasedFilterEditionDialog';
-export * from './CriteriaBasedFilterForm';
 export * from './CriteriaBasedForm';
-export * from './FilterFreeProperties';
-export * from './FilterProperties';
-export * from './FilterProperty';
-export * from './criteriaBasedFilterUtils';
+export * from './criteriaBasedUtils';

package/dist/components/contingencyList/criteriaBased/index.js

@@ -0,0 +1,7 @@
+import { CriteriaBasedForm } from "./CriteriaBasedForm.js";
+import { getCriteriaBasedFormData, getCriteriaBasedSchema } from "./criteriaBasedUtils.js";
+export {
+  CriteriaBasedForm,
+  getCriteriaBasedFormData,
+  getCriteriaBasedSchema
+};

package/dist/components/filter/FilterCreationDialog.js

@@ -2,10 +2,9 @@ import { jsx } from "react/jsx-runtime";
 import { useCallback } from "react";
 import { useForm } from "react-hook-form";
 import { yupResolver } from "@hookform/resolvers/yup";
-import { saveExplicitNamingFilter, saveCriteriaBasedFilter, saveExpertFilter } from "./utils/filterApi.js";
+import { saveExplicitNamingFilter, saveExpertFilter } from "./utils/filterApi.js";
 import { useSnackMessage } from "../../hooks/useSnackMessage.js";
 import { CustomMuiDialog } from "../dialogs/customMuiDialog/CustomMuiDialog.js";
-import { criteriaBasedFilterEmptyFormData, criteriaBasedFilterSchema } from "./criteriaBased/CriteriaBasedFilterForm.js";
 import { getExplicitNamingFilterEmptyFormData, explicitNamingFilterSchema, FILTER_EQUIPMENTS_ATTRIBUTES } from "./explicitNaming/ExplicitNamingFilterForm.js";
 import { FieldConstants } from "../../utils/constants/fieldConstants.js";
 import "../../utils/yupConfig.js";
@@ -18,7 +17,6 @@ const emptyFormData = {
   [FieldConstants.DESCRIPTION]: "",
   [FieldConstants.FILTER_TYPE]: FilterType.EXPERT.id,
   [FieldConstants.EQUIPMENT_TYPE]: null,
-  ...criteriaBasedFilterEmptyFormData,
   ...getExplicitNamingFilterEmptyFormData(),
   ...getExpertFilterEmptyFormData()
 };
@@ -27,7 +25,6 @@ const formSchema = yup.object().shape({
   [FieldConstants.DESCRIPTION]: yup.string().max(500, "descriptionLimitError"),
   [FieldConstants.FILTER_TYPE]: yup.string().required(),
   [FieldConstants.EQUIPMENT_TYPE]: yup.string().required(),
-  ...criteriaBasedFilterSchema,
   ...explicitNamingFilterSchema,
   ...expertFilterSchema
 }).required();
@@ -68,12 +65,6 @@ function FilterCreationDialog({
           onClose,
           activeDirectory
         );
-      } else if (filterForm[FieldConstants.FILTER_TYPE] === FilterType.CRITERIA_BASED.id) {
-        saveCriteriaBasedFilter(filterForm, activeDirectory, onClose, (error) => {
-          snackError({
-            messageTxt: error
-          });
-        });
       } else if (filterForm[FieldConstants.FILTER_TYPE] === FilterType.EXPERT.id) {
         saveExpertFilter(
           null,

package/dist/components/filter/FilterForm.js

@@ -4,7 +4,6 @@ import { useFormContext, useWatch } from "react-hook-form";
 import { useEffect } from "react";
 import { HeaderFilterForm } from "./HeaderFilterForm.js";
 import { FieldConstants } from "../../utils/constants/fieldConstants.js";
-import { CriteriaBasedFilterForm } from "./criteriaBased/CriteriaBasedFilterForm.js";
 import { ExplicitNamingFilterForm } from "./explicitNaming/ExplicitNamingFilterForm.js";
 import { ExpertFilterForm } from "./expert/ExpertFilterForm.js";
 import { FilterType } from "./constants/FilterConstants.js";
@@ -47,7 +46,6 @@ function FilterForm({
         handleFilterTypeChange
       }
     ) }),
-    filterType === FilterType.CRITERIA_BASED.id && /* @__PURE__ */ jsx(CriteriaBasedFilterForm, {}),
     filterType === FilterType.EXPLICIT_NAMING.id && /* @__PURE__ */ jsx(
       ExplicitNamingFilterForm,
       {

package/dist/components/filter/constants/FilterConstants.d.ts

@@ -2,10 +2,6 @@ import { ItemSelectionForCopy } from '../filter.type';
 
 export declare const DISTRIBUTION_KEY = "distributionKey";
 export declare const FilterType: {
-    CRITERIA_BASED: {
-        id: string;
-        label: string;
-    };
     EXPLICIT_NAMING: {
         id: string;
         label: string;

package/dist/components/filter/constants/FilterConstants.js

@@ -1,6 +1,5 @@
 const DISTRIBUTION_KEY = "distributionKey";
 const FilterType = {
-  CRITERIA_BASED: { id: "CRITERIA", label: "filter.criteriaBased" },
   EXPLICIT_NAMING: { id: "IDENTIFIER_LIST", label: "filter.explicitNaming" },
   EXPERT: { id: "EXPERT", label: "filter.expert" }
 };

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

@@ -8,7 +8,7 @@ export * from './filter.type';
 export * from './FilterCreationDialog';
 export * from './FilterForm';
 export * from './constants/FilterConstants';
-export * from './criteriaBased';
+export * from '../contingencyList/criteriaBased';
 export * from './expert';
 export * from './explicitNaming';
 export * from './utils';

package/dist/components/filter/index.js

@@ -1,13 +1,8 @@
 import { FilterCreationDialog } from "./FilterCreationDialog.js";
 import { FilterForm } from "./FilterForm.js";
 import { DISTRIBUTION_KEY, FilterType, NO_ITEM_SELECTION_FOR_COPY } from "./constants/FilterConstants.js";
-import { CriteriaBasedFilterEditionDialog } from "./criteriaBased/CriteriaBasedFilterEditionDialog.js";
-import { CriteriaBasedFilterForm, criteriaBasedFilterEmptyFormData, criteriaBasedFilterSchema } from "./criteriaBased/CriteriaBasedFilterForm.js";
-import { CriteriaBasedForm } from "./criteriaBased/CriteriaBasedForm.js";
-import { FilterFreeProperties, FreePropertiesTypes } from "./criteriaBased/FilterFreeProperties.js";
-import { FilterProperties, filterPropertiesYupSchema } from "./criteriaBased/FilterProperties.js";
-import { FilterProperty, PROPERTY_NAME, PROPERTY_VALUES, PROPERTY_VALUES_1, PROPERTY_VALUES_2 } from "./criteriaBased/FilterProperty.js";
-import { backToFrontTweak, frontToBackTweak, getCriteriaBasedFormData, getCriteriaBasedSchema } from "./criteriaBased/criteriaBasedFilterUtils.js";
+import { CriteriaBasedForm } from "../contingencyList/criteriaBased/CriteriaBasedForm.js";
+import { getCriteriaBasedFormData, getCriteriaBasedSchema } from "../contingencyList/criteriaBased/criteriaBasedUtils.js";
 import { ExpertFilterEditionDialog } from "./expert/ExpertFilterEditionDialog.js";
 import { EXPERT_FILTER_QUERY, ExpertFilterForm, expertFilterSchema, getExpertFilterEmptyFormData, rqbQuerySchemaValidator } from "./expert/ExpertFilterForm.js";
 import { CombinatorType, DataType, FieldType, OperatorType } from "./expert/expertFilter.type.js";
@@ -15,15 +10,13 @@ import { COMBINATOR_OPTIONS, CONVERTERS_MODE_OPTIONS, ENERGY_SOURCE_OPTIONS, EXP
 import { countRules, exportExpertRules, getNumberOfSiblings, getOperators, importExpertRules, queryValidator, recursiveRemove, testQuery } from "./expert/expertFilterUtils.js";
 import { ExplicitNamingFilterEditionDialog } from "./explicitNaming/ExplicitNamingFilterEditionDialog.js";
 import { ExplicitNamingFilterForm, FILTER_EQUIPMENTS_ATTRIBUTES, explicitNamingFilterSchema, getExplicitNamingFilterEmptyFormData } from "./explicitNaming/ExplicitNamingFilterForm.js";
-import { saveCriteriaBasedFilter, saveExpertFilter, saveExplicitNamingFilter } from "./utils/filterApi.js";
+import { saveExpertFilter, saveExplicitNamingFilter } from "./utils/filterApi.js";
 import { CONTINGENCY_LIST_EQUIPMENTS, FILTER_EQUIPMENTS } from "./utils/filterFormUtils.js";
 export {
   COMBINATOR_OPTIONS,
   CONTINGENCY_LIST_EQUIPMENTS,
   CONVERTERS_MODE_OPTIONS,
   CombinatorType,
-  CriteriaBasedFilterEditionDialog,
-  CriteriaBasedFilterForm,
   CriteriaBasedForm,
   DISTRIBUTION_KEY,
   DataType,
@@ -41,34 +34,21 @@ export {
   FieldType,
   FilterCreationDialog,
   FilterForm,
-  FilterFreeProperties,
-  FilterProperties,
-  FilterProperty,
   FilterType,
-  FreePropertiesTypes,
   LOAD_TYPE_OPTIONS,
   NO_ITEM_SELECTION_FOR_COPY,
   OPERATOR_OPTIONS,
   OperatorType,
   PHASE_REGULATION_MODE_OPTIONS,
-  PROPERTY_NAME,
-  PROPERTY_VALUES,
-  PROPERTY_VALUES_1,
-  PROPERTY_VALUES_2,
   RATIO_REGULATION_MODE_OPTIONS,
   REGULATION_TYPE_OPTIONS,
   RULES,
   SHUNT_COMPENSATOR_TYPE_OPTIONS,
   SVAR_REGULATION_MODE_OPTIONS,
-  backToFrontTweak,
   countRules,
-  criteriaBasedFilterEmptyFormData,
-  criteriaBasedFilterSchema,
   expertFilterSchema,
   explicitNamingFilterSchema,
   exportExpertRules,
-  filterPropertiesYupSchema,
-  frontToBackTweak,
   getCriteriaBasedFormData,
   getCriteriaBasedSchema,
   getExpertFilterEmptyFormData,
@@ -79,7 +59,6 @@ export {
   queryValidator,
   recursiveRemove,
   rqbQuerySchemaValidator,
-  saveCriteriaBasedFilter,
   saveExpertFilter,
   saveExplicitNamingFilter,
   testQuery

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

@@ -1,5 +1,4 @@
 import { UUID } from 'crypto';
 
 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/filter/utils/filterApi.js

@@ -1,5 +1,4 @@
 import { FieldConstants } from "../../../utils/constants/fieldConstants.js";
-import { frontToBackTweak } from "../criteriaBased/criteriaBasedFilterUtils.js";
 import { Generator, Load } from "../../../utils/types/equipmentTypes.js";
 import { exportExpertRules } from "../expert/expertFilterUtils.js";
 import { DISTRIBUTION_KEY, FilterType } from "../constants/FilterConstants.js";
@@ -50,14 +49,6 @@ const saveExplicitNamingFilter = (tableValues, isFilterCreation, equipmentType,
     });
   }
 };
-const saveCriteriaBasedFilter = (filter, activeDirectory, onClose, onError, token) => {
-  const filterForBack = frontToBackTweak(void 0, filter);
-  createFilter(filterForBack, filter[FieldConstants.NAME], filter[FieldConstants.DESCRIPTION], activeDirectory, token).then(() => {
-    onClose();
-  }).catch((error) => {
-    onError(error.message);
-  });
-};
 const saveExpertFilter = (id, query, equipmentType, name, description, isFilterCreation, activeDirectory, onClose, onError, token) => {
   if (isFilterCreation) {
     createFilter(
@@ -93,7 +84,6 @@ const saveExpertFilter = (id, query, equipmentType, name, description, isFilterC
   }
 };
 export {
-  saveCriteriaBasedFilter,
   saveExpertFilter,
   saveExplicitNamingFilter
 };

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

@@ -1,9 +1,8 @@
-import { saveCriteriaBasedFilter, saveExpertFilter, saveExplicitNamingFilter } from "./filterApi.js";
+import { saveExpertFilter, saveExplicitNamingFilter } from "./filterApi.js";
 import { CONTINGENCY_LIST_EQUIPMENTS, FILTER_EQUIPMENTS } from "./filterFormUtils.js";
 export {
   CONTINGENCY_LIST_EQUIPMENTS,
   FILTER_EQUIPMENTS,
-  saveCriteriaBasedFilter,
   saveExpertFilter,
   saveExplicitNamingFilter
 };

package/dist/components/index.js

@@ -26,13 +26,8 @@ import { TagRenderer } from "./elementSearch/tagRenderer/TagRenderer.js";
 import { FilterCreationDialog } from "./filter/FilterCreationDialog.js";
 import { FilterForm } from "./filter/FilterForm.js";
 import { DISTRIBUTION_KEY, FilterType, NO_ITEM_SELECTION_FOR_COPY } from "./filter/constants/FilterConstants.js";
-import { CriteriaBasedFilterEditionDialog } from "./filter/criteriaBased/CriteriaBasedFilterEditionDialog.js";
-import { CriteriaBasedFilterForm, criteriaBasedFilterEmptyFormData, criteriaBasedFilterSchema } from "./filter/criteriaBased/CriteriaBasedFilterForm.js";
-import { CriteriaBasedForm } from "./filter/criteriaBased/CriteriaBasedForm.js";
-import { FilterFreeProperties, FreePropertiesTypes } from "./filter/criteriaBased/FilterFreeProperties.js";
-import { FilterProperties, filterPropertiesYupSchema } from "./filter/criteriaBased/FilterProperties.js";
-import { FilterProperty, PROPERTY_NAME, PROPERTY_VALUES, PROPERTY_VALUES_1, PROPERTY_VALUES_2 } from "./filter/criteriaBased/FilterProperty.js";
-import { backToFrontTweak, frontToBackTweak, getCriteriaBasedFormData, getCriteriaBasedSchema } from "./filter/criteriaBased/criteriaBasedFilterUtils.js";
+import { CriteriaBasedForm } from "./contingencyList/criteriaBased/CriteriaBasedForm.js";
+import { getCriteriaBasedFormData, getCriteriaBasedSchema } from "./contingencyList/criteriaBased/criteriaBasedUtils.js";
 import { ExpertFilterEditionDialog } from "./filter/expert/ExpertFilterEditionDialog.js";
 import { EXPERT_FILTER_QUERY, ExpertFilterForm, expertFilterSchema, getExpertFilterEmptyFormData, rqbQuerySchemaValidator } from "./filter/expert/ExpertFilterForm.js";
 import { CombinatorType, DataType, FieldType, OperatorType } from "./filter/expert/expertFilter.type.js";
@@ -40,7 +35,7 @@ import { COMBINATOR_OPTIONS, CONVERTERS_MODE_OPTIONS, ENERGY_SOURCE_OPTIONS, EXP
 import { countRules, exportExpertRules, getNumberOfSiblings, getOperators, importExpertRules, queryValidator, recursiveRemove, testQuery } from "./filter/expert/expertFilterUtils.js";
 import { ExplicitNamingFilterEditionDialog } from "./filter/explicitNaming/ExplicitNamingFilterEditionDialog.js";
 import { ExplicitNamingFilterForm, FILTER_EQUIPMENTS_ATTRIBUTES, explicitNamingFilterSchema, getExplicitNamingFilterEmptyFormData } from "./filter/explicitNaming/ExplicitNamingFilterForm.js";
-import { saveCriteriaBasedFilter, saveExpertFilter, saveExplicitNamingFilter } from "./filter/utils/filterApi.js";
+import { saveExpertFilter, saveExplicitNamingFilter } from "./filter/utils/filterApi.js";
 import { CONTINGENCY_LIST_EQUIPMENTS, FILTER_EQUIPMENTS } from "./filter/utils/filterFormUtils.js";
 import { FlatParameters, extractDefault } from "./flatParameters/FlatParameters.js";
 import { SelectClearable } from "./inputs/SelectClearable.js";
@@ -130,8 +125,6 @@ export {
   CombinatorType,
   CountriesInput,
   CountryValueEditor,
-  CriteriaBasedFilterEditionDialog,
-  CriteriaBasedFilterForm,
   CriteriaBasedForm,
   CsvUploader,
   CustomAGGrid,
@@ -174,13 +167,9 @@ export {
   FieldType,
   FilterCreationDialog,
   FilterForm,
-  FilterFreeProperties,
-  FilterProperties,
-  FilterProperty,
   FilterType,
   FlatParameters,
   FloatInput,
-  FreePropertiesTypes,
   GridLogo,
   GroupValueEditor,
   InputWithPopupConfirmation,
@@ -205,10 +194,6 @@ export {
   OperatorType,
   OverflowableText,
   PHASE_REGULATION_MODE_OPTIONS,
-  PROPERTY_NAME,
-  PROPERTY_VALUES,
-  PROPERTY_VALUES_1,
-  PROPERTY_VALUES_2,
   PopupConfirmationDialog,
   PropertyValueEditor,
   RATIO_REGULATION_MODE_OPTIONS,
@@ -243,19 +228,14 @@ export {
   UserManagerMock,
   ValueEditor,
   ValueSelector,
-  backToFrontTweak,
   collectibleHelper,
   countRules,
-  criteriaBasedFilterEmptyFormData,
-  criteriaBasedFilterSchema,
   dispatchUser,
   expertFilterSchema,
   explicitNamingFilterSchema,
   exportExpertRules,
   extractDefault,
-  filterPropertiesYupSchema,
   forTesting,
-  frontToBackTweak,
   genHelperError,
   genHelperPreviousValue,
   generateMuiVirtualizedTableClass,
@@ -285,7 +265,6 @@ export {
   queryValidator,
   recursiveRemove,
   rqbQuerySchemaValidator,
-  saveCriteriaBasedFilter,
   saveExpertFilter,
   saveExplicitNamingFilter,
   styles,

package/dist/index.js

@@ -27,13 +27,8 @@ import { TagRenderer } from "./components/elementSearch/tagRenderer/TagRenderer.
 import { FilterCreationDialog } from "./components/filter/FilterCreationDialog.js";
 import { FilterForm } from "./components/filter/FilterForm.js";
 import { DISTRIBUTION_KEY, FilterType, NO_ITEM_SELECTION_FOR_COPY } from "./components/filter/constants/FilterConstants.js";
-import { CriteriaBasedFilterEditionDialog } from "./components/filter/criteriaBased/CriteriaBasedFilterEditionDialog.js";
-import { CriteriaBasedFilterForm, criteriaBasedFilterEmptyFormData, criteriaBasedFilterSchema } from "./components/filter/criteriaBased/CriteriaBasedFilterForm.js";
-import { CriteriaBasedForm } from "./components/filter/criteriaBased/CriteriaBasedForm.js";
-import { FilterFreeProperties, FreePropertiesTypes } from "./components/filter/criteriaBased/FilterFreeProperties.js";
-import { FilterProperties, filterPropertiesYupSchema } from "./components/filter/criteriaBased/FilterProperties.js";
-import { FilterProperty, PROPERTY_NAME, PROPERTY_VALUES, PROPERTY_VALUES_1, PROPERTY_VALUES_2 } from "./components/filter/criteriaBased/FilterProperty.js";
-import { backToFrontTweak, frontToBackTweak, getCriteriaBasedFormData, getCriteriaBasedSchema } from "./components/filter/criteriaBased/criteriaBasedFilterUtils.js";
+import { CriteriaBasedForm } from "./components/contingencyList/criteriaBased/CriteriaBasedForm.js";
+import { getCriteriaBasedFormData, getCriteriaBasedSchema } from "./components/contingencyList/criteriaBased/criteriaBasedUtils.js";
 import { ExpertFilterEditionDialog } from "./components/filter/expert/ExpertFilterEditionDialog.js";
 import { EXPERT_FILTER_QUERY, ExpertFilterForm, expertFilterSchema, getExpertFilterEmptyFormData, rqbQuerySchemaValidator } from "./components/filter/expert/ExpertFilterForm.js";
 import { CombinatorType, DataType, FieldType, OperatorType } from "./components/filter/expert/expertFilter.type.js";
@@ -41,7 +36,7 @@ import { COMBINATOR_OPTIONS, CONVERTERS_MODE_OPTIONS, ENERGY_SOURCE_OPTIONS, EXP
 import { countRules, exportExpertRules, getNumberOfSiblings, getOperators, importExpertRules, queryValidator, recursiveRemove, testQuery } from "./components/filter/expert/expertFilterUtils.js";
 import { ExplicitNamingFilterEditionDialog } from "./components/filter/explicitNaming/ExplicitNamingFilterEditionDialog.js";
 import { ExplicitNamingFilterForm, FILTER_EQUIPMENTS_ATTRIBUTES, explicitNamingFilterSchema, getExplicitNamingFilterEmptyFormData } from "./components/filter/explicitNaming/ExplicitNamingFilterForm.js";
-import { saveCriteriaBasedFilter, saveExpertFilter, saveExplicitNamingFilter } from "./components/filter/utils/filterApi.js";
+import { saveExpertFilter, saveExplicitNamingFilter } from "./components/filter/utils/filterApi.js";
 import { CONTINGENCY_LIST_EQUIPMENTS, FILTER_EQUIPMENTS } from "./components/filter/utils/filterFormUtils.js";
 import { FlatParameters, extractDefault } from "./components/flatParameters/FlatParameters.js";
 import { SelectClearable } from "./components/inputs/SelectClearable.js";
@@ -207,8 +202,6 @@ export {
   CombinatorType,
   CountriesInput,
   CountryValueEditor,
-  CriteriaBasedFilterEditionDialog,
-  CriteriaBasedFilterForm,
   CriteriaBasedForm,
   CsvUploader,
   CustomAGGrid,
@@ -258,13 +251,9 @@ export {
   FieldType,
   FilterCreationDialog,
   FilterForm,
-  FilterFreeProperties,
-  FilterProperties,
-  FilterProperty,
   FilterType,
   FlatParameters,
   FloatInput,
-  FreePropertiesTypes,
   GRIDSUITE_DEFAULT_PRECISION,
   Generator,
   GridLogo,
@@ -303,10 +292,6 @@ export {
   OperatorType,
   OverflowableText,
   PHASE_REGULATION_MODE_OPTIONS,
-  PROPERTY_NAME,
-  PROPERTY_VALUES,
-  PROPERTY_VALUES_1,
-  PROPERTY_VALUES_2,
   PopupConfirmationDialog,
   PropertyValueEditor,
   RATIO_REGULATION_MODE_OPTIONS,
@@ -357,7 +342,6 @@ export {
   ValueSelector,
   VoltageLevel,
   areArrayElementsUnique,
-  backToFrontTweak,
   backendFetch,
   backendFetchJson,
   cardErrorBoundaryEn,
@@ -368,8 +352,6 @@ export {
   commonButtonFr,
   countRules,
   createFilter,
-  criteriaBasedFilterEmptyFormData,
-  criteriaBasedFilterSchema,
   csvEn,
   csvFr,
   descriptionEn,
@@ -406,11 +388,9 @@ export {
   filterExpertEn,
   filterExpertFr,
   filterFr,
-  filterPropertiesYupSchema,
   flatParametersEn,
   flatParametersFr,
   forTesting,
-  frontToBackTweak,
   genHelperError,
   genHelperPreviousValue,
   generateMuiVirtualizedTableClass,
@@ -469,7 +449,6 @@ export {
   roundToDefaultPrecision,
   roundToPrecision,
   rqbQuerySchemaValidator,
-  saveCriteriaBasedFilter,
   saveExpertFilter,
   saveExplicitNamingFilter,
   saveFilter,

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

@@ -25,7 +25,6 @@ export declare const filterEn: {
     betweenRule: string;
     emptyGroup: string;
     Hvdc: string;
-    'filter.criteriaBased': string;
     'filter.expert': string;
     'filter.explicitNaming': string;
     nameEmpty: string;

package/dist/translations/en/filterEn.js

@@ -19,8 +19,7 @@ const filterEn = {
   betweenRule: "Left value of 'between' rule have to be lower than the right value",
   emptyGroup: "Filter contains an empty group. Consider removing it or adding rules to this group",
   Hvdc: "HVDC",
-  "filter.criteriaBased": "Criteria based",
-  "filter.expert": "Expert",
+  "filter.expert": "Criteria based",
   "filter.explicitNaming": "Explicit naming",
   nameEmpty: "The name is empty",
   equipmentType: "Equipment type",

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

@@ -25,7 +25,6 @@ export declare const filterFr: {
     betweenRule: string;
     emptyGroup: string;
     Hvdc: string;
-    'filter.criteriaBased': string;
     'filter.expert': string;
     'filter.explicitNaming': string;
     nameEmpty: string;

package/dist/translations/fr/filterFr.js

@@ -19,8 +19,7 @@ const filterFr = {
   betweenRule: "La valeur de gauche d'une règle 'entre' doit être inférieure à la valeur de droite",
   emptyGroup: "Le filtre contient un groupe vide. Supprimez le ou ajoutez des règles à ce groupe",
   Hvdc: "HVDC",
-  "filter.criteriaBased": "Par critères",
-  "filter.expert": "Expert",
+  "filter.expert": "Par critères",
   "filter.explicitNaming": "Par nommage",
   nameEmpty: "Le nom est vide",
   equipmentType: "Type d'ouvrage",

package/package.json

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

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

@@ -1,19 +0,0 @@
-import { ItemSelectionForCopy } from '../filter.type';
-import { ElementExistsType } from '../../../utils/types/elementType';
-import { UUID } from 'crypto';
-
-export interface CriteriaBasedFilterEditionDialogProps {
-    id: string;
-    name: string;
-    titleId: string;
-    open: boolean;
-    onClose: () => void;
-    broadcastChannel: BroadcastChannel;
-    getFilterById: (id: string) => Promise<any>;
-    itemSelectionForCopy: ItemSelectionForCopy;
-    setItemSelectionForCopy: (selection: ItemSelectionForCopy) => void;
-    activeDirectory?: UUID;
-    elementExists?: ElementExistsType;
-    language?: string;
-}
-export declare function CriteriaBasedFilterEditionDialog({ id, name, titleId, open, onClose, broadcastChannel, getFilterById, itemSelectionForCopy, setItemSelectionForCopy, activeDirectory, elementExists, language, }: Readonly<CriteriaBasedFilterEditionDialogProps>): import("react/jsx-runtime").JSX.Element;

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

@@ -1,103 +0,0 @@
-import { jsx } from "react/jsx-runtime";
-import { yupResolver } from "@hookform/resolvers/yup";
-import { useState, useEffect, useCallback } from "react";
-import { useForm } from "react-hook-form";
-import { useSnackMessage } from "../../../hooks/useSnackMessage.js";
-import { saveFilter } from "../../../services/explore.js";
-import { FetchStatus } from "../../../utils/constants/fetchStatus.js";
-import { FieldConstants } from "../../../utils/constants/fieldConstants.js";
-import "../../../utils/yupConfig.js";
-import { CustomMuiDialog } from "../../dialogs/customMuiDialog/CustomMuiDialog.js";
-import { FilterForm } from "../FilterForm.js";
-import { FilterType, NO_ITEM_SELECTION_FOR_COPY } from "../constants/FilterConstants.js";
-import { criteriaBasedFilterSchema } from "./CriteriaBasedFilterForm.js";
-import { backToFrontTweak, frontToBackTweak } from "./criteriaBasedFilterUtils.js";
-import * as yup from "yup";
-const formSchema = yup.object().shape({
-  [FieldConstants.NAME]: yup.string().trim().required("nameEmpty"),
-  [FieldConstants.FILTER_TYPE]: yup.string().required(),
-  [FieldConstants.EQUIPMENT_TYPE]: yup.string().required(),
-  ...criteriaBasedFilterSchema
-}).required();
-function CriteriaBasedFilterEditionDialog({
-  id,
-  name,
-  titleId,
-  open,
-  onClose,
-  broadcastChannel,
-  getFilterById,
-  itemSelectionForCopy,
-  setItemSelectionForCopy,
-  activeDirectory,
-  elementExists,
-  language
-}) {
-  var _a;
-  const { snackError } = useSnackMessage();
-  const [dataFetchStatus, setDataFetchStatus] = useState(FetchStatus.IDLE);
-  const formMethods = useForm({
-    resolver: yupResolver(formSchema)
-  });
-  const {
-    reset,
-    formState: { errors }
-  } = formMethods;
-  const nameError = errors[FieldConstants.NAME];
-  const isValidating = (_a = errors.root) == null ? void 0 : _a.isValidating;
-  useEffect(() => {
-    if (id && open) {
-      setDataFetchStatus(FetchStatus.FETCHING);
-      getFilterById(id).then((response) => {
-        setDataFetchStatus(FetchStatus.FETCH_SUCCESS);
-        reset({
-          [FieldConstants.NAME]: name,
-          [FieldConstants.FILTER_TYPE]: FilterType.CRITERIA_BASED.id,
-          ...backToFrontTweak(response)
-        });
-      }).catch((error) => {
-        setDataFetchStatus(FetchStatus.FETCH_ERROR);
-        snackError({
-          messageTxt: error.message,
-          headerId: "cannotRetrieveFilter"
-        });
-      });
-    }
-  }, [id, name, open, reset, snackError, getFilterById]);
-  const onSubmit = useCallback(
-    (filterForm) => {
-      saveFilter(frontToBackTweak(id, filterForm), filterForm[FieldConstants.NAME]).then(() => {
-        if (itemSelectionForCopy.sourceItemUuid === id) {
-          setItemSelectionForCopy(NO_ITEM_SELECTION_FOR_COPY);
-          broadcastChannel.postMessage({ NO_SELECTION_FOR_COPY: NO_ITEM_SELECTION_FOR_COPY });
-        }
-      }).catch((error) => {
-        snackError({
-          messageTxt: error.message
-        });
-      });
-    },
-    [broadcastChannel, id, itemSelectionForCopy.sourceItemUuid, snackError, setItemSelectionForCopy]
-  );
-  const isDataReady = dataFetchStatus === FetchStatus.FETCH_SUCCESS;
-  return /* @__PURE__ */ jsx(
-    CustomMuiDialog,
-    {
-      open,
-      onClose,
-      onSave: onSubmit,
-      formSchema,
-      formMethods,
-      titleId,
-      removeOptional: true,
-      disabledSave: !!nameError || !!isValidating,
-      isDataFetching: dataFetchStatus === FetchStatus.FETCHING,
-      language,
-      unscrollableFullHeight: true,
-      children: isDataReady && /* @__PURE__ */ jsx(FilterForm, { activeDirectory, elementExists })
-    }
-  );
-}
-export {
-  CriteriaBasedFilterEditionDialog
-};

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

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

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

@@ -1,33 +0,0 @@
-import { jsx } from "react/jsx-runtime";
-import { filterPropertiesYupSchema, FilterProperties } from "./FilterProperties.js";
-import { FieldConstants } from "../../../utils/constants/fieldConstants.js";
-import "../../../utils/yupConfig.js";
-import { CriteriaBasedForm } from "./CriteriaBasedForm.js";
-import { getCriteriaBasedSchema, getCriteriaBasedFormData } from "./criteriaBasedFilterUtils.js";
-import { FILTER_EQUIPMENTS } from "../utils/filterFormUtils.js";
-import { FreePropertiesTypes } from "./FilterFreeProperties.js";
-import * as yup from "yup";
-const criteriaBasedFilterSchema = getCriteriaBasedSchema({
-  [FieldConstants.ENERGY_SOURCE]: yup.string().nullable(),
-  ...filterPropertiesYupSchema
-});
-const criteriaBasedFilterEmptyFormData = getCriteriaBasedFormData(void 0, {
-  [FieldConstants.ENERGY_SOURCE]: null,
-  [FreePropertiesTypes.SUBSTATION_FILTER_PROPERTIES]: [],
-  [FreePropertiesTypes.FREE_FILTER_PROPERTIES]: []
-});
-function CriteriaBasedFilterForm() {
-  return /* @__PURE__ */ jsx(
-    CriteriaBasedForm,
-    {
-      equipments: FILTER_EQUIPMENTS,
-      defaultValues: criteriaBasedFilterEmptyFormData[FieldConstants.CRITERIA_BASED],
-      children: /* @__PURE__ */ jsx(FilterProperties, {})
-    }
-  );
-}
-export {
-  CriteriaBasedFilterForm,
-  criteriaBasedFilterEmptyFormData,
-  criteriaBasedFilterSchema
-};

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

@@ -1,12 +0,0 @@
-import { PredefinedProperties } from '../../../utils/types/types';
-
-export declare enum FreePropertiesTypes {
-    SUBSTATION_FILTER_PROPERTIES = "substationFreeProperties",
-    FREE_FILTER_PROPERTIES = "freeProperties"
-}
-interface FilterFreePropertiesProps {
-    freePropertiesType: FreePropertiesTypes;
-    predefined: PredefinedProperties;
-}
-export declare function FilterFreeProperties({ freePropertiesType, predefined }: FilterFreePropertiesProps): import("react/jsx-runtime").JSX.Element;
-export {};

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

@@ -1,68 +0,0 @@
-import { jsxs, Fragment, jsx } from "react/jsx-runtime";
-import { Grid, ListItem, Button } from "@mui/material";
-import { useWatch, useFieldArray } from "react-hook-form";
-import { FormattedMessage } from "react-intl";
-import AddIcon from "@mui/icons-material/Add";
-import { useMemo } from "react";
-import { ErrorInput } from "../../inputs/reactHookForm/errorManagement/ErrorInput.js";
-import { FieldErrorAlert } from "../../inputs/reactHookForm/errorManagement/FieldErrorAlert.js";
-import { FieldConstants } from "../../../utils/constants/fieldConstants.js";
-import { FilterProperty, PROPERTY_NAME, PROPERTY_VALUES_1, PROPERTY_VALUES_2, PROPERTY_VALUES } from "./FilterProperty.js";
-import { Line, Hvdc } from "../../../utils/types/equipmentTypes.js";
-var FreePropertiesTypes = /* @__PURE__ */ ((FreePropertiesTypes2) => {
-  FreePropertiesTypes2["SUBSTATION_FILTER_PROPERTIES"] = "substationFreeProperties";
-  FreePropertiesTypes2["FREE_FILTER_PROPERTIES"] = "freeProperties";
-  return FreePropertiesTypes2;
-})(FreePropertiesTypes || {});
-function FilterFreeProperties({ freePropertiesType, predefined }) {
-  const watchEquipmentType = useWatch({
-    name: FieldConstants.EQUIPMENT_TYPE
-  });
-  const isForLineOrHvdcLineSubstation = (watchEquipmentType === Line.type || watchEquipmentType === Hvdc.type) && freePropertiesType === "substationFreeProperties";
-  const fieldName = `${FieldConstants.CRITERIA_BASED}.${freePropertiesType}`;
-  const {
-    fields: filterProperties,
-    // don't use it to access form data ! check doc,
-    append,
-    remove
-  } = useFieldArray({
-    name: fieldName
-  });
-  function addNewProp() {
-    if (isForLineOrHvdcLineSubstation) {
-      append({
-        [PROPERTY_NAME]: null,
-        [PROPERTY_VALUES_1]: [],
-        [PROPERTY_VALUES_2]: []
-      });
-    } else {
-      append({ [PROPERTY_NAME]: null, [PROPERTY_VALUES]: [] });
-    }
-  }
-  const valuesFields = isForLineOrHvdcLineSubstation ? [
-    { name: PROPERTY_VALUES_1, label: "PropertyValues1" },
-    { name: PROPERTY_VALUES_2, label: "PropertyValues2" }
-  ] : [{ name: PROPERTY_VALUES, label: "PropertyValues" }];
-  const title = useMemo(() => {
-    return freePropertiesType === "freeProperties" ? "FreeProps" : "SubstationFreeProps";
-  }, [freePropertiesType]);
-  return /* @__PURE__ */ jsxs(Fragment, { children: [
-    /* @__PURE__ */ jsx(Grid, { item: true, xs: 12, children: /* @__PURE__ */ jsx(FormattedMessage, { id: title, children: (formattedTitle) => /* @__PURE__ */ jsx("h4", { children: formattedTitle }) }) }),
-    filterProperties.map((prop, index) => /* @__PURE__ */ jsx(ListItem, { children: /* @__PURE__ */ jsx(
-      FilterProperty,
-      {
-        index,
-        valuesFields,
-        predefined,
-        handleDelete: remove,
-        propertyType: freePropertiesType
-      }
-    ) }, prop.id)),
-    /* @__PURE__ */ jsx(Grid, { item: true, children: /* @__PURE__ */ jsx(Button, { startIcon: /* @__PURE__ */ jsx(AddIcon, {}), onClick: () => addNewProp(), children: /* @__PURE__ */ jsx(FormattedMessage, { id: "AddFreePropCrit" }) }) }),
-    /* @__PURE__ */ jsx(Grid, { item: true, children: /* @__PURE__ */ jsx(ErrorInput, { name: fieldName, InputField: FieldErrorAlert }) })
-  ] });
-}
-export {
-  FilterFreeProperties,
-  FreePropertiesTypes
-};

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

@@ -1,15 +0,0 @@
-import { default as yup } from '../../../utils/yupConfig';
-
-export declare const filterPropertiesYupSchema: {
-    substationFreeProperties: yup.ArraySchema<{
-        prop_values?: (string | undefined)[] | undefined;
-        prop_values1?: (string | undefined)[] | undefined;
-        prop_values2?: (string | undefined)[] | undefined;
-        name_property: string;
-    }[] | undefined, yup.AnyObject, "", "">;
-    freeProperties: yup.ArraySchema<{
-        prop_values?: (string | undefined)[] | undefined;
-        name_property: string;
-    }[] | undefined, yup.AnyObject, "", "">;
-};
-export declare function FilterProperties(): any;

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

@@ -1,121 +0,0 @@
-import { jsx, jsxs } from "react/jsx-runtime";
-import Grid from "@mui/material/Grid";
-import { useMemo, useEffect } from "react";
-import { useWatch } from "react-hook-form";
-import { FormattedMessage } from "react-intl";
-import { Line, Hvdc, Substation, Load, Generator, TwoWindingTransfo, Battery, ShuntCompensator, VoltageLevel } from "../../../utils/types/equipmentTypes.js";
-import { areArrayElementsUnique } from "../../../utils/functions.js";
-import { FieldConstants } from "../../../utils/constants/fieldConstants.js";
-import "../../../utils/yupConfig.js";
-import { FreePropertiesTypes, FilterFreeProperties } from "./FilterFreeProperties.js";
-import { PROPERTY_NAME, PROPERTY_VALUES, PROPERTY_VALUES_1, PROPERTY_VALUES_2 } from "./FilterProperty.js";
-import { usePredefinedProperties } from "../../../hooks/usePredefinedProperties.js";
-import { FilterType } from "../constants/FilterConstants.js";
-import "@mui/icons-material";
-import { EquipmentType } from "../../../utils/types/equipmentType.js";
-import * as yup from "yup";
-function propertyValuesTest(values, context, doublePropertyValues) {
-  const rootLevelForm = context.from[context.from.length - 1];
-  const filterType = rootLevelForm.value[FieldConstants.FILTER_TYPE];
-  if (filterType !== FilterType.CRITERIA_BASED.id) {
-    return true;
-  }
-  const equipmentType = rootLevelForm.value[FieldConstants.EQUIPMENT_TYPE];
-  const isForLineOrHvdcLine = equipmentType === Line.type || equipmentType === Hvdc.type;
-  if (doublePropertyValues) {
-    return isForLineOrHvdcLine ? (values == null ? void 0 : values.length) > 0 : true;
-  }
-  return isForLineOrHvdcLine || (values == null ? void 0 : values.length) > 0;
-}
-const filterPropertiesYupSchema = {
-  [FreePropertiesTypes.SUBSTATION_FILTER_PROPERTIES]: yup.array().of(
-    yup.object().shape({
-      [PROPERTY_NAME]: yup.string().required(),
-      [PROPERTY_VALUES]: yup.array().of(yup.string()).test(
-        "can not be empty if not line",
-        "YupRequired",
-        (values, context) => propertyValuesTest(values, context, false)
-      ),
-      [PROPERTY_VALUES_1]: yup.array().of(yup.string()).test(
-        "can not be empty if line",
-        "YupRequired",
-        (values, context) => propertyValuesTest(values, context, true)
-      ),
-      [PROPERTY_VALUES_2]: yup.array().of(yup.string()).test(
-        "can not be empty if line",
-        "YupRequired",
-        (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);
-  }),
-  [FreePropertiesTypes.FREE_FILTER_PROPERTIES]: yup.array().of(
-    yup.object().shape({
-      [PROPERTY_NAME]: yup.string().required(),
-      [PROPERTY_VALUES]: yup.array().of(yup.string()).test(
-        "can not be empty if not line",
-        "YupRequired",
-        (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);
-  })
-};
-function FilterProperties() {
-  const watchEquipmentType = useWatch({
-    name: FieldConstants.EQUIPMENT_TYPE
-  });
-  const [equipmentPredefinedProps, setEquipmentType] = usePredefinedProperties(watchEquipmentType);
-  const [substationPredefinedProps, setSubstationType] = usePredefinedProperties(null);
-  const displayEquipmentProperties = useMemo(() => {
-    return watchEquipmentType === Substation.type || watchEquipmentType === Load.type || watchEquipmentType === Generator.type || watchEquipmentType === Line.type || watchEquipmentType === TwoWindingTransfo.type || watchEquipmentType === Battery.type || watchEquipmentType === ShuntCompensator.type || watchEquipmentType === VoltageLevel.type;
-  }, [watchEquipmentType]);
-  const displaySubstationProperties = useMemo(() => {
-    return watchEquipmentType !== Substation.type && watchEquipmentType !== null;
-  }, [watchEquipmentType]);
-  useEffect(() => {
-    if (displayEquipmentProperties) {
-      setEquipmentType(watchEquipmentType);
-    }
-  }, [displayEquipmentProperties, watchEquipmentType, setEquipmentType]);
-  useEffect(() => {
-    if (displaySubstationProperties) {
-      setSubstationType(EquipmentType.SUBSTATION);
-    }
-  }, [displaySubstationProperties, setSubstationType]);
-  return watchEquipmentType && /* @__PURE__ */ jsx(Grid, { item: true, container: true, spacing: 1, children: /* @__PURE__ */ jsxs(Grid, { item: true, xs: 12, children: [
-    /* @__PURE__ */ jsx(FormattedMessage, { id: "FreePropsCrit", children: (txt) => /* @__PURE__ */ jsx("h3", { children: txt }) }),
-    displayEquipmentProperties && /* @__PURE__ */ jsx(
-      FilterFreeProperties,
-      {
-        freePropertiesType: FreePropertiesTypes.FREE_FILTER_PROPERTIES,
-        predefined: equipmentPredefinedProps
-      }
-    ),
-    displaySubstationProperties && /* @__PURE__ */ jsx(
-      FilterFreeProperties,
-      {
-        freePropertiesType: FreePropertiesTypes.SUBSTATION_FILTER_PROPERTIES,
-        predefined: substationPredefinedProps
-      }
-    )
-  ] }) });
-}
-export {
-  FilterProperties,
-  filterPropertiesYupSchema
-};

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

@@ -1,18 +0,0 @@
-import { PredefinedProperties } from '../../../utils/types/types';
-
-export declare const PROPERTY_NAME = "name_property";
-export declare const PROPERTY_VALUES = "prop_values";
-export declare const PROPERTY_VALUES_1 = "prop_values1";
-export declare const PROPERTY_VALUES_2 = "prop_values2";
-interface FilterPropertyProps {
-    index: number;
-    valuesFields: Array<{
-        name: string;
-        label: string;
-    }>;
-    handleDelete: (index: number) => void;
-    predefined: PredefinedProperties;
-    propertyType: string;
-}
-export declare function FilterProperty(props: FilterPropertyProps): import("react/jsx-runtime").JSX.Element;
-export {};

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

@@ -1,65 +0,0 @@
-import { jsxs, jsx } from "react/jsx-runtime";
-import { useMemo, useCallback } from "react";
-import DeleteIcon from "@mui/icons-material/Delete";
-import IconButton from "@mui/material/IconButton";
-import Grid from "@mui/material/Grid";
-import { useFormContext, useWatch } from "react-hook-form";
-import { AutocompleteInput } from "../../inputs/reactHookForm/autocompleteInputs/AutocompleteInput.js";
-import { MultipleAutocompleteInput } from "../../inputs/reactHookForm/autocompleteInputs/MultipleAutocompleteInput.js";
-import { FieldConstants } from "../../../utils/constants/fieldConstants.js";
-const PROPERTY_NAME = "name_property";
-const PROPERTY_VALUES = "prop_values";
-const PROPERTY_VALUES_1 = "prop_values1";
-const PROPERTY_VALUES_2 = "prop_values2";
-function FilterProperty(props) {
-  const { propertyType, index, predefined, valuesFields, handleDelete } = props;
-  const { setValue } = useFormContext();
-  const watchName = useWatch({
-    name: `${FieldConstants.CRITERIA_BASED}.${propertyType}[${index}].${PROPERTY_NAME}`
-  });
-  const predefinedNames = useMemo(() => {
-    return Object.keys(predefined ?? []).sort();
-  }, [predefined]);
-  const predefinedValues = useMemo(() => {
-    const predefinedForName = predefined == null ? void 0 : predefined[watchName];
-    if (!predefinedForName) {
-      return [];
-    }
-    return [...new Set(predefinedForName)].sort();
-  }, [watchName, predefined]);
-  const onNameChange = useCallback(() => {
-    valuesFields.forEach(
-      (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: [
-    /* @__PURE__ */ jsx(Grid, { item: true, xs: 6, children: /* @__PURE__ */ jsx(
-      AutocompleteInput,
-      {
-        name: `${FieldConstants.CRITERIA_BASED}.${propertyType}[${index}].${PROPERTY_NAME}`,
-        label: "PropertyName",
-        options: predefinedNames,
-        freeSolo: true,
-        autoSelect: true,
-        forcePopupIcon: true,
-        onChangeCallback: onNameChange
-      }
-    ) }),
-    valuesFields.map((valuesField) => /* @__PURE__ */ jsx(Grid, { item: true, xs: true, children: /* @__PURE__ */ jsx(
-      MultipleAutocompleteInput,
-      {
-        name: `${FieldConstants.CRITERIA_BASED}.${propertyType}[${index}].${valuesField.name}`,
-        label: valuesField.label,
-        options: predefinedValues
-      }
-    ) }, valuesField.name)),
-    /* @__PURE__ */ jsx(Grid, { item: true, xs: 1, alignSelf: "center", children: /* @__PURE__ */ jsx(IconButton, { onClick: () => handleDelete(index), children: /* @__PURE__ */ jsx(DeleteIcon, {}) }) })
-  ] });
-}
-export {
-  FilterProperty,
-  PROPERTY_NAME,
-  PROPERTY_VALUES,
-  PROPERTY_VALUES_1,
-  PROPERTY_VALUES_2
-};

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

@@ -1,158 +0,0 @@
-import { FieldConstants } from "../../../utils/constants/fieldConstants.js";
-import { PROPERTY_VALUES, PROPERTY_VALUES_1, PROPERTY_VALUES_2, PROPERTY_NAME } from "./FilterProperty.js";
-import { FilterType } from "../constants/FilterConstants.js";
-import "../../../utils/yupConfig.js";
-import { getRangeInputSchema, DEFAULT_RANGE_VALUE } from "../../inputs/reactHookForm/numbers/RangeInput.js";
-import { FreePropertiesTypes } from "./FilterFreeProperties.js";
-import * as yup from "yup";
-function getCriteriaBasedSchema(extraFields = {}) {
-  return {
-    [FieldConstants.CRITERIA_BASED]: yup.object().shape({
-      [FieldConstants.COUNTRIES]: yup.array().of(yup.string().required()),
-      [FieldConstants.COUNTRIES_1]: yup.array().of(yup.string().required()),
-      [FieldConstants.COUNTRIES_2]: yup.array().of(yup.string().required()),
-      ...getRangeInputSchema(FieldConstants.NOMINAL_VOLTAGE),
-      ...getRangeInputSchema(FieldConstants.NOMINAL_VOLTAGE_1),
-      ...getRangeInputSchema(FieldConstants.NOMINAL_VOLTAGE_2),
-      ...getRangeInputSchema(FieldConstants.NOMINAL_VOLTAGE_3),
-      ...extraFields
-    })
-  };
-}
-function getCriteriaBasedFormData(criteriaValues, extraFields = {}) {
-  return {
-    [FieldConstants.CRITERIA_BASED]: {
-      [FieldConstants.COUNTRIES]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.COUNTRIES]) ?? [],
-      [FieldConstants.COUNTRIES_1]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.COUNTRIES_1]) ?? [],
-      [FieldConstants.COUNTRIES_2]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.COUNTRIES_2]) ?? [],
-      [FieldConstants.NOMINAL_VOLTAGE]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.NOMINAL_VOLTAGE]) ?? DEFAULT_RANGE_VALUE,
-      [FieldConstants.NOMINAL_VOLTAGE_1]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.NOMINAL_VOLTAGE_1]) ?? DEFAULT_RANGE_VALUE,
-      [FieldConstants.NOMINAL_VOLTAGE_2]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.NOMINAL_VOLTAGE_2]) ?? DEFAULT_RANGE_VALUE,
-      [FieldConstants.NOMINAL_VOLTAGE_3]: (criteriaValues == null ? void 0 : criteriaValues[FieldConstants.NOMINAL_VOLTAGE_3]) ?? DEFAULT_RANGE_VALUE,
-      ...extraFields
-    }
-  };
-}
-function backToFrontTweak(response) {
-  const subProps = response.equipmentFilterForm.substationFreeProperties;
-  const freeProps = response.equipmentFilterForm.freeProperties;
-  const props1 = response.equipmentFilterForm.freeProperties1;
-  const props2 = response.equipmentFilterForm.freeProperties2;
-  const allKeys = /* @__PURE__ */ new Set();
-  if (subProps) {
-    Object.keys(subProps).forEach((k) => allKeys.add(k));
-  }
-  if (props1) {
-    Object.keys(props1).forEach((k) => allKeys.add(k));
-  }
-  if (props2) {
-    Object.keys(props2).forEach((k) => allKeys.add(k));
-  }
-  const filterSubstationProperties = [];
-  const filterFreeProperties = [];
-  allKeys.forEach((k) => {
-    const prop = { [PROPERTY_NAME]: k };
-    const values = subProps == null ? void 0 : subProps[k];
-    if (values) {
-      prop[PROPERTY_VALUES] = values;
-    }
-    const values1 = props1 == null ? void 0 : props1[k];
-    if (values1) {
-      prop[PROPERTY_VALUES_1] = values1;
-    }
-    const values2 = props2 == null ? void 0 : props2[k];
-    if (values2) {
-      prop[PROPERTY_VALUES_2] = values2;
-    }
-    filterSubstationProperties.push(prop);
-  });
-  allKeys.clear();
-  if (freeProps) {
-    Object.keys(freeProps).forEach((k) => allKeys.add(k));
-  }
-  allKeys.forEach((k) => {
-    const prop = { [PROPERTY_NAME]: k };
-    const values = freeProps == null ? void 0 : freeProps[k];
-    if (values) {
-      prop[PROPERTY_VALUES] = values;
-    }
-    filterFreeProperties.push(prop);
-  });
-  return {
-    [FieldConstants.EQUIPMENT_TYPE]: response[FieldConstants.EQUIPMENT_TYPE],
-    ...getCriteriaBasedFormData(response.equipmentFilterForm, {
-      [FieldConstants.ENERGY_SOURCE]: response.equipmentFilterForm[FieldConstants.ENERGY_SOURCE],
-      [FreePropertiesTypes.SUBSTATION_FILTER_PROPERTIES]: filterSubstationProperties,
-      [FreePropertiesTypes.FREE_FILTER_PROPERTIES]: filterFreeProperties
-    })
-  };
-}
-function isNominalVoltageEmpty(nominalVoltage) {
-  return nominalVoltage[FieldConstants.VALUE_1] === null && nominalVoltage[FieldConstants.VALUE_2] === null;
-}
-function cleanNominalVoltages(formValues) {
-  const cleanedFormValues = { ...formValues };
-  if (isNominalVoltageEmpty(cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE])) {
-    cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE] = null;
-  }
-  if (isNominalVoltageEmpty(cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE_1])) {
-    cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE_1] = null;
-  }
-  if (isNominalVoltageEmpty(cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE_2])) {
-    cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE_2] = null;
-  }
-  if (isNominalVoltageEmpty(cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE_3])) {
-    cleanedFormValues[FieldConstants.NOMINAL_VOLTAGE_3] = null;
-  }
-  return cleanedFormValues;
-}
-function frontToBackTweak(id, filter) {
-  const filterSubstationProperties = filter[FieldConstants.CRITERIA_BASED][FreePropertiesTypes.SUBSTATION_FILTER_PROPERTIES];
-  const eff = {
-    [FieldConstants.EQUIPMENT_TYPE]: filter[FieldConstants.EQUIPMENT_TYPE],
-    ...cleanNominalVoltages(filter[FieldConstants.CRITERIA_BASED])
-  };
-  delete eff[FreePropertiesTypes.SUBSTATION_FILTER_PROPERTIES];
-  const props = {};
-  const props1 = {};
-  const props2 = {};
-  filterSubstationProperties.forEach((prop) => {
-    const values = prop[PROPERTY_VALUES];
-    const values1 = prop[PROPERTY_VALUES_1];
-    const values2 = prop[PROPERTY_VALUES_2];
-    if (values) {
-      props[prop[PROPERTY_NAME]] = values;
-    }
-    if (values1) {
-      props1[prop[PROPERTY_NAME]] = values1;
-    }
-    if (values2) {
-      props2[prop[PROPERTY_NAME]] = values2;
-    }
-  });
-  eff.substationFreeProperties = props;
-  eff.freeProperties1 = props1;
-  eff.freeProperties2 = props2;
-  const filterFreeProperties = filter[FieldConstants.CRITERIA_BASED][FreePropertiesTypes.FREE_FILTER_PROPERTIES];
-  delete eff[FreePropertiesTypes.FREE_FILTER_PROPERTIES];
-  const freeProps = {};
-  filterFreeProperties.forEach((prop) => {
-    const values = prop[PROPERTY_VALUES];
-    if (values) {
-      freeProps[prop[PROPERTY_NAME]] = values;
-    }
-  });
-  eff.freeProperties = freeProps;
-  return {
-    id,
-    type: FilterType.CRITERIA_BASED.id,
-    // in the back end we store everything in a field called equipmentFilterForm
-    equipmentFilterForm: eff
-  };
-}
-export {
-  backToFrontTweak,
-  frontToBackTweak,
-  getCriteriaBasedFormData,
-  getCriteriaBasedSchema
-};

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

@@ -1,27 +0,0 @@
-import { CriteriaBasedFilterEditionDialog } from "./CriteriaBasedFilterEditionDialog.js";
-import { CriteriaBasedFilterForm, criteriaBasedFilterEmptyFormData, criteriaBasedFilterSchema } from "./CriteriaBasedFilterForm.js";
-import { CriteriaBasedForm } from "./CriteriaBasedForm.js";
-import { FilterFreeProperties, FreePropertiesTypes } from "./FilterFreeProperties.js";
-import { FilterProperties, filterPropertiesYupSchema } from "./FilterProperties.js";
-import { FilterProperty, PROPERTY_NAME, PROPERTY_VALUES, PROPERTY_VALUES_1, PROPERTY_VALUES_2 } from "./FilterProperty.js";
-import { backToFrontTweak, frontToBackTweak, getCriteriaBasedFormData, getCriteriaBasedSchema } from "./criteriaBasedFilterUtils.js";
-export {
-  CriteriaBasedFilterEditionDialog,
-  CriteriaBasedFilterForm,
-  CriteriaBasedForm,
-  FilterFreeProperties,
-  FilterProperties,
-  FilterProperty,
-  FreePropertiesTypes,
-  PROPERTY_NAME,
-  PROPERTY_VALUES,
-  PROPERTY_VALUES_1,
-  PROPERTY_VALUES_2,
-  backToFrontTweak,
-  criteriaBasedFilterEmptyFormData,
-  criteriaBasedFilterSchema,
-  filterPropertiesYupSchema,
-  frontToBackTweak,
-  getCriteriaBasedFormData,
-  getCriteriaBasedSchema
-};