@gridsuite/commons-ui 0.63.0 → 0.63.1

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

@@ -234,6 +234,7 @@ export declare const FIELDS_OPTIONS: {
         name: FieldType;
         label: string;
         dataType: DataType;
+        defaultValue: boolean;
         valueEditorType: string;
     };
     PLANNED_ACTIVE_POWER_SET_POINT: {
@@ -246,6 +247,7 @@ export declare const FIELDS_OPTIONS: {
         name: FieldType;
         label: string;
         dataType: DataType;
+        defaultValue: boolean;
         valueEditorType: string;
     };
     RATED_S: {
@@ -370,12 +372,14 @@ export declare const FIELDS_OPTIONS: {
         name: FieldType;
         label: string;
         dataType: DataType;
+        defaultValue: boolean;
         valueEditorType: string;
     };
     CONNECTED_2: {
         name: FieldType;
         label: string;
         dataType: DataType;
+        defaultValue: boolean;
         valueEditorType: string;
     };
     VOLTAGE_LEVEL_ID_1: {
@@ -489,12 +493,14 @@ export declare const FIELDS_OPTIONS: {
         name: FieldType;
         label: string;
         dataType: DataType;
+        defaultValue: boolean;
         valueEditorType: string;
     };
     LOAD_TAP_CHANGING_CAPABILITIES: {
         name: FieldType;
         label: string;
         dataType: DataType;
+        defaultValue: boolean;
         valueEditorType: string;
     };
     RATIO_REGULATION_MODE: {
@@ -518,6 +524,7 @@ export declare const FIELDS_OPTIONS: {
         name: FieldType;
         label: string;
         dataType: DataType;
+        defaultValue: boolean;
         valueEditorType: string;
     };
     PHASE_REGULATION_MODE: {

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

@@ -218,6 +218,7 @@ const FIELDS_OPTIONS = {
     name: FieldType.VOLTAGE_REGULATOR_ON,
     label: "voltageRegulatorOn",
     dataType: DataType.BOOLEAN,
+    defaultValue: false,
     valueEditorType: "switch"
   },
   PLANNED_ACTIVE_POWER_SET_POINT: {
@@ -230,6 +231,7 @@ const FIELDS_OPTIONS = {
     name: FieldType.CONNECTED,
     label: "connected",
     dataType: DataType.BOOLEAN,
+    defaultValue: false,
     valueEditorType: "switch"
   },
   RATED_S: {
@@ -351,12 +353,14 @@ const FIELDS_OPTIONS = {
     name: FieldType.CONNECTED_1,
     label: "terminal1Connected",
     dataType: DataType.BOOLEAN,
+    defaultValue: false,
     valueEditorType: "switch"
   },
   CONNECTED_2: {
     name: FieldType.CONNECTED_2,
     label: "terminal2Connected",
     dataType: DataType.BOOLEAN,
+    defaultValue: false,
     valueEditorType: "switch"
   },
   VOLTAGE_LEVEL_ID_1: {
@@ -467,12 +471,14 @@ const FIELDS_OPTIONS = {
     name: FieldType.HAS_RATIO_TAP_CHANGER,
     label: "hasRatioTapChanger",
     dataType: DataType.BOOLEAN,
+    defaultValue: false,
     valueEditorType: "switch"
   },
   LOAD_TAP_CHANGING_CAPABILITIES: {
     name: FieldType.LOAD_TAP_CHANGING_CAPABILITIES,
     label: "loadTapChangingCapabilities",
     dataType: DataType.BOOLEAN,
+    defaultValue: false,
     valueEditorType: "switch"
   },
   RATIO_REGULATION_MODE: {
@@ -493,6 +499,7 @@ const FIELDS_OPTIONS = {
     name: FieldType.HAS_PHASE_TAP_CHANGER,
     label: "hasPhaseTapChanger",
     dataType: DataType.BOOLEAN,
+    defaultValue: false,
     valueEditorType: "switch"
   },
   PHASE_REGULATION_MODE: {

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

@@ -2,6 +2,7 @@ import { FieldType } from './expert-filter.type';
 
 import * as yup from 'yup';
 export declare const EXPERT_FILTER_QUERY = "rules";
+export declare const rqbQuerySchemaValidator: (schema: yup.Schema) => yup.Schema<any, any, any, "">;
 export declare const expertFilterSchema: {
     rules: yup.ObjectSchema<{}, yup.AnyObject, {}, "">;
 };

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

@@ -8,7 +8,7 @@ import * as yup from "yup";
 import { v4 } from "uuid";
 import { useIntl } from "react-intl";
 import { testQuery } from "./expert-filter-utils.js";
-import { RULES, COMBINATOR_OPTIONS, OPERATOR_OPTIONS, EXPERT_FILTER_EQUIPMENTS, fields } from "./expert-filter-constants.js";
+import { COMBINATOR_OPTIONS, OPERATOR_OPTIONS, EXPERT_FILTER_EQUIPMENTS, RULES, fields } from "./expert-filter-constants.js";
 import { FieldType } from "./expert-filter.type.js";
 import FieldConstants from "../../../utils/field-constants.js";
 import InputWithPopupConfirmation from "../../inputs/react-hook-form/select-inputs/input-with-popup-confirmation.js";
@@ -30,48 +30,21 @@ const EXPERT_FILTER_QUERY = "rules";
 function isSupportedEquipmentType(equipmentType) {
   return Object.values(EXPERT_FILTER_EQUIPMENTS).map((equipments) => equipments.id).includes(equipmentType);
 }
+const rqbQuerySchemaValidator = (schema) => schema.test(RULES.EMPTY_GROUP, RULES.EMPTY_GROUP, (query) => {
+  return testQuery(RULES.EMPTY_GROUP, query);
+}).test(RULES.EMPTY_RULE, RULES.EMPTY_RULE, (query) => {
+  return testQuery(RULES.EMPTY_RULE, query);
+}).test(RULES.INCORRECT_RULE, RULES.INCORRECT_RULE, (query) => {
+  return testQuery(RULES.INCORRECT_RULE, query);
+}).test(RULES.BETWEEN_RULE, RULES.BETWEEN_RULE, (query) => {
+  return testQuery(RULES.BETWEEN_RULE, query);
+});
 const expertFilterSchema = {
   [EXPERT_FILTER_QUERY]: yup.object().when([FieldConstants.FILTER_TYPE], {
     is: FilterType.EXPERT.id,
     then: (schema) => schema.when([FieldConstants.EQUIPMENT_TYPE], {
       is: (equipmentType) => isSupportedEquipmentType(equipmentType),
-      then: (innerSchema) => innerSchema.test(
-        RULES.EMPTY_GROUP,
-        RULES.EMPTY_GROUP,
-        (query) => {
-          return testQuery(
-            RULES.EMPTY_GROUP,
-            query
-          );
-        }
-      ).test(
-        RULES.EMPTY_RULE,
-        RULES.EMPTY_RULE,
-        (query) => {
-          return testQuery(
-            RULES.EMPTY_RULE,
-            query
-          );
-        }
-      ).test(
-        RULES.INCORRECT_RULE,
-        RULES.INCORRECT_RULE,
-        (query) => {
-          return testQuery(
-            RULES.INCORRECT_RULE,
-            query
-          );
-        }
-      ).test(
-        RULES.BETWEEN_RULE,
-        RULES.BETWEEN_RULE,
-        (query) => {
-          return testQuery(
-            RULES.BETWEEN_RULE,
-            query
-          );
-        }
-      )
+      then: rqbQuerySchemaValidator
     })
   })
 };
@@ -139,5 +112,6 @@ export {
   EXPERT_FILTER_QUERY,
   ExpertFilterForm as default,
   expertFilterSchema,
-  getExpertFilterEmptyFormData
+  getExpertFilterEmptyFormData,
+  rqbQuerySchemaValidator
 };

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

@@ -149,6 +149,7 @@ function exportExpertRules(query) {
       return transformCompositeRule(rule);
     }
     return {
+      id: rule.id,
       field: rule.field,
       operator: dataType !== DataType.PROPERTY ? (_a = Object.values(OPERATOR_OPTIONS).find(
         (operator) => operator.name === rule.operator
@@ -172,6 +173,7 @@ function exportExpertRules(query) {
       })
     );
     return {
+      id: compositeGroup.id,
       combinator: compositeGroup.combinator,
       dataType: DataType.COMBINATOR,
       rules: transformedRules,
@@ -190,6 +192,7 @@ function exportExpertRules(query) {
       return transformRule(ruleOrGroup);
     });
     return {
+      id: group.id,
       combinator: group.combinator,
       dataType: DataType.COMBINATOR,
       rules: transformedRules
@@ -219,6 +222,7 @@ function importExpertRules(query) {
   function transformRule(rule) {
     var _a;
     return {
+      id: rule.id,
       field: rule.field,
       operator: rule.dataType !== DataType.PROPERTY ? (_a = Object.values(OPERATOR_OPTIONS).find(
         (operator) => operator.customName === rule.operator
@@ -239,6 +243,7 @@ function importExpertRules(query) {
       {}
     );
     return {
+      id: group.id,
       field: group.field,
       operator: (_a = Object.values(OPERATOR_OPTIONS).find(
         (operator) => operator.customName === group.operator
@@ -260,6 +265,7 @@ function importExpertRules(query) {
       return transformRule(ruleOrGroup);
     });
     return {
+      id: group.id,
       combinator: group.combinator,
       rules: transformedRules
     };
@@ -267,6 +273,9 @@ function importExpertRules(query) {
   return transformGroup(query);
 }
 function countRules(query) {
+  if (!query) {
+    return 0;
+  }
   if ("rules" in query) {
     const group = query;
     return group.rules.reduce(
@@ -278,6 +287,9 @@ function countRules(query) {
 }
 const queryValidator = (query) => {
   const result = {};
+  if (!query) {
+    return result;
+  }
   const validateRule = (rule) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const isValueAnArray = Array.isArray(rule.value);
@@ -382,9 +394,10 @@ const testQuery = (check, query) => {
   });
 };
 function getNumberOfSiblings(path, query) {
+  var _a;
   const parentPath = getParentPath(path);
   const parentGroup = findPath(parentPath, query);
-  return parentGroup.rules.length;
+  return (_a = parentGroup == null ? void 0 : parentGroup.rules) == null ? void 0 : _a.length;
 }
 function recursiveRemove(query, path) {
   if (getNumberOfSiblings(path, query) === 1 && path.toString() !== [0].toString()) {

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

@@ -1,3 +1,4 @@
+import { UUID } from 'crypto';
 import { FullField } from 'react-querybuilder';
 
 export declare enum OperatorType {
@@ -117,6 +118,7 @@ export type OperatorOption = {
     label: string;
 };
 export interface RuleTypeExport {
+    id?: UUID;
     field: FieldType;
     operator: OperatorType;
     value: string | number | undefined;
@@ -126,6 +128,7 @@ export interface RuleTypeExport {
     propertyValues?: string[];
 }
 export interface RuleGroupTypeExport {
+    id?: UUID;
     combinator: CombinatorType;
     dataType: DataType;
     field?: FieldType;
@@ -139,6 +142,7 @@ export interface CompositeField extends FullField {
     };
 }
 export interface CompositeGroup {
+    id?: string;
     combinator: string;
     rules: {
         [field: string]: CompositeRule;

package/dist/hooks/usePrevious.d.ts

@@ -0,0 +1,2 @@
+export declare function usePrevious<T = undefined>(value: T): T | undefined;
+export default usePrevious;

package/dist/hooks/usePrevious.js

@@ -0,0 +1,12 @@
+import { useRef, useEffect } from "react";
+function usePrevious(value) {
+  const ref = useRef();
+  useEffect(() => {
+    ref.current = value;
+  }, [value]);
+  return ref.current;
+}
+export {
+  usePrevious as default,
+  usePrevious
+};

package/dist/index.d.ts

@@ -31,6 +31,13 @@ export { ROW_DRAGGING_SELECTION_COLUMN_DEF } from './components/inputs/react-hoo
 export type { Parameter } from './components/FlatParameters/FlatParameters';
 export { Line, Generator, Load, Battery, SVC, DanglingLine, LCC, VSC, Hvdc, BusBar, TwoWindingTransfo, ThreeWindingTransfo, ShuntCompensator, VoltageLevel, Substation, noSelectionForCopy, } from './utils/equipment-types';
 export { default as FieldConstants } from './utils/field-constants';
+export { fields as EXPERT_FILTER_FIELDS } from './components/filter/expert/expert-filter-constants';
+export { default as CustomReactQueryBuilder } from './components/inputs/react-query-builder/custom-react-query-builder';
+export { EXPERT_FILTER_QUERY, rqbQuerySchemaValidator, getExpertFilterEmptyFormData, } from './components/filter/expert/expert-filter-form';
+export { importExpertRules, exportExpertRules, } from './components/filter/expert/expert-filter-utils';
+export type { RuleTypeExport, RuleGroupTypeExport, } from './components/filter/expert/expert-filter.type';
+export { formatQuery } from 'react-querybuilder';
+export { default as yup } from './utils/yup-config';
 export type { TreeViewFinderNodeProps } from './components/TreeViewFinder/TreeViewFinder';
 export { GRIDSUITE_DEFAULT_PRECISION, roundToPrecision, roundToDefaultPrecision, isBlankOrEmpty, unitToMicroUnit, microUnitToUnit, } from './utils/conversion-utils';
 export { ElementType } from './utils/ElementType';
@@ -78,6 +85,7 @@ export { default as CardErrorBoundary } from './components/CardErrorBoundary';
 export { default as useIntlRef } from './hooks/useIntlRef';
 export { useSnackMessage } from './hooks/useSnackMessage';
 export { default as useDebounce } from './hooks/useDebounce';
+export { default as usePrevious } from './hooks/usePrevious';
 export { default as SelectClearable } from './components/inputs/select-clearable';
 export { default as useCustomFormContext } from './components/inputs/react-hook-form/provider/use-custom-form-context';
 export { default as CustomFormProvider } from './components/inputs/react-hook-form/provider/custom-form-provider';

package/dist/index.js

@@ -28,85 +28,92 @@ import { default as default19 } from "./components/inputs/react-hook-form/ag-gri
 import { default as default20, ROW_DRAGGING_SELECTION_COLUMN_DEF } from "./components/inputs/react-hook-form/ag-grid-table/custom-ag-grid-table.js";
 import { Battery, BusBar, DanglingLine, Generator, Hvdc, LCC, Line, Load, SVC, ShuntCompensator, Substation, ThreeWindingTransfo, TwoWindingTransfo, VSC, VoltageLevel, noSelectionForCopy } from "./utils/equipment-types.js";
 import { default as default21 } from "./utils/field-constants.js";
+import { fields } from "./components/filter/expert/expert-filter-constants.js";
+import { default as default22 } from "./components/inputs/react-query-builder/custom-react-query-builder.js";
+import { EXPERT_FILTER_QUERY, getExpertFilterEmptyFormData, rqbQuerySchemaValidator } from "./components/filter/expert/expert-filter-form.js";
+import { exportExpertRules, importExpertRules } from "./components/filter/expert/expert-filter-utils.js";
+import { formatQuery } from "react-querybuilder";
+import "./utils/yup-config.js";
 import { GRIDSUITE_DEFAULT_PRECISION, isBlankOrEmpty, microUnitToUnit, roundToDefaultPrecision, roundToPrecision, unitToMicroUnit } from "./utils/conversion-utils.js";
 import { ElementType } from "./utils/ElementType.js";
 import { EQUIPMENT_TYPE, EquipmentType, equipmentStyles, getEquipmentsInfosForSearchBar } from "./utils/EquipmentType.js";
 import { dispatchUser, getPreLoginPath, initializeAuthenticationDev, initializeAuthenticationProd, logout } from "./utils/AuthService.js";
-import { default as default22 } from "./utils/ElementIcon.js";
+import { default as default23 } from "./utils/ElementIcon.js";
 import { LOGOUT_ERROR, RESET_AUTHENTICATION_ROUTER_ERROR, SHOW_AUTH_INFO_LOGIN, SIGNIN_CALLBACK_ERROR, UNAUTHORIZED_USER_INFO, USER, USER_VALIDATION_ERROR, setLoggedUser, setSignInCallbackError } from "./redux/authActions.js";
-import { default as default23 } from "./components/translations/report-viewer-en.js";
-import { default as default24 } from "./components/translations/report-viewer-fr.js";
-import { default as default25 } from "./components/translations/login-en.js";
-import { default as default26 } from "./components/translations/login-fr.js";
-import { default as default27 } from "./components/translations/top-bar-en.js";
-import { default as default28 } from "./components/translations/top-bar-fr.js";
-import { default as default29 } from "./components/translations/table-en.js";
-import { default as default30 } from "./components/translations/table-fr.js";
-import { default as default31 } from "./components/translations/treeview-finder-en.js";
-import { default as default32 } from "./components/translations/treeview-finder-fr.js";
-import { default as default33 } from "./components/translations/element-search-en.js";
-import { default as default34 } from "./components/translations/element-search-fr.js";
-import { default as default35 } from "./components/translations/equipment-search-en.js";
-import { default as default36 } from "./components/translations/equipment-search-fr.js";
-import { default as default37 } from "./components/translations/filter-en.js";
-import { default as default38 } from "./components/translations/filter-fr.js";
-import { default as default39 } from "./components/translations/filter-expert-en.js";
-import { default as default40 } from "./components/translations/filter-expert-fr.js";
-import { default as default41 } from "./components/translations/card-error-boundary-en.js";
-import { default as default42 } from "./components/translations/card-error-boundary-fr.js";
-import { default as default43 } from "./components/translations/flat-parameters-en.js";
-import { default as default44 } from "./components/translations/flat-parameters-fr.js";
-import { default as default45 } from "./components/translations/multiple-selection-dialog-en.js";
-import { default as default46 } from "./components/translations/multiple-selection-dialog-fr.js";
-import { default as default47 } from "./components/translations/common-button-en.js";
-import { default as default48 } from "./components/translations/common-button-fr.js";
-import { default as default49 } from "./components/translations/directory-items-input-en.js";
-import { default as default50 } from "./components/translations/directory-items-input-fr.js";
+import { default as default24 } from "./components/translations/report-viewer-en.js";
+import { default as default25 } from "./components/translations/report-viewer-fr.js";
+import { default as default26 } from "./components/translations/login-en.js";
+import { default as default27 } from "./components/translations/login-fr.js";
+import { default as default28 } from "./components/translations/top-bar-en.js";
+import { default as default29 } from "./components/translations/top-bar-fr.js";
+import { default as default30 } from "./components/translations/table-en.js";
+import { default as default31 } from "./components/translations/table-fr.js";
+import { default as default32 } from "./components/translations/treeview-finder-en.js";
+import { default as default33 } from "./components/translations/treeview-finder-fr.js";
+import { default as default34 } from "./components/translations/element-search-en.js";
+import { default as default35 } from "./components/translations/element-search-fr.js";
+import { default as default36 } from "./components/translations/equipment-search-en.js";
+import { default as default37 } from "./components/translations/equipment-search-fr.js";
+import { default as default38 } from "./components/translations/filter-en.js";
+import { default as default39 } from "./components/translations/filter-fr.js";
+import { default as default40 } from "./components/translations/filter-expert-en.js";
+import { default as default41 } from "./components/translations/filter-expert-fr.js";
+import { default as default42 } from "./components/translations/card-error-boundary-en.js";
+import { default as default43 } from "./components/translations/card-error-boundary-fr.js";
+import { default as default44 } from "./components/translations/flat-parameters-en.js";
+import { default as default45 } from "./components/translations/flat-parameters-fr.js";
+import { default as default46 } from "./components/translations/multiple-selection-dialog-en.js";
+import { default as default47 } from "./components/translations/multiple-selection-dialog-fr.js";
+import { default as default48 } from "./components/translations/common-button-en.js";
+import { default as default49 } from "./components/translations/common-button-fr.js";
+import { default as default50 } from "./components/translations/directory-items-input-en.js";
+import { default as default51 } from "./components/translations/directory-items-input-fr.js";
 import { EquipmentItem } from "./components/ElementSearchDialog/equipment-item.js";
-import { default as default51 } from "./components/CardErrorBoundary/card-error-boundary.js";
-import { default as default52 } from "./hooks/useIntlRef.js";
+import { default as default52 } from "./components/CardErrorBoundary/card-error-boundary.js";
+import { default as default53 } from "./hooks/useIntlRef.js";
 import { useSnackMessage } from "./hooks/useSnackMessage.js";
-import { default as default53 } from "./hooks/useDebounce.js";
-import { default as default54 } from "./components/inputs/select-clearable.js";
-import { default as default55 } from "./components/inputs/react-hook-form/provider/use-custom-form-context.js";
-import { default as default56 } from "./components/inputs/react-hook-form/provider/custom-form-provider.js";
-import { default as default57 } from "./components/inputs/react-hook-form/autocomplete-inputs/autocomplete-input.js";
-import { default as default58 } from "./components/inputs/react-hook-form/text-input.js";
-import { default as default59 } from "./components/inputs/react-hook-form/ExpandingTextField.js";
-import { default as default60 } from "./components/inputs/react-hook-form/radio-input.js";
-import { default as default61 } from "./components/inputs/react-hook-form/slider-input.js";
-import { default as default62 } from "./components/inputs/react-hook-form/numbers/float-input.js";
-import { default as default63 } from "./components/inputs/react-hook-form/numbers/integer-input.js";
-import { default as default64 } from "./components/inputs/react-hook-form/select-inputs/select-input.js";
-import { default as default65 } from "./components/inputs/react-hook-form/booleans/checkbox-input.js";
-import { default as default66 } from "./components/inputs/react-hook-form/booleans/switch-input.js";
-import { default as default67 } from "./components/inputs/react-hook-form/error-management/error-input.js";
-import { default as default68 } from "./components/inputs/react-hook-form/error-management/field-error-alert.js";
-import { default as default69 } from "./components/inputs/react-hook-form/error-management/mid-form-error.js";
-import { default as default70 } from "./components/inputs/react-hook-form/utils/text-field-with-adornment.js";
-import { default as default71 } from "./components/inputs/react-hook-form/utils/field-label.js";
-import { default as default72 } from "./components/inputs/react-hook-form/utils/submit-button.js";
-import { default as default73 } from "./components/inputs/react-hook-form/utils/cancel-button.js";
+import { default as default54 } from "./hooks/useDebounce.js";
+import { usePrevious } from "./hooks/usePrevious.js";
+import { default as default55 } from "./components/inputs/select-clearable.js";
+import { default as default56 } from "./components/inputs/react-hook-form/provider/use-custom-form-context.js";
+import { default as default57 } from "./components/inputs/react-hook-form/provider/custom-form-provider.js";
+import { default as default58 } from "./components/inputs/react-hook-form/autocomplete-inputs/autocomplete-input.js";
+import { default as default59 } from "./components/inputs/react-hook-form/text-input.js";
+import { default as default60 } from "./components/inputs/react-hook-form/ExpandingTextField.js";
+import { default as default61 } from "./components/inputs/react-hook-form/radio-input.js";
+import { default as default62 } from "./components/inputs/react-hook-form/slider-input.js";
+import { default as default63 } from "./components/inputs/react-hook-form/numbers/float-input.js";
+import { default as default64 } from "./components/inputs/react-hook-form/numbers/integer-input.js";
+import { default as default65 } from "./components/inputs/react-hook-form/select-inputs/select-input.js";
+import { default as default66 } from "./components/inputs/react-hook-form/booleans/checkbox-input.js";
+import { default as default67 } from "./components/inputs/react-hook-form/booleans/switch-input.js";
+import { default as default68 } from "./components/inputs/react-hook-form/error-management/error-input.js";
+import { default as default69 } from "./components/inputs/react-hook-form/error-management/field-error-alert.js";
+import { default as default70 } from "./components/inputs/react-hook-form/error-management/mid-form-error.js";
+import { default as default71 } from "./components/inputs/react-hook-form/utils/text-field-with-adornment.js";
+import { default as default72 } from "./components/inputs/react-hook-form/utils/field-label.js";
+import { default as default73 } from "./components/inputs/react-hook-form/utils/submit-button.js";
+import { default as default74 } from "./components/inputs/react-hook-form/utils/cancel-button.js";
 import { genHelperError, genHelperPreviousValue, gridItem, identity, isFieldRequired, isFloatNumber, toFloatOrNullValue } from "./components/inputs/react-hook-form/utils/functions.js";
 import { areArrayElementsUnique, isObjectEmpty, keyGenerator } from "./utils/functions.js";
-import { default as default74 } from "./components/inputs/react-hook-form/directory-items-input.js";
-import { default as default75 } from "./components/DirectoryItemSelector/directory-item-selector.js";
-import { default as default76 } from "./components/CustomAGGrid/custom-aggrid.js";
-import { default as default77 } from "./components/inputs/react-hook-form/raw-read-only-input.js";
-import { default as default78 } from "./components/filter/filter-creation-dialog.js";
-import { default as default79 } from "./components/filter/expert/expert-filter-edition-dialog.js";
-import { default as default80 } from "./components/filter/explicit-naming/explicit-naming-filter-edition-dialog.js";
-import { default as default81 } from "./components/filter/criteria-based/criteria-based-filter-edition-dialog.js";
+import { default as default75 } from "./components/inputs/react-hook-form/directory-items-input.js";
+import { default as default76 } from "./components/DirectoryItemSelector/directory-item-selector.js";
+import { default as default77 } from "./components/CustomAGGrid/custom-aggrid.js";
+import { default as default78 } from "./components/inputs/react-hook-form/raw-read-only-input.js";
+import { default as default79 } from "./components/filter/filter-creation-dialog.js";
+import { default as default80 } from "./components/filter/expert/expert-filter-edition-dialog.js";
+import { default as default81 } from "./components/filter/explicit-naming/explicit-naming-filter-edition-dialog.js";
+import { default as default82 } from "./components/filter/criteria-based/criteria-based-filter-edition-dialog.js";
 import { saveCriteriaBasedFilter, saveExpertFilter, saveExplicitNamingFilter } from "./components/filter/utils/filter-api.js";
-import { DEFAULT_RANGE_VALUE, default as default82, getRangeInputDataForm, getRangeInputSchema } from "./components/inputs/react-hook-form/range-input.js";
-import { default as default83 } from "./components/inputs/react-hook-form/select-inputs/input-with-popup-confirmation.js";
-import { default as default84 } from "./components/inputs/react-hook-form/select-inputs/mui-select-input.js";
-import { default as default85 } from "./components/inputs/react-hook-form/select-inputs/countries-input.js";
+import { DEFAULT_RANGE_VALUE, default as default83, getRangeInputDataForm, getRangeInputSchema } from "./components/inputs/react-hook-form/range-input.js";
+import { default as default84 } from "./components/inputs/react-hook-form/select-inputs/input-with-popup-confirmation.js";
+import { default as default85 } from "./components/inputs/react-hook-form/select-inputs/mui-select-input.js";
+import { default as default86 } from "./components/inputs/react-hook-form/select-inputs/countries-input.js";
 import { getComputedLanguage, getSystemLanguage, useLocalizedCountries } from "./hooks/localized-countries-hook.js";
-import { default as default86 } from "./components/inputs/react-hook-form/autocomplete-inputs/multiple-autocomplete-input.js";
-import { default as default87 } from "./components/inputs/react-hook-form/ag-grid-table/csv-uploader/csv-uploader.js";
-import { default as default88 } from "./components/inputs/react-hook-form/unique-name-input.js";
-import { default as default89 } from "./utils/UserManagerMock.js";
+import { default as default87 } from "./components/inputs/react-hook-form/autocomplete-inputs/multiple-autocomplete-input.js";
+import { default as default88 } from "./components/inputs/react-hook-form/ag-grid-table/csv-uploader/csv-uploader.js";
+import { default as default89 } from "./components/inputs/react-hook-form/unique-name-input.js";
+import { default as default90 } from "./utils/UserManagerMock.js";
 import { CONTINGENCY_LIST_EQUIPMENTS, FILTER_EQUIPMENTS } from "./components/filter/utils/filter-form-utils.js";
 import { getCriteriaBasedFormData, getCriteriaBasedSchema } from "./components/filter/criteria-based/criteria-based-filter-utils.js";
 import { setCommonStore } from "./redux/commonStore.js";
@@ -115,26 +122,28 @@ import { createFilter, fetchElementsInfos, saveFilter } from "./services/explore
 import { fetchAppsMetadata, fetchEnv, fetchStudyMetadata } from "./services/apps-metadata.js";
 import { fetchDirectoryContent, fetchDirectoryElementPath, fetchRootFolders } from "./services/directory.js";
 import { exportFilter } from "./services/study.js";
+import * as yup from "yup";
 export {
   default4 as AboutDialog,
   default6 as AuthenticationRouter,
-  default57 as AutocompleteInput,
+  default58 as AutocompleteInput,
   Battery,
   default19 as BottomRightButtons,
   BusBar,
   CONTINGENCY_LIST_EQUIPMENTS,
-  default73 as CancelButton,
-  default51 as CardErrorBoundary,
+  default74 as CancelButton,
+  default52 as CardErrorBoundary,
   ChangeWays,
-  default65 as CheckboxInput,
-  default85 as CountriesInput,
-  default81 as CriteriaBasedFilterEditionDialog,
+  default66 as CheckboxInput,
+  default86 as CountriesInput,
+  default82 as CriteriaBasedFilterEditionDialog,
   default17 as CriteriaBasedForm,
-  default87 as CsvUploader,
-  default76 as CustomAGGrid,
+  default88 as CsvUploader,
+  default77 as CustomAGGrid,
   default20 as CustomAgGridTable,
-  default56 as CustomFormProvider,
+  default57 as CustomFormProvider,
   default14 as CustomMuiDialog,
+  default22 as CustomReactQueryBuilder,
   DARK_THEME,
   DEFAULT_CELL_PADDING,
   DEFAULT_HEADER_HEIGHT,
@@ -142,31 +151,33 @@ export {
   DEFAULT_ROW_HEIGHT,
   DanglingLine,
   default15 as DescriptionModificationDialog,
-  default75 as DirectoryItemSelector,
-  default74 as DirectoryItemsInput,
+  default76 as DirectoryItemSelector,
+  default75 as DirectoryItemsInput,
   EQUIPMENT_TYPE,
+  fields as EXPERT_FILTER_FIELDS,
+  EXPERT_FILTER_QUERY,
   ElementSearchDialog,
   ElementSearchInput,
   ElementType,
   EquipmentItem,
   EquipmentType,
-  default67 as ErrorInput,
+  default68 as ErrorInput,
   default12 as ExpandableGroup,
-  default59 as ExpandingTextField,
-  default79 as ExpertFilterEditionDialog,
-  default80 as ExplicitNamingFilterEditionDialog,
+  default60 as ExpandingTextField,
+  default80 as ExpertFilterEditionDialog,
+  default81 as ExplicitNamingFilterEditionDialog,
   FILTER_EQUIPMENTS,
   default21 as FieldConstants,
-  default68 as FieldErrorAlert,
-  default71 as FieldLabel,
-  default78 as FilterCreationDialog,
+  default69 as FieldErrorAlert,
+  default72 as FieldLabel,
+  default79 as FilterCreationDialog,
   FlatParameters,
-  default62 as FloatInput,
+  default63 as FloatInput,
   GRIDSUITE_DEFAULT_PRECISION,
   Generator,
   Hvdc,
-  default83 as InputWithPopupConfirmation,
-  default63 as IntegerInput,
+  default84 as InputWithPopupConfirmation,
+  default64 as IntegerInput,
   KeyedColumnsRowIndexer,
   LANG_ENGLISH,
   LANG_FRENCH,
@@ -176,35 +187,35 @@ export {
   LOGOUT_ERROR,
   Line,
   Load,
-  default69 as MidFormError,
+  default70 as MidFormError,
   default16 as ModifyElementSelection,
-  default84 as MuiSelectInput,
+  default85 as MuiSelectInput,
   default7 as MuiVirtualizedTable,
-  default86 as MultipleAutocompleteInput,
+  default87 as MultipleAutocompleteInput,
   default13 as MultipleSelectionDialog,
   OverflowableText,
   default18 as PopupConfirmationDialog,
   RESET_AUTHENTICATION_ROUTER_ERROR,
   ROW_DRAGGING_SELECTION_COLUMN_DEF,
-  default60 as RadioInput,
-  default82 as RangeInput,
-  default77 as RawReadOnlyInput,
+  default61 as RadioInput,
+  default83 as RangeInput,
+  default78 as RawReadOnlyInput,
   default8 as ReportViewer,
   default9 as ReportViewerDialog,
   SHOW_AUTH_INFO_LOGIN,
   SIGNIN_CALLBACK_ERROR,
   SVC,
-  default54 as SelectClearable,
-  default64 as SelectInput,
+  default55 as SelectClearable,
+  default65 as SelectInput,
   ShuntCompensator,
-  default61 as SliderInput,
+  default62 as SliderInput,
   default5 as SnackbarProvider,
-  default72 as SubmitButton,
+  default73 as SubmitButton,
   Substation,
-  default66 as SwitchInput,
+  default67 as SwitchInput,
   default10 as TagRenderer,
-  default70 as TextFieldWithAdornment,
-  default58 as TextInput,
+  default71 as TextFieldWithAdornment,
+  default59 as TextInput,
   ThreeWindingTransfo,
   default3 as TopBar,
   default2 as TreeViewFinder,
@@ -212,26 +223,27 @@ export {
   UNAUTHORIZED_USER_INFO,
   USER,
   USER_VALIDATION_ERROR,
-  default88 as UniqueNameInput,
-  default89 as UserManagerMock,
+  default89 as UniqueNameInput,
+  default90 as UserManagerMock,
   VSC,
   VoltageLevel,
   areArrayElementsUnique,
   backendFetch,
   backendFetchJson,
-  default41 as card_error_boundary_en,
-  default42 as card_error_boundary_fr,
-  default47 as common_button_en,
-  default48 as common_button_fr,
+  default42 as card_error_boundary_en,
+  default43 as card_error_boundary_fr,
+  default48 as common_button_en,
+  default49 as common_button_fr,
   createFilter,
-  default49 as directory_items_input_en,
-  default50 as directory_items_input_fr,
+  default50 as directory_items_input_en,
+  default51 as directory_items_input_fr,
   dispatchUser,
-  default33 as element_search_en,
-  default34 as element_search_fr,
+  default34 as element_search_en,
+  default35 as element_search_fr,
   equipmentStyles,
-  default35 as equipment_search_en,
-  default36 as equipment_search_fr,
+  default36 as equipment_search_en,
+  default37 as equipment_search_fr,
+  exportExpertRules,
   exportFilter,
   fetchAppsMetadata,
   fetchDirectoryContent,
@@ -240,19 +252,21 @@ export {
   fetchEnv,
   fetchRootFolders,
   fetchStudyMetadata,
-  default37 as filter_en,
-  default39 as filter_expert_en,
-  default40 as filter_expert_fr,
-  default38 as filter_fr,
-  default43 as flat_parameters_en,
-  default44 as flat_parameters_fr,
+  default38 as filter_en,
+  default40 as filter_expert_en,
+  default41 as filter_expert_fr,
+  default39 as filter_fr,
+  default44 as flat_parameters_en,
+  default45 as flat_parameters_fr,
+  formatQuery,
   genHelperError,
   genHelperPreviousValue,
   getComputedLanguage,
   getCriteriaBasedFormData,
   getCriteriaBasedSchema,
   getEquipmentsInfosForSearchBar,
-  default22 as getFileIcon,
+  getExpertFilterEmptyFormData,
+  default23 as getFileIcon,
   getPreLoginPath,
   getRangeInputDataForm,
   getRangeInputSchema,
@@ -260,6 +274,7 @@ export {
   getSystemLanguage,
   gridItem,
   identity,
+  importExpertRules,
   initializeAuthenticationDev,
   initializeAuthenticationProd,
   isBlankOrEmpty,
@@ -267,18 +282,19 @@ export {
   isFloatNumber,
   isObjectEmpty,
   keyGenerator,
-  default25 as login_en,
-  default26 as login_fr,
+  default26 as login_en,
+  default27 as login_fr,
   logout,
   mergeSx,
   microUnitToUnit,
-  default45 as multiple_selection_dialog_en,
-  default46 as multiple_selection_dialog_fr,
+  default46 as multiple_selection_dialog_en,
+  default47 as multiple_selection_dialog_fr,
   noSelectionForCopy,
-  default23 as report_viewer_en,
-  default24 as report_viewer_fr,
+  default24 as report_viewer_en,
+  default25 as report_viewer_fr,
   roundToDefaultPrecision,
   roundToPrecision,
+  rqbQuerySchemaValidator,
   saveCriteriaBasedFilter,
   saveExpertFilter,
   saveExplicitNamingFilter,
@@ -286,18 +302,20 @@ export {
   setCommonStore,
   setLoggedUser,
   setSignInCallbackError,
-  default29 as table_en,
-  default30 as table_fr,
+  default30 as table_en,
+  default31 as table_fr,
   toFloatOrNullValue,
-  default27 as top_bar_en,
-  default28 as top_bar_fr,
-  default31 as treeview_finder_en,
-  default32 as treeview_finder_fr,
+  default28 as top_bar_en,
+  default29 as top_bar_fr,
+  default32 as treeview_finder_en,
+  default33 as treeview_finder_fr,
   unitToMicroUnit,
-  default55 as useCustomFormContext,
-  default53 as useDebounce,
+  default56 as useCustomFormContext,
+  default54 as useDebounce,
   default11 as useElementSearch,
-  default52 as useIntlRef,
+  default53 as useIntlRef,
   useLocalizedCountries,
-  useSnackMessage
+  usePrevious,
+  useSnackMessage,
+  yup
 };

package/package.json

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