@gridsuite/commons-ui 0.132.0 → 0.132.1

package/dist/components/filter/FilterCreationDialog.js

@@ -1,5 +1,5 @@
 import { jsx } from "react/jsx-runtime";
-import { useCallback, useMemo } from "react";
+import { useMemo, useCallback } from "react";
 import { useForm } from "react-hook-form";
 import { yupResolver } from "@hookform/resolvers/yup";
 import { saveExplicitNamingFilter, saveExpertFilter } from "./utils/filterApi.js";
@@ -9,7 +9,7 @@ import { getExplicitNamingFilterEmptyFormData, explicitNamingFilterSchema } from
 import { FieldConstants } from "../../utils/constants/fieldConstants.js";
 import "../../utils/yupConfig.js";
 import { FilterForm } from "./FilterForm.js";
-import { expertFilterSchema, getExpertFilterEmptyFormData } from "./expert/ExpertFilterForm.js";
+import { getExpertFilterEmptyFormData, expertFilterSchema } from "./expert/ExpertFilterForm.js";
 import { FilterType } from "./constants/FilterConstants.js";
 import { MAX_CHAR_DESCRIPTION } from "../../utils/constants/uiConstants.js";
 import { EXPERT_FILTER_QUERY } from "./expert/expertFilterConstants.js";
@@ -22,12 +22,12 @@ const emptyFormData = {
   ...getExplicitNamingFilterEmptyFormData(),
   ...getExpertFilterEmptyFormData()
 };
