@gridsuite/commons-ui 0.75.0 → 0.76.2

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/elementSearch/elementSearchInput/ElementSearchInput.js

@@ -1,5 +1,5 @@
 import { jsx } from "react/jsx-runtime";
-import { Autocomplete } from "@mui/material";
+import { createFilterOptions, Autocomplete } from "@mui/material";
 import { useMemo } from "react";
 import { useIntl } from "react-intl";
 function ElementSearchInput(props) {
@@ -23,6 +23,14 @@ function ElementSearchInput(props) {
     PaperComponent
   } = props;
   const intl = useIntl();
+  const filterOptions = useMemo(
+    () => createFilterOptions({
+      matchFrom: "any",
+      trim: true,
+      ignoreCase: true
+    }),
+    []
+  );
   const displayedValue = useMemo(() => {
     if (searchTermDisabled || searchTermDisableReason) {
       return searchTermDisableReason ?? intl.formatMessage({
@@ -78,7 +86,8 @@ function ElementSearchInput(props) {
         return option === value;
       },
       disabled: searchTermDisabled,
-      PaperComponent
+      PaperComponent,
+      filterOptions
     }
   );
 }

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.2",
     "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;