@gridsuite/commons-ui 0.121.0 → 0.123.0

package/dist/components/filter/FilterCreationDialog.js

@@ -60,7 +60,7 @@ function FilterCreationDialog({
           null,
           (error) => {
             snackError({
-              messageTxt: error
+              messageTxt: error.message
             });
           },
           onClose,
@@ -78,7 +78,7 @@ function FilterCreationDialog({
           onClose,
           (error) => {
             snackError({
-              messageTxt: error
+              messageTxt: error.message
             });
           }
         );

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

@@ -84,7 +84,8 @@ function ExpertFilterEditionDialog({
         onClose,
         (error) => {
           snackError({
-            messageTxt: error
+            messageTxt: error.message,
+            headerId: "cannotSaveFilter"
           });
         }
       );

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

@@ -81,7 +81,7 @@ function ExplicitNamingFilterEditionDialog({
         id,
         (error) => {
           snackError({
-            messageTxt: error
+            messageTxt: error.message
           });
         },
         onClose

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

@@ -1,3 +1,3 @@
 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 saveExpertFilter: (id: string | null, query: any, equipmentType: string, name: string, description: string, isFilterCreation: boolean, activeDirectory: UUID | undefined | null, onClose: () => void, onError: (message: string) => void, token?: string) => void;
+export declare const saveExplicitNamingFilter: (tableValues: any[], isFilterCreation: boolean, equipmentType: string, name: string, description: string, id: string | null, setCreateFilterErr: (error: Error) => void, handleClose: () => void, activeDirectory?: UUID, token?: string) => void;
+export declare const saveExpertFilter: (id: string | null, query: any, equipmentType: string, name: string, description: string, isFilterCreation: boolean, activeDirectory: UUID | undefined | null, onClose: () => void, onError: (error: Error) => void, token?: string) => void;

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

@@ -37,7 +37,7 @@ const saveExplicitNamingFilter = (tableValues, isFilterCreation, equipmentType,
     ).then(() => {
       handleClose();
     }).catch((error) => {
-      setCreateFilterErr(error.message);
+      setCreateFilterErr(error instanceof Error ? error : new Error("unknown error"));
     });
   } else {
     saveFilter(
@@ -53,7 +53,7 @@ const saveExplicitNamingFilter = (tableValues, isFilterCreation, equipmentType,
     ).then(() => {
       handleClose();
     }).catch((error) => {
-      setCreateFilterErr(error.message);
+      setCreateFilterErr(error instanceof Error ? error : new Error("unknown error"));
     });
   }
 };
@@ -74,7 +74,7 @@ const saveExpertFilter = (id, query, equipmentType, name, description, isFilterC
       onClose();
     }).catch((error) => {
       catchErrorHandler(error, (message) => {
-        onError(message);
+        onError(new Error(message));
       });
     });
   } else {
@@ -92,7 +92,7 @@ const saveExpertFilter = (id, query, equipmentType, name, description, isFilterC
       onClose();
     }).catch((error) => {
       catchErrorHandler(error, (message) => {
-        onError(message);
+        onError(new Error(message));
       });
     });
   }

package/dist/components/inputs/reactQueryBuilder/ValueEditor.js

@@ -12,7 +12,6 @@ import { VoltageLevel, Substation } from "../../../utils/types/equipmentTypes.js
 import { ElementValueEditor } from "./ElementValueEditor.js";
 import { ElementType } from "../../../utils/types/elementType.js";
 import { PropertyValueEditor } from "./PropertyValueEditor.js";
-import { FilterType } from "../../filter/constants/FilterConstants.js";
 import { GroupValueEditor } from "./compositeRuleEditor/GroupValueEditor.js";
 import { OPERATOR_OPTIONS } from "../../filter/expert/expertFilterConstants.js";
 import { FieldType } from "../../../utils/types/fieldType.js";
@@ -32,13 +31,9 @@ function ValueEditor(props) {
   const { getValues } = formContext;
   const itemFilter = useCallback(
     (filterValue) => {
-      var _a, _b, _c, _d;
+      var _a, _b, _c;
       if ((filterValue == null ? void 0 : filterValue.type) === ElementType.FILTER) {
-        return (
-          // we do not authorize to use an expert filter in the rules of
-          // another expert filter, to prevent potential cycle problems
-          ((_a = filterValue == null ? void 0 : filterValue.specificMetadata) == null ? void 0 : _a.type) !== FilterType.EXPERT.id && (field === FieldType.ID && ((_b = filterValue == null ? void 0 : filterValue.specificMetadata) == null ? void 0 : _b.equipmentType) === getValues(FieldConstants.EQUIPMENT_TYPE) || (field === FieldType.VOLTAGE_LEVEL_ID || field === FieldType.VOLTAGE_LEVEL_ID_1 || field === FieldType.VOLTAGE_LEVEL_ID_2 || field === FieldType.VOLTAGE_LEVEL_ID_3) && ((_c = filterValue == null ? void 0 : filterValue.specificMetadata) == null ? void 0 : _c.equipmentType) === VoltageLevel.type || (field === FieldType.SUBSTATION_ID || field === FieldType.SUBSTATION_ID_1 || field === FieldType.SUBSTATION_ID_2) && ((_d = filterValue == null ? void 0 : filterValue.specificMetadata) == null ? void 0 : _d.equipmentType) === Substation.type)
-        );
+        return field === FieldType.ID && ((_a = filterValue == null ? void 0 : filterValue.specificMetadata) == null ? void 0 : _a.equipmentType) === getValues(FieldConstants.EQUIPMENT_TYPE) || (field === FieldType.VOLTAGE_LEVEL_ID || field === FieldType.VOLTAGE_LEVEL_ID_1 || field === FieldType.VOLTAGE_LEVEL_ID_2 || field === FieldType.VOLTAGE_LEVEL_ID_3) && ((_b = filterValue == null ? void 0 : filterValue.specificMetadata) == null ? void 0 : _b.equipmentType) === VoltageLevel.type || (field === FieldType.SUBSTATION_ID || field === FieldType.SUBSTATION_ID_1 || field === FieldType.SUBSTATION_ID_2) && ((_c = filterValue == null ? void 0 : filterValue.specificMetadata) == null ? void 0 : _c.equipmentType) === Substation.type;
       }
       return true;
     },

package/dist/components/notifications/hooks/useListenerManager.js

@@ -13,7 +13,13 @@ const useListenerManager = (urls) => {
   const addListenerEvent = useCallback((urlKey, listener) => {
     const urlsListeners = urlsListenersRef.current;
     if (urlKey in urlsListeners) {
-      urlsListeners[urlKey].push(listener);
+      const existingIndex = urlsListeners[urlKey].findIndex((l) => l.id === listener.id);
+      if (existingIndex !== -1) {
+        console.warn(`🔄 Replacing existing listener ${listener.id} on ${urlKey}`);
+        urlsListeners[urlKey][existingIndex] = listener;
+      } else {
+        urlsListeners[urlKey].push(listener);
+      }
     } else {
       urlsListeners[urlKey] = [listener];
     }

package/dist/components/parameters/short-circuit/use-short-circuit-parameters-form.js

@@ -77,7 +77,7 @@ const useShortCircuitParametersForm = ({
   const resetAll = useCallback(
     (predefinedParameter) => {
       const dirty = { shouldDirty: true };
-      setValue(SHORT_CIRCUIT_WITH_FEEDER_RESULT, true, dirty);
+      setValue(SHORT_CIRCUIT_WITH_FEEDER_RESULT, false, dirty);
       setValue(SHORT_CIRCUIT_WITH_LOADS, false, dirty);
       setValue(
         SHORT_CIRCUIT_WITH_VSC_CONVERTER_STATIONS,

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

@@ -178,6 +178,7 @@ export declare const filterExpertEn: {
     pairingKey: string;
     tieLineId: string;
     cannotRetrieveFilter: string;
+    cannotSaveFilter: string;
     equality: string;
     notEquality: string;
     greaterThan: string;

package/dist/translations/en/filterExpertEn.js

@@ -172,6 +172,7 @@ const filterExpertEn = {
   pairingKey: "Xnode",
   tieLineId: "Tie line ID",
   cannotRetrieveFilter: "Could not retrieve filter: ",
+  cannotSaveFilter: "Error while saving filter: ",
   equality: "=",
   notEquality: "!=",
   greaterThan: ">",

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

@@ -178,6 +178,7 @@ export declare const filterExpertFr: {
     pairingKey: string;
     tieLineId: string;
     cannotRetrieveFilter: string;
+    cannotSaveFilter: string;
     equality: string;
     notEquality: string;
     greaterThan: string;

package/dist/translations/fr/filterExpertFr.js

@@ -172,6 +172,7 @@ const filterExpertFr = {
   pairingKey: "Xnode",
   tieLineId: "ID de l'interconnexion",
   cannotRetrieveFilter: "Erreur d'accès au filtre : ",
+  cannotSaveFilter: "Erreur lors de la mise à jour du filtre : ",
   equality: "=",
   notEquality: "!=",
   greaterThan: ">",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.121.0",
+    "version": "0.123.0",
     "description": "common react components for gridsuite applications",
     "author": "gridsuite team",
     "homepage": "https://github.com/gridsuite",