@gridsuite/commons-ui 0.107.0 → 0.107.1

package/dist/components/directoryItemSelector/DirectoryItemSelector.js

@@ -124,6 +124,7 @@ function DirectoryItemSelector({
       return {
         id: e.elementUuid,
         name: e.elementName,
+        type: e.type,
         description: e.description,
         specificMetadata: e.specificMetadata,
         icon: getFileIcon(e.type, styles.icon),

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

@@ -1155,5 +1155,20 @@ export declare const FIELDS_OPTIONS: {
         dataType: DataType;
         inputType: string;
     };
+    SUBSTATION_ID: {
+        name: FieldType;
+        label: string;
+        dataType: DataType;
+    };
+    SUBSTATION_ID_1: {
+        name: FieldType;
+        label: string;
+        dataType: DataType;
+    };
+    SUBSTATION_ID_2: {
+        name: FieldType;
+        label: string;
+        dataType: DataType;
+    };
 };
 export declare const EXPERT_FILTER_FIELDS: Record<string, Field[]>;

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

@@ -1096,6 +1096,21 @@ const FIELDS_OPTIONS = {
     unit: KILO_AMPERE,
     dataType: DataType.NUMBER,
     inputType: "number"
+  },
+  SUBSTATION_ID: {
+    name: FieldType.SUBSTATION_ID,
+    label: "substationId",
+    dataType: DataType.STRING
+  },
+  SUBSTATION_ID_1: {
+    name: FieldType.SUBSTATION_ID_1,
+    label: "substationId1",
+    dataType: DataType.STRING
+  },
+  SUBSTATION_ID_2: {
+    name: FieldType.SUBSTATION_ID_2,
+    label: "substationId2",
+    dataType: DataType.STRING
   }
 };
 const EXPERT_FILTER_FIELDS = {
@@ -1108,6 +1123,7 @@ const EXPERT_FILTER_FIELDS = {
     FIELDS_OPTIONS.LOW_VOLTAGE_LIMIT,
     FIELDS_OPTIONS.HIGH_VOLTAGE_LIMIT,
     FIELDS_OPTIONS.PROPERTY,
+    FIELDS_OPTIONS.SUBSTATION_ID,
     FIELDS_OPTIONS.SUBSTATION_PROPERTY,
     FIELDS_OPTIONS.LOW_SHORT_CIRCUIT_CURRENT_LIMIT,
     FIELDS_OPTIONS.HIGH_SHORT_CIRCUIT_CURRENT_LIMIT
@@ -1130,6 +1146,8 @@ const EXPERT_FILTER_FIELDS = {
     FIELDS_OPTIONS.SHUNT_SUSCEPTANCE_1,
     FIELDS_OPTIONS.SHUNT_SUSCEPTANCE_2,
     FIELDS_OPTIONS.PROPERTY,
+    FIELDS_OPTIONS.SUBSTATION_ID_1,
+    FIELDS_OPTIONS.SUBSTATION_ID_2,
     FIELDS_OPTIONS.SUBSTATION_PROPERTY_1,
     FIELDS_OPTIONS.SUBSTATION_PROPERTY_2,
     FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_1,
@@ -1160,6 +1178,7 @@ const EXPERT_FILTER_FIELDS = {
     FIELDS_OPTIONS.PHASE_REGULATION_MODE,
     FIELDS_OPTIONS.PHASE_REGULATION_VALUE,
     FIELDS_OPTIONS.PROPERTY,
+    FIELDS_OPTIONS.SUBSTATION_ID,
     FIELDS_OPTIONS.SUBSTATION_PROPERTY,
     FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_1,
     FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_2
@@ -1242,6 +1261,7 @@ const EXPERT_FILTER_FIELDS = {
     FIELDS_OPTIONS.PHASE_REGULATION_MODE_2,
     FIELDS_OPTIONS.PHASE_REGULATION_MODE_3,
     FIELDS_OPTIONS.PROPERTY,
+    FIELDS_OPTIONS.SUBSTATION_ID,
     FIELDS_OPTIONS.SUBSTATION_PROPERTY,
     {
       ...FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_1,
@@ -1273,6 +1293,7 @@ const EXPERT_FILTER_FIELDS = {
     FIELDS_OPTIONS.PLANNED_OUTAGE_RATE,
     FIELDS_OPTIONS.FORCED_OUTAGE_RATE,
     FIELDS_OPTIONS.PROPERTY,
+    FIELDS_OPTIONS.SUBSTATION_ID,
     FIELDS_OPTIONS.SUBSTATION_PROPERTY,
     FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY
   ],
@@ -1288,6 +1309,7 @@ const EXPERT_FILTER_FIELDS = {
     FIELDS_OPTIONS.TARGET_P,
     FIELDS_OPTIONS.TARGET_Q,
     FIELDS_OPTIONS.PROPERTY,
+    FIELDS_OPTIONS.SUBSTATION_ID,
     FIELDS_OPTIONS.SUBSTATION_PROPERTY,
     FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY
   ],
@@ -1302,6 +1324,7 @@ const EXPERT_FILTER_FIELDS = {
     FIELDS_OPTIONS.P0,
     FIELDS_OPTIONS.Q0,
     FIELDS_OPTIONS.PROPERTY,
+    FIELDS_OPTIONS.SUBSTATION_ID,
     FIELDS_OPTIONS.SUBSTATION_PROPERTY,
     FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY
   ],
@@ -1320,6 +1343,7 @@ const EXPERT_FILTER_FIELDS = {
     FIELDS_OPTIONS.MAX_SUSCEPTANCE,
     FIELDS_OPTIONS.SWITCHED_ON_SUSCEPTANCE,
     FIELDS_OPTIONS.PROPERTY,
+    FIELDS_OPTIONS.SUBSTATION_ID,
     FIELDS_OPTIONS.SUBSTATION_PROPERTY,
     FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY
   ],
@@ -1364,6 +1388,7 @@ const EXPERT_FILTER_FIELDS = {
     },
     FIELDS_OPTIONS.SUSCEPTANCE_FIX,
     FIELDS_OPTIONS.PROPERTY,
+    FIELDS_OPTIONS.SUBSTATION_ID,
     FIELDS_OPTIONS.SUBSTATION_PROPERTY,
     FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY
   ],
@@ -1386,6 +1411,8 @@ const EXPERT_FILTER_FIELDS = {
     FIELDS_OPTIONS.ACTIVE_POWER_SET_POINT,
     FIELDS_OPTIONS.CONVERTERS_MODE,
     FIELDS_OPTIONS.PROPERTY,
+    FIELDS_OPTIONS.SUBSTATION_ID_1,
+    FIELDS_OPTIONS.SUBSTATION_ID_2,
     FIELDS_OPTIONS.SUBSTATION_PROPERTY_1,
     FIELDS_OPTIONS.SUBSTATION_PROPERTY_2,
     FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_1,
@@ -1408,6 +1435,7 @@ const EXPERT_FILTER_FIELDS = {
     FIELDS_OPTIONS.PAIRED,
     FIELDS_OPTIONS.PAIRING_KEY,
     FIELDS_OPTIONS.PROPERTY,
+    FIELDS_OPTIONS.SUBSTATION_ID,
     FIELDS_OPTIONS.SUBSTATION_PROPERTY,
     FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY
   ]

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

@@ -43,7 +43,7 @@ const getOperators = (fieldName, intl) => {
         OPERATOR_OPTIONS.EXISTS,
         OPERATOR_OPTIONS.NOT_EXISTS
       ];
-      if (field.name === FieldType.ID || field.name === FieldType.VOLTAGE_LEVEL_ID || field.name === FieldType.VOLTAGE_LEVEL_ID_1 || field.name === FieldType.VOLTAGE_LEVEL_ID_2 || field.name === FieldType.VOLTAGE_LEVEL_ID_3) {
+      if (field.name === FieldType.ID || field.name === FieldType.VOLTAGE_LEVEL_ID || field.name === FieldType.VOLTAGE_LEVEL_ID_1 || field.name === FieldType.VOLTAGE_LEVEL_ID_2 || field.name === FieldType.VOLTAGE_LEVEL_ID_3 || field.name === FieldType.SUBSTATION_ID || field.name === FieldType.SUBSTATION_ID_1 || field.name === FieldType.SUBSTATION_ID_2) {
         stringOperators.push(OPERATOR_OPTIONS.IS_PART_OF);
         stringOperators.push(OPERATOR_OPTIONS.IS_NOT_PART_OF);
       }

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

@@ -32,12 +32,12 @@ function ValueEditor(props) {
   const { getValues } = formContext;
   const itemFilter = useCallback(
     (filterValue) => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d;
       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)
+          ((_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 true;
@@ -57,6 +57,8 @@ function ValueEditor(props) {
     let equipmentTypes;
     if (field === FieldType.VOLTAGE_LEVEL_ID || field === FieldType.VOLTAGE_LEVEL_ID_1 || field === FieldType.VOLTAGE_LEVEL_ID_2 || field === FieldType.VOLTAGE_LEVEL_ID_3) {
       equipmentTypes = [VoltageLevel.type];
+    } else if (field === FieldType.SUBSTATION_ID || field === FieldType.SUBSTATION_ID_1 || field === FieldType.SUBSTATION_ID_2) {
+      equipmentTypes = [Substation.type];
     } else if (field === FieldType.ID) {
       equipmentTypes = [getValues(FieldConstants.EQUIPMENT_TYPE)];
     }

package/dist/components/treeViewFinder/TreeViewFinder.d.ts

@@ -2,10 +2,12 @@ import { ReactElement } from 'react';
 import { ButtonProps, ModalProps } from '@mui/material';
 import { SimpleTreeViewClasses } from '@mui/x-tree-view';
 import { UUID } from 'crypto';
+import { ElementType } from '../../utils';
 export declare const generateTreeViewFinderClass: (className: string) => string;
 export interface TreeViewFinderNodeProps {
     id: UUID;
     name: string;
+    type?: ElementType;
     description?: string;
     icon?: ReactElement;
     childrenCount?: number;

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

@@ -188,4 +188,7 @@ export declare const filterExpertEn: {
     lowShortCircuitCurrentLimit: string;
     highShortCircuitCurrentLimit: string;
     valuesList: string;
+    substationId: string;
+    substationId1: string;
+    substationId2: string;
 };

package/dist/translations/en/filterExpertEn.js

@@ -181,7 +181,10 @@ const filterExpertEn = {
   changeOperatorMessage: "The operator will be changed and will be applied to all the criteria already created in the group.",
   lowShortCircuitCurrentLimit: "Low short-circuit current limit",
   highShortCircuitCurrentLimit: "High short-circuit current limit",
-  valuesList: "Values list"
+  valuesList: "Values list",
+  substationId: "Substation ID",
+  substationId1: "Substation ID 1",
+  substationId2: "Substation ID 2"
 };
 export {
   filterExpertEn

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

@@ -188,4 +188,7 @@ export declare const filterExpertFr: {
     lowShortCircuitCurrentLimit: string;
     highShortCircuitCurrentLimit: string;
     valuesList: string;
+    substationId: string;
+    substationId1: string;
+    substationId2: string;
 };

package/dist/translations/fr/filterExpertFr.js

@@ -181,7 +181,10 @@ const filterExpertFr = {
   changeOperatorMessage: "L'opérateur sera modifié et s'appliquera sur tous les critères déjà créés dans le groupe.",
   lowShortCircuitCurrentLimit: "Limite ICC min",
   highShortCircuitCurrentLimit: "Limite ICC max",
-  valuesList: "Liste de valeurs"
+  valuesList: "Liste de valeurs",
+  substationId: "ID Site",
+  substationId1: "ID Site 1",
+  substationId2: "ID Site 2"
 };
 export {
   filterExpertFr

package/dist/utils/types/fieldType.d.ts

@@ -107,6 +107,9 @@ export declare enum FieldType {
     PHASE_REGULATION_VALUE_1 = "PHASE_REGULATION_VALUE_1",
     PHASE_REGULATION_VALUE_2 = "PHASE_REGULATION_VALUE_2",
     PHASE_REGULATION_VALUE_3 = "PHASE_REGULATION_VALUE_3",
+    SUBSTATION_ID = "SUBSTATION_ID",
+    SUBSTATION_ID_1 = "SUBSTATION_ID_1",
+    SUBSTATION_ID_2 = "SUBSTATION_ID_2",
     SUBSTATION_PROPERTIES = "SUBSTATION_PROPERTIES",
     SUBSTATION_PROPERTIES_1 = "SUBSTATION_PROPERTIES_1",
     SUBSTATION_PROPERTIES_2 = "SUBSTATION_PROPERTIES_2",

package/dist/utils/types/fieldType.js

@@ -101,6 +101,9 @@ var FieldType = /* @__PURE__ */ ((FieldType2) => {
   FieldType2["PHASE_REGULATION_VALUE_1"] = "PHASE_REGULATION_VALUE_1";
   FieldType2["PHASE_REGULATION_VALUE_2"] = "PHASE_REGULATION_VALUE_2";
   FieldType2["PHASE_REGULATION_VALUE_3"] = "PHASE_REGULATION_VALUE_3";
+  FieldType2["SUBSTATION_ID"] = "SUBSTATION_ID";
+  FieldType2["SUBSTATION_ID_1"] = "SUBSTATION_ID_1";
+  FieldType2["SUBSTATION_ID_2"] = "SUBSTATION_ID_2";
   FieldType2["SUBSTATION_PROPERTIES"] = "SUBSTATION_PROPERTIES";
   FieldType2["SUBSTATION_PROPERTIES_1"] = "SUBSTATION_PROPERTIES_1";
   FieldType2["SUBSTATION_PROPERTIES_2"] = "SUBSTATION_PROPERTIES_2";

package/package.json

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