-const formSchema = yup.object().shape({
+const formSchemaByFilterType = (filterType) => yup.object().shape({
   [FieldConstants.NAME]: yup.string().trim().required("nameEmpty"),
   [FieldConstants.DESCRIPTION]: yup.string().max(MAX_CHAR_DESCRIPTION, "descriptionLimitError"),
   [FieldConstants.EQUIPMENT_TYPE]: yup.string().required(),
-  ...explicitNamingFilterSchema,
-  ...expertFilterSchema
+  ...(filterType == null ? void 0 : filterType.id) === FilterType.EXPLICIT_NAMING.id ? explicitNamingFilterSchema : {},
+  ...(filterType == null ? void 0 : filterType.id) === FilterType.EXPERT.id ? expertFilterSchema : {}
 }).required();
 function FilterCreationDialog({
   open,
@@ -39,6 +39,7 @@ function FilterCreationDialog({
 }) {
   var _a;
   const { snackError } = useSnackMessage();
+  const formSchema = useMemo(() => formSchemaByFilterType(filterType), [filterType]);
   const formMethods = useForm({
     defaultValues: emptyFormData,
     resolver: yupResolver(formSchema)

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

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

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

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

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

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

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

@@ -12,7 +12,7 @@ import { Generator, Load } from "../../../utils/types/equipmentTypes.js";
 import { NumericEditor } from "../../inputs/reactHookForm/agGridTable/cellEditors/numericEditor.js";
 import { InputWithPopupConfirmation } from "../../inputs/reactHookForm/selectInputs/InputWithPopupConfirmation.js";
 import { toFloatOrNullValue } from "../../inputs/reactHookForm/utils/functions.js";
-import { DISTRIBUTION_KEY, FilterType } from "../constants/FilterConstants.js";
+import { DISTRIBUTION_KEY } from "../constants/FilterConstants.js";
 import { FILTER_EQUIPMENTS } from "../utils/filterFormUtils.js";
 import { useSnackMessage } from "../../../hooks/useSnackMessage.js";
 import { ElementType } from "../../../utils/types/elementType.js";
@@ -33,15 +33,12 @@ const explicitNamingFilterSchema = {
       [FieldConstants.EQUIPMENT_ID]: yup.string().nullable(),
       [DISTRIBUTION_KEY]: yup.number().nullable()
     })
-  ).compact((row) => !row[DISTRIBUTION_KEY] && !row[FieldConstants.EQUIPMENT_ID]).when([FieldConstants.FILTER_TYPE], {
-    is: FilterType.EXPLICIT_NAMING.id,
-    then: (schema) => schema.min(1, "emptyFilterError").when([FieldConstants.EQUIPMENT_TYPE], {
-      is: (equipmentType) => isGeneratorOrLoad(equipmentType),
-      then: (innerSchema) => innerSchema.test("noKeyWithoutId", "distributionKeyWithMissingIdError", (array) => {
-        return !array.some((row) => !row[FieldConstants.EQUIPMENT_ID]);
-      }).test("ifOneKeyThenKeyEverywhere", "missingDistributionKeyError", (array) => {
-        return !(array.some((row) => row[DISTRIBUTION_KEY]) && array.some((row) => !row[DISTRIBUTION_KEY]));
-      })
+  ).compact((row) => !row[DISTRIBUTION_KEY] && !row[FieldConstants.EQUIPMENT_ID]).min(1, "emptyFilterError").when([FieldConstants.EQUIPMENT_TYPE], {
+    is: (equipmentType) => isGeneratorOrLoad(equipmentType),
+    then: (innerSchema) => innerSchema.test("noKeyWithoutId", "distributionKeyWithMissingIdError", (array) => {
+      return !array.some((row) => !row[FieldConstants.EQUIPMENT_ID]);
+    }).test("ifOneKeyThenKeyEverywhere", "missingDistributionKeyError", (array) => {
+      return !(array.some((row) => row[DISTRIBUTION_KEY]) && array.some((row) => !row[DISTRIBUTION_KEY]));
     })
   })
 };

package/dist/components/filter/index.js

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

package/dist/components/index.js

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

package/dist/index.js

@@ -43,7 +43,7 @@ import { DISTRIBUTION_KEY, FilterType, NO_ITEM_SELECTION_FOR_COPY } from "./comp
 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 { ExpertFilterForm, expertFilterSchema, getExpertFilterEmptyFormData, rqbQuerySchemaValidator } from "./components/filter/expert/ExpertFilterForm.js";
+import { ExpertFilterForm, expertFilterSchema, getExpertFilterEmptyFormData } from "./components/filter/expert/ExpertFilterForm.js";
 import { CombinatorType, DataType, OperatorType } from "./components/filter/expert/expertFilter.type.js";
 import { COMBINATOR_OPTIONS, CONVERTERS_MODE_OPTIONS, ENERGY_SOURCE_OPTIONS, EXPERT_FILTER_EQUIPMENTS, EXPERT_FILTER_FIELDS, EXPERT_FILTER_QUERY, FIELDS_OPTIONS, LOAD_TYPE_OPTIONS, OPERATOR_OPTIONS, PHASE_REGULATION_MODE_OPTIONS, RATIO_REGULATION_MODE_OPTIONS, REGULATION_TYPE_OPTIONS, RULES, SHUNT_COMPENSATOR_TYPE_OPTIONS, SVAR_REGULATION_MODE_OPTIONS } from "./components/filter/expert/expertFilterConstants.js";
 import { countRules, exportExpertRules, getFilterEquipmentTypeLabel, getNumberOfSiblings, getOperators, importExpertRules, queryValidator, recursiveRemove, testQuery } from "./components/filter/expert/expertFilterUtils.js";
@@ -804,7 +804,6 @@ export {
   resetAuthenticationRouterError,
   roundToDefaultPrecision,
   roundToPrecision,
-  rqbQuerySchemaValidator,
   safeEncodeURIComponent,
   sanitizePercentageValue,
   saveExpertFilter,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.132.0",
+    "version": "0.132.1",
     "description": "common react components for gridsuite applications",
     "author": "gridsuite team",
     "homepage": "https://github.com/gridsuite",
@@ -37,8 +37,8 @@
         "@ag-grid-community/locale": "^33.3.2",
         "@hello-pangea/dnd": "^18.0.1",
         "@material-symbols/svg-400": "^0.31.9",
-        "@react-querybuilder/dnd": "^8.8.4",
-        "@react-querybuilder/material": "^8.8.4",
+        "@react-querybuilder/dnd": "^8.11.0",
+        "@react-querybuilder/material": "^8.11.0",
         "autosuggest-highlight": "^3.3.4",
         "clsx": "^2.1.1",
         "jwt-decode": "^4.0.0",
@@ -49,7 +49,7 @@
         "react-csv-downloader": "^3.3.0",
         "react-dnd": "^16.0.1",
         "react-dnd-html5-backend": "^16.0.1",
-        "react-querybuilder": "^8.2.0",
+        "react-querybuilder": "^8.11.0",
         "reconnecting-websocket": "^4.4.0",
         "type-fest": "^4.41.0",
         "uuid": "^13.0.0"