@gridsuite/commons-ui 0.187.0 → 0.189.0

package/dist/components/network-modifications/voltageLevel/creation/VoltageLevelCreationForm.js

@@ -98,7 +98,7 @@ function VoltageLevelCreationForm({
           /* @__PURE__ */ jsx(
             Tab,
             {
-              label: /* @__PURE__ */ jsx(FormattedMessage, { id: "ConnectivityTab" }),
+              label: /* @__PURE__ */ jsx(FormattedMessage, { id: "SubstationTab" }),
               sx: getTabStyle(tabIndexesWithError, VoltageLevelTab.SUBSTATION_TAB)
             }
           ),

package/dist/components/parameters/common/contingency-table/contingency-table.d.ts

@@ -2,6 +2,6 @@ import { UUID } from 'node:crypto';
 import { ContingencyCount } from './types';
 export declare function ContingencyTable({ showContingencyCount, fetchContingencyCount, isBuiltCurrentNode, }: Readonly<{
     showContingencyCount: boolean;
-    fetchContingencyCount?: (contingencyLists: UUID[] | null) => Promise<ContingencyCount>;
+    fetchContingencyCount?: (contingencyLists: UUID[] | null, abortSignal: AbortSignal) => Promise<ContingencyCount>;
     isBuiltCurrentNode?: boolean;
 }>): import("react/jsx-runtime").JSX.Element;

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

@@ -1,16 +1,18 @@
 import { jsxs, jsx } from "react/jsx-runtime";
-import { Stack, Alert } from "@mui/material";
+import { Stack, Alert, CircularProgress } from "@mui/material";
 import { useState, useCallback, useEffect } from "react";
 import { useIntl, FormattedMessage } from "react-intl";
 import { useWatch } from "react-hook-form";
 import "../../../../utils/conversionUtils.js";
+import { snackWithFallback } from "../../../../utils/error.js";
 import "../../../../utils/types/equipmentType.js";
 import "@mui/icons-material";
 import "../../../../utils/yupConfig.js";
+import { DEFAULT_TIMEOUT_MS, IGNORE_SIGNAL } from "../../../../services/utils.js";
 import "localized-countries";
 import "localized-countries/data/fr";
 import "localized-countries/data/en";
-import "notistack";
+import { useSnackMessage } from "../../../../hooks/useSnackMessage.js";
 import { useCreateRowData } from "../../../../hooks/use-create-row-data.js";
 import { ACTIVATED, ID } from "../parameter-table/constants.js";
 import { ParameterTable } from "../parameter-table/parameter-table.js";
@@ -25,6 +27,8 @@ function ContingencyTable({
   const [simulatedContingencyCount, setSimulatedContingencyCount] = useState(null);
   const [rowData, useFieldArrayOutput] = useCreateRowData(ParamContingencyLists);
   const contingencyListsInfos = useWatch({ name: CONTINGENCY_LISTS_INFOS });
+  const [isLoading, setIsLoading] = useState(false);
+  const { snackError } = useSnackMessage();
   const getColumnsDefinition = useCallback(
     (columns) => {
       if (columns) {
@@ -38,27 +42,60 @@ function ContingencyTable({
     [intl]
   );
   useEffect(() => {
-    if (showContingencyCount) {
-      const hasNoContingencies = !contingencyListsInfos || (contingencyListsInfos.length ?? 0) === 0 || contingencyListsInfos.every(
-        (contingencyList) => (contingencyList[CONTINGENCY_LISTS]?.length ?? 0) === 0
-      );
-      if (hasNoContingencies) {
-        setSimulatedContingencyCount(null);
+    if (!showContingencyCount || !isBuiltCurrentNode) {
+      setIsLoading(false);
+      return () => {
+      };
+    }
+    const hasNoContingencies = !contingencyListsInfos || (contingencyListsInfos.length ?? 0) === 0 || contingencyListsInfos.every(
+      (contingencyList) => !contingencyList[ACTIVATED] || (contingencyList[CONTINGENCY_LISTS]?.length ?? 0) === 0
+    );
+    if (hasNoContingencies) {
+      setIsLoading(false);
+      setSimulatedContingencyCount(null);
+      return () => {
+      };
+    }
+    let loadingTimeoutId;
+    const controller = new AbortController();
+    const abortSignal = AbortSignal.any([controller.signal, AbortSignal.timeout(DEFAULT_TIMEOUT_MS)]);
+    setIsLoading(true);
+    fetchContingencyCount?.(
+      contingencyListsInfos.filter((lists) => lists[ACTIVATED]).flatMap((lists) => lists[CONTINGENCY_LISTS]?.map((contingencyList) => contingencyList[ID])),
+      abortSignal
+    ).then((contingencyCount) => {
+      setSimulatedContingencyCount(contingencyCount);
+      loadingTimeoutId = setTimeout(() => {
+        setIsLoading(false);
+      }, 500);
+    }).catch((error) => {
+      setSimulatedContingencyCount(null);
+      if (abortSignal.aborted && abortSignal.reason?.message === IGNORE_SIGNAL) {
         return;
       }
-      fetchContingencyCount?.(
-        contingencyListsInfos.filter((lists) => lists[ACTIVATED]).flatMap((lists) => lists[CONTINGENCY_LISTS]?.map((contingencyList) => contingencyList[ID]))
-      ).then((contingencyCount) => {
-        setSimulatedContingencyCount(contingencyCount);
-      }).catch(() => {
-        setSimulatedContingencyCount(null);
-      });
-    }
-  }, [contingencyListsInfos, fetchContingencyCount, showContingencyCount]);
+      setIsLoading(false);
+      snackWithFallback(snackError, error, { headerId: "getSecurityAnalysisContingenciesCountError" });
+    });
+    return () => {
+      controller?.abort(new Error(IGNORE_SIGNAL));
+      clearTimeout(loadingTimeoutId);
+    };
+  }, [snackError, contingencyListsInfos, fetchContingencyCount, showContingencyCount, isBuiltCurrentNode]);
   const renderContingencyCount = () => {
     if (!isBuiltCurrentNode) {
       return /* @__PURE__ */ jsx(Alert, { variant: "standard", severity: "warning", sx: { color: "text.primary" }, children: /* @__PURE__ */ jsx(FormattedMessage, { id: "contingencyCountImpossibleOnUnbuiltNode" }) });
     }
+    if (isLoading) {
+      return /* @__PURE__ */ jsx(
+        Alert,
+        {
+          variant: "standard",
+          icon: /* @__PURE__ */ jsx(CircularProgress, { size: 22 }),
+          severity: "info",
+          sx: { color: "text.primary" }
+        }
+      );
+    }
     if (simulatedContingencyCount?.contingencies === 0 && simulatedContingencyCount.notFoundElements === 0) {
       return /* @__PURE__ */ jsx(Alert, { variant: "standard", severity: "error", sx: { color: "text.primary" }, children: /* @__PURE__ */ jsx(FormattedMessage, { id: "noContingency" }) });
     }

package/dist/components/parameters/security-analysis/security-analysis-parameters-form.d.ts

@@ -5,7 +5,7 @@ import { ContingencyCount } from '../common/contingency-table/types';
 export declare function SecurityAnalysisParametersForm({ securityAnalysisMethods, showContingencyCount, fetchContingencyCount, isBuiltCurrentNode, renderTitleFields, renderActions, isDeveloperMode, }: Readonly<{
     securityAnalysisMethods: UseSecurityAnalysisParametersFormReturn;
     showContingencyCount: boolean;
-    fetchContingencyCount?: (contingencyListIds: UUID[] | null) => Promise<ContingencyCount>;
+    fetchContingencyCount?: (contingencyListIds: UUID[] | null, abortSignal: AbortSignal) => Promise<ContingencyCount>;
     isBuiltCurrentNode?: boolean;
     renderTitleFields?: () => ReactNode;
     renderActions?: () => ReactNode;

package/dist/components/parameters/security-analysis/security-analysis-parameters-inline.d.ts

@@ -5,7 +5,7 @@ import { ContingencyCount } from '../common/contingency-table/types';
 export declare function SecurityAnalysisParametersInline({ studyUuid, parametersBackend, fetchContingencyCount, isBuiltCurrentNode, setHaveDirtyFields, isDeveloperMode, }: Readonly<{
     studyUuid: UUID | null;
     parametersBackend: UseParametersBackendReturnProps<ComputingType.SECURITY_ANALYSIS>;
-    fetchContingencyCount: (contingencyListIds: UUID[] | null) => Promise<ContingencyCount>;
+    fetchContingencyCount: (contingencyListIds: UUID[] | null, abortSignal: AbortSignal) => Promise<ContingencyCount>;
     isBuiltCurrentNode: boolean;
     setHaveDirtyFields: (isDirty: boolean) => void;
     isDeveloperMode: boolean;

package/dist/index.js

@@ -245,7 +245,7 @@ import { AnnouncementSeverity, ArrayAction } from "./utils/types/types.js";
 import { MODIFICATION_TYPES, ModificationType } from "./utils/types/modificationType.js";
 import { FieldType } from "./utils/types/fieldType.js";
 import { ParameterType } from "./utils/types/parameters.type.js";
-import { SolverTypeInfos } from "./utils/types/dynamic-simulation.type.js";
+import { SolverType } from "./utils/types/dynamic-simulation.type.js";
 import { DistributionType, SensitivityType } from "./utils/types/sensitivity-analysis.type.js";
 import { CalculationType, LoadModelsRule } from "./utils/types/dynamic-margin-calculation.type.js";
 import { OperationType } from "./utils/types/network-modification-types.js";
@@ -783,7 +783,7 @@ export {
   SilentRenewCallbackHandler,
   SliderInput,
   SnackbarProvider,
-  SolverTypeInfos,
+  SolverType,
   SubmitButton,
   Substation,
   SubstationCreationForm,

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

@@ -143,6 +143,7 @@ export declare const networkModificationsEn: {
     Side1: string;
     Side2: string;
     Or: string;
+    SubstationTab: string;
     ConnectivityTab: string;
     CharacteristicsTab: string;
     StructureTab: string;

package/dist/translations/en/networkModificationsEn.js

@@ -150,6 +150,7 @@ const networkModificationsEn = {
   Side2: "Side 2",
   Or: "or",
   // Tabs
+  SubstationTab: "Substation",
   ConnectivityTab: "Connectivity",
   CharacteristicsTab: "Characteristics",
   StructureTab: "Structure",

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

@@ -248,6 +248,7 @@ export declare const parametersEn: {
     fetchSecurityAnalysisParametersError: string;
     fetchSecurityAnalysisProvidersError: string;
     updateSecurityAnalysisParametersError: string;
+    getSecurityAnalysisContingenciesCountError: string;
     fetchSensitivityAnalysisParametersError: string;
     fetchSensitivityAnalysisProvidersError: string;
     updateSensitivityAnalysisParametersError: string;

package/dist/translations/en/parameters.js

@@ -245,6 +245,7 @@ const parametersEn = {
   fetchSecurityAnalysisParametersError: "An error occured when fetching the security analysis parameters",
   fetchSecurityAnalysisProvidersError: "An error occured when fetching security analysis provider list",
   updateSecurityAnalysisParametersError: "An error occurred while updating the security analysis parameters",
+  getSecurityAnalysisContingenciesCountError: "An error occurred while estimating security analysis contingencies count",
   // SensitivityAnalysis
   fetchSensitivityAnalysisParametersError: "An error occured when fetching the sensitivity analysis parameters",
   fetchSensitivityAnalysisProvidersError: "An error occured when fetching sensitivity analysis provider list",

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

@@ -143,6 +143,7 @@ export declare const networkModificationsFr: {
     Side1: string;
     Side2: string;
     Or: string;
+    SubstationTab: string;
     ConnectivityTab: string;
     CharacteristicsTab: string;
     StructureTab: string;

package/dist/translations/fr/networkModificationsFr.js

@@ -150,6 +150,7 @@ const networkModificationsFr = {
   Side2: "Côté 2",
   Or: "ou",
   // Tabs
+  SubstationTab: "Site",
   ConnectivityTab: "Connectivité",
   CharacteristicsTab: "Caractéristiques",
   StructureTab: "Structure",

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

@@ -248,6 +248,7 @@ export declare const parametersFr: {
     fetchSecurityAnalysisParametersError: string;
     fetchSecurityAnalysisProvidersError: string;
     updateSecurityAnalysisParametersError: string;
+    getSecurityAnalysisContingenciesCountError: string;
     fetchSensitivityAnalysisParametersError: string;
     fetchSensitivityAnalysisProvidersError: string;
     updateSensitivityAnalysisParametersError: string;

package/dist/translations/fr/parameters.js

@@ -245,6 +245,7 @@ const parametersFr = {
   fetchSecurityAnalysisParametersError: "Une erreur est survenue lors de la récupération des paramètres de l'analyse de sécurité",
   fetchSecurityAnalysisProvidersError: "Une erreur est survenue lors de la récupération des fournisseurs d'analyse de sécurité",
   updateSecurityAnalysisParametersError: "Une erreur est survenue lors de la mise a jour des paramètres de l'analyse de sécurité",
+  getSecurityAnalysisContingenciesCountError: "Une erreur est survenue lors de l'estimation du nombre d'aléas de l'analyse de sécurité",
   // SensitivityAnalysis
   fetchSensitivityAnalysisParametersError: "Une erreur est survenue lors de la récupération des paramètres de l'analyse de sensibilité",
   fetchSensitivityAnalysisProvidersError: "Une erreur est survenue lors de la récupération des fournisseurs d'analyse de sensibilité",

package/dist/utils/index.js

@@ -27,7 +27,7 @@ import { AnnouncementSeverity, ArrayAction } from "./types/types.js";
 import { MODIFICATION_TYPES, ModificationType } from "./types/modificationType.js";
 import { FieldType } from "./types/fieldType.js";
 import { ParameterType } from "./types/parameters.type.js";
-import { SolverTypeInfos } from "./types/dynamic-simulation.type.js";
+import { SolverType } from "./types/dynamic-simulation.type.js";
 import { DistributionType, SensitivityType } from "./types/sensitivity-analysis.type.js";
 import { CalculationType, LoadModelsRule } from "./types/dynamic-margin-calculation.type.js";
 import { OperationType } from "./types/network-modification-types.js";
@@ -115,7 +115,7 @@ export {
   SVC,
   SensitivityType,
   ShuntCompensator,
-  SolverTypeInfos,
+  SolverType,
   Substation,
   SusceptanceAdornment,
   TYPE_TAG_MAX_SIZE,

package/dist/utils/types/dynamic-simulation.type.d.ts

@@ -1,12 +1,11 @@
 import { UUID } from 'node:crypto';
-export declare enum SolverTypeInfos {
+export declare enum SolverType {
     IDA = "IDA",
     SIM = "SIM"
 }
 type CommonSolverInfos = {
-    id: string;
-    name: string;
-    type: SolverTypeInfos;
+    id: UUID;
+    type: SolverType;
     fNormTolAlg: number;
     initialAddTolAlg: number;
     scStepTolAlg: number;
@@ -32,8 +31,7 @@ type CommonSolverInfos = {
     minimalAcceptableStep: number;
 };
 type IdaSolverInfos = CommonSolverInfos & {
-    name: 'IDA';
-    type: SolverTypeInfos.IDA;
+    type: SolverType.IDA;
     order: number;
     initStep: number;
     minStep: number;
@@ -42,8 +40,7 @@ type IdaSolverInfos = CommonSolverInfos & {
     relAccuracy: number;
 };
 type SimSolverInfos = CommonSolverInfos & {
-    name: 'SIM';
-    type: SolverTypeInfos.SIM;
+    type: SolverType.SIM;
     hMin: number;
     hMax: number;
     kReduceStep: number;
@@ -63,8 +60,9 @@ type SimSolverInfos = CommonSolverInfos & {
     minimumModeChangeTypeForAlgebraicRestoration: string;
     minimumModeChangeTypeForAlgebraicRestorationInit: string;
 };
-type NetworkInfos = Record<string, number | string | boolean>;
+type NetworkInfos = Record<string, UUID | number | string | boolean>;
 type CurveInfos = {
+    id?: UUID;
     equipmentType?: string;
     equipmentId: string;
     variableId: string;
@@ -95,11 +93,12 @@ export type MappingInfos = {
     name: string;
 };
 export type DynamicSimulationParametersInfos = {
+    id?: UUID;
     provider?: string;
     startTime?: number;
     stopTime?: number;
     mapping?: string;
-    solverId: string;
+    solver: SolverType;
     solvers?: SolverInfos[];
     network?: NetworkInfos;
     curves?: CurveInfos[] | null;

package/dist/utils/types/dynamic-simulation.type.js

@@ -1,8 +1,8 @@
-var SolverTypeInfos = /* @__PURE__ */ ((SolverTypeInfos2) => {
-  SolverTypeInfos2["IDA"] = "IDA";
-  SolverTypeInfos2["SIM"] = "SIM";
-  return SolverTypeInfos2;
-})(SolverTypeInfos || {});
+var SolverType = /* @__PURE__ */ ((SolverType2) => {
+  SolverType2["IDA"] = "IDA";
+  SolverType2["SIM"] = "SIM";
+  return SolverType2;
+})(SolverType || {});
 export {
-  SolverTypeInfos
+  SolverType
 };

package/dist/utils/types/index.js

@@ -8,7 +8,7 @@ import { AnnouncementSeverity, ArrayAction } from "./types.js";
 import { MODIFICATION_TYPES, ModificationType } from "./modificationType.js";
 import { FieldType } from "./fieldType.js";
 import { ParameterType } from "./parameters.type.js";
-import { SolverTypeInfos } from "./dynamic-simulation.type.js";
+import { SolverType } from "./dynamic-simulation.type.js";
 import { DistributionType, SensitivityType } from "./sensitivity-analysis.type.js";
 import { CalculationType, LoadModelsRule } from "./dynamic-margin-calculation.type.js";
 import { OperationType } from "./network-modification-types.js";
@@ -47,7 +47,7 @@ export {
   SVC,
   SensitivityType,
   ShuntCompensator,
-  SolverTypeInfos,
+  SolverType,
   Substation,
   TYPE_TAG_MAX_SIZE,
   ThreeWindingTransfo,

package/package.json

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