@gridsuite/commons-ui 0.262.0 → 0.263.0

package/dist/features/network-modifications/battery/creation/batteryCreation.types.d.ts

@@ -8,7 +8,7 @@ export interface BatteryCreationDto {
     maxP: number;
     reactiveCapabilityCurve?: boolean | null;
     targetP: number | null;
-    targetQ: number | null;
+    targetQ: number;
     targetV: number | null;
     voltageRegulationOn: boolean | null;
     regulatingTerminalId: string | null;

package/dist/features/network-modifications/battery/creation/batteryCreation.utils.d.ts

@@ -22,7 +22,7 @@ export declare const batteryCreationFormSchema: import('yup').ObjectSchema<NonNu
         name?: string | null | undefined;
         type?: string | undefined;
     } | null;
-    reactivePowerSetpoint: number | null | undefined;
+    reactivePowerSetpoint: number;
     activePowerSetpoint: number | undefined;
     equipmentID: string;
     equipmentName: string | null | undefined;

package/dist/features/network-modifications/battery/creation/batteryCreation.utils.js

@@ -62,7 +62,7 @@ import "../../../../components/composite/report/report-viewer/log-table/log-tabl
 import "react-window";
 import "../../../../components/composite/report/report-treeview/treeview-item.js";
 import "../../../../components/composite/report/report-viewer/context/report-viewer-context.js";
-import { getSetPointsSchema, getSetPointsEmptyFormData } from "../../common/setpoints/setPoints.utils.js";
+import { getActivePowerSetPointSchema, getSetPointsEmptyFormData } from "../../common/setpoints/setPoints.utils.js";
 import { getActivePowerControlSchema, getActivePowerControlEmptyFormData } from "../../common/activePowerControl/activePowerControlForm.utils.js";
 import { getShortCircuitFormSchema, getShortCircuitEmptyFormData, getShortCircuitFormData } from "../../common/shortCircuit/shortCircuitForm.utils.js";
 import { getReactiveLimitsValidationSchema, getReactiveLimitsEmptyFormDataProps, getReactiveLimitsFormDataProps } from "../../common/reactiveLimits/reactiveLimits.utils.js";
@@ -91,7 +91,9 @@ const batteryCreationFormSchema = object().shape({
   }),
   [FieldConstants.CONNECTIVITY]: getConnectivityWithPositionSchema(false),
   [FieldConstants.REACTIVE_LIMITS]: getReactiveLimitsValidationSchema(),
-  ...getSetPointsSchema(),
+  ...getActivePowerSetPointSchema(),
+  // override for batteries
+  [FieldConstants.REACTIVE_POWER_SET_POINT]: number().nullable().required(),
   ...getVoltageRegulationSchema(),
   ...getActivePowerControlSchema(),
   ...getShortCircuitFormSchema()

package/dist/features/parameters/common/contingency-table/contingency-table.js

@@ -1,15 +1,15 @@
 import { jsxs, Fragment, jsx } from "react/jsx-runtime";
-import { Alert, CircularProgress } from "@mui/material";
+import { Alert, CircularProgress, Box, IconButton, Collapse } from "@mui/material";
 import { forwardRef, useState, useImperativeHandle, useCallback, useEffect, useMemo } from "react";
 import { useIntl, FormattedMessage } from "react-intl";
 import { useFormContext } from "react-hook-form";
+import { ExpandLess, ExpandMore } from "@mui/icons-material";
 import { ACTIVATED, ID } from "../parameter-table-field/constants.js";
 import { ParameterTableField } from "../parameter-table-field/parameter-table-field.js";
 import { COLUMNS_DEFINITIONS_CONTINGENCY_LISTS_INFOS, isValidContingencyRow } from "./columns-definitions.js";
 import "../../../../utils/conversionUtils.js";
 import { snackWithFallback } from "../../../../utils/error.js";
 import "../../../../utils/types/equipmentType.js";
-import "@mui/icons-material";
 import { DEFAULT_TIMEOUT_MS, IGNORE_SIGNAL } from "../../../../services/utils.js";
 import "localized-countries";
 import "localized-countries/data/fr";
@@ -17,6 +17,7 @@ import "localized-countries/data/en";
 import { useSnackMessage } from "../../../../hooks/useSnackMessage.js";
 import { CONTINGENCY_LISTS } from "../constants.js";
 import { mapSimulatedContingencyList } from "./utils.js";
+import NotFoundElementsTable from "./not-found-elements-table.js";
 const styles = {
   alert: { color: "text.primary", paddingTop: 0, paddingBottom: 0 },
   error: { color: "error.main", paddingTop: 0, paddingBottom: 0 }
@@ -30,6 +31,7 @@ function ContingencyTableWithApiRef({ name, showContingencyCount = false, fetchC
     null
   );
   const [contingencyCountRefreshTrigger, setContingencyCountRefreshTrigger] = useState(0);
+  const [expanded, setExpanded] = useState(false);
   useImperativeHandle(
     apiRef,
     () => ({
@@ -95,6 +97,11 @@ function ContingencyTableWithApiRef({ name, showContingencyCount = false, fetchC
     name,
     contingencyCountRefreshTrigger
   ]);
+  useEffect(() => {
+    if (simulatedContingencyCount === null || simulatedContingencyCount.success && simulatedContingencyCount.notFoundElements === 0) {
+      setExpanded(false);
+    }
+  }, [simulatedContingencyCount]);
   const renderContingencyCount = () => {
     if (!isBuiltCurrentNode) {
       return /* @__PURE__ */ jsx(Alert, { variant: "standard", severity: "warning", sx: styles.alert, children: /* @__PURE__ */ jsx(FormattedMessage, { id: "contingencyCountImpossibleOnUnbuiltNode" }) });
@@ -105,16 +112,28 @@ function ContingencyTableWithApiRef({ name, showContingencyCount = false, fetchC
     if (simulatedContingencyCount === null || simulatedContingencyCount.success && simulatedContingencyCount.nbContingencies === 0) {
       return /* @__PURE__ */ jsx(Alert, { variant: "standard", severity: "error", sx: styles.alert, children: /* @__PURE__ */ jsx(FormattedMessage, { id: "noContingency" }) });
     }
-    return simulatedContingencyCount.success ? /* @__PURE__ */ jsx(Alert, { variant: "standard", icon: false, severity: "info", sx: styles.alert, children: /* @__PURE__ */ jsx(
-      FormattedMessage,
-      {
-        id: "xContingenciesWillBeSimulatedAndYNotFound",
-        values: {
-          x: simulatedContingencyCount?.nbContingencies ?? "...",
-          y: simulatedContingencyCount?.notFoundElements ?? "..."
+    return simulatedContingencyCount.success ? /* @__PURE__ */ jsxs(Box, { children: [
+      /* @__PURE__ */ jsx(
+        Alert,
+        {
+          variant: "standard",
+          severity: "info",
+          sx: styles.alert,
+          action: simulatedContingencyCount?.notFoundElements > 0 && /* @__PURE__ */ jsx(IconButton, { "aria-label": "expand", size: "small", onClick: () => setExpanded(!expanded), children: expanded ? /* @__PURE__ */ jsx(ExpandLess, {}) : /* @__PURE__ */ jsx(ExpandMore, {}) }),
+          children: /* @__PURE__ */ jsx(
+            FormattedMessage,
+            {
+              id: "xContingenciesWillBeSimulatedAndYNotFound",
+              values: {
+                x: simulatedContingencyCount?.nbContingencies ?? "...",
+                y: simulatedContingencyCount?.notFoundElements ?? "..."
+              }
+            }
+          )
         }
-      }
-    ) }) : /* @__PURE__ */ jsx(Alert, { variant: "standard", severity: "error", sx: styles.error, children: /* @__PURE__ */ jsx(
+      ),
+      /* @__PURE__ */ jsx(Collapse, { in: expanded, sx: { padding: 1 }, children: /* @__PURE__ */ jsx(NotFoundElementsTable, { data: simulatedContingencyCount?.NotFoundElementsData }) })
+    ] }) : /* @__PURE__ */ jsx(Alert, { variant: "standard", severity: "error", sx: styles.error, children: /* @__PURE__ */ jsx(
       FormattedMessage,
       {
         id: "contingenciesWillNotBeSimulated",

package/dist/features/parameters/common/contingency-table/not-found-elements-table.d.ts

@@ -0,0 +1,5 @@
+import { NotFoundElementsData } from './utils';
+export type NotFoundElementsTableProps = {
+    data: NotFoundElementsData[];
+};
+export default function NotFoundElementsTable({ data }: Readonly<NotFoundElementsTableProps>): import("react").JSX.Element;

package/dist/features/parameters/common/contingency-table/not-found-elements-table.js

@@ -0,0 +1,23 @@
+import { jsx, jsxs } from "react/jsx-runtime";
+import { TableContainer, Table, TableHead, TableRow, TableCell, TableBody } from "@mui/material";
+import { useIntl } from "react-intl";
+function NotFoundElementsTable({ data }) {
+  const intl = useIntl();
+  return /* @__PURE__ */ jsx(TableContainer, { sx: { maxHeight: 370, overflow: "auto" }, children: /* @__PURE__ */ jsxs(Table, { stickyHeader: true, size: "small", children: [
+    /* @__PURE__ */ jsx(TableHead, { children: /* @__PURE__ */ jsxs(TableRow, { children: [
+      /* @__PURE__ */ jsx(TableCell, { children: intl.formatMessage({ id: "ContingenciesList" }) }, "list"),
+      /* @__PURE__ */ jsx(TableCell, { children: intl.formatMessage({ id: "Contingencies" }) }, "contingency"),
+      /* @__PURE__ */ jsx(TableCell, { children: intl.formatMessage({ id: "Equipment" }) }, "element")
+    ] }) }),
+    /* @__PURE__ */ jsx(TableBody, { children: data.map((row) => {
+      return /* @__PURE__ */ jsxs(TableRow, { hover: true, tabIndex: -1, children: [
+        /* @__PURE__ */ jsx(TableCell, { children: row.list }),
+        /* @__PURE__ */ jsx(TableCell, { children: row.contingency }),
+        /* @__PURE__ */ jsx(TableCell, { children: row.element })
+      ] }, `${row.list}-${row.contingency}-${row.element}`);
+    }) })
+  ] }) });
+}
+export {
+  NotFoundElementsTable as default
+};

package/dist/features/parameters/common/contingency-table/utils.d.ts

@@ -4,10 +4,16 @@ export type SuccessCountType = {
     success: true;
     nbContingencies: number;
     notFoundElements: number;
+    NotFoundElementsData: NotFoundElementsData[];
 };
 export type FailureCountType = {
     success: false;
     invalidContingencyErrorMessage: string;
 };
 export type SimulatedContingencyCountType = SuccessCountType | FailureCountType;
+export type NotFoundElementsData = {
+    list: string;
+    contingency: string;
+    element: string;
+};
 export declare function mapSimulatedContingencyList(contingencyCount: ContingencyCount, contingencyListsInfos: ContingencyListsInfosEnriched[]): SimulatedContingencyCountType;

package/dist/features/parameters/common/contingency-table/utils.js

@@ -7,6 +7,7 @@ function mapSimulatedContingencyList(contingencyCount, contingencyListsInfos) {
   });
   let total = 0;
   let totalNotFound = 0;
+  const rows = [];
   for (const [uuid, countByList] of Object.entries(contingencyCount.countByContingencyList)) {
     total += countByList.nbContingencies;
     const listName = namesById[uuid] ?? uuid;
@@ -19,11 +20,23 @@ function mapSimulatedContingencyList(contingencyCount, contingencyListsInfos) {
     if (countByList.notFoundElements !== null) {
       totalNotFound += Object.entries(countByList.notFoundElements).length;
     }
+    if (countByList.notFoundElements && Object.keys(countByList.notFoundElements).length > 0) {
+      Object.entries(countByList.notFoundElements).forEach(([contingency, elements]) => {
+        elements.forEach((element) => {
+          rows.push({
+            list: listName,
+            contingency,
+            element
+          });
+        });
+      });
+    }
   }
   return {
     success: true,
     nbContingencies: total,
-    notFoundElements: totalNotFound
+    notFoundElements: totalNotFound,
+    NotFoundElementsData: rows
   };
 }
 export {

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

@@ -202,7 +202,7 @@ export declare const parametersEn: {
     angleFlowSensitivityValueThreshold: string;
     flowVoltageSensitivityValueThreshold: string;
     ContingencyListsSelection: string;
-    contingencyLists: string;
+    ContingenciesList: string;
     Execute: string;
     AddContingencyList: string;
     DeleteContingencyList: string;

package/dist/translations/en/parameters.js

@@ -196,7 +196,7 @@ const parametersEn = {
   angleFlowSensitivityValueThreshold: "ΔMW ou ΔA / Δ°",
   flowVoltageSensitivityValueThreshold: "ΔkV / kV",
   ContingencyListsSelection: "Contingency lists selection",
-  contingencyLists: "Contingency lists",
+  ContingenciesList: "Contingencies list",
   Execute: "Execute",
   AddContingencyList: "Add",
   DeleteContingencyList: "Delete",

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

@@ -203,7 +203,7 @@ export declare const parametersFr: {
     angleFlowSensitivityValueThreshold: string;
     flowVoltageSensitivityValueThreshold: string;
     ContingencyListsSelection: string;
-    contingencyLists: string;
+    ContingenciesList: string;
     Execute: string;
     AddContingencyList: string;
     DeleteContingencyList: string;

package/dist/translations/fr/parameters.js

@@ -197,7 +197,7 @@ const parametersFr = {
   angleFlowSensitivityValueThreshold: "ΔMW ou ΔA / Δ°",
   flowVoltageSensitivityValueThreshold: "ΔkV / kV",
   ContingencyListsSelection: "Sélection des listes d'aléas",
-  contingencyLists: "Listes d'aléas",
+  ContingenciesList: "Liste d'aléas",
   Execute: "Exécuter",
   AddContingencyList: "Ajouter",
   DeleteContingencyList: "Supprimer",

package/package.json

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