Merge branch 'main' into limitsProperties

Author: basseche

package-lock.json

@@ -11,7 +11,7 @@
     "dependencies": {
         "@emotion/react": "^11.14.0",
         "@emotion/styled": "^11.14.1",
-        "@gridsuite/commons-ui": "0.128.0",
+        "@gridsuite/commons-ui": "0.131.0",
         "@hello-pangea/dnd": "^18.0.1",
         "@hookform/resolvers": "^4.1.3",
         "@mui/icons-material": "^5.18.0",
@@ -43,14 +43,14 @@
         "react-plotly.js": "^2.6.0",
         "react-redux": "^9.2.0",
         "react-resizable": "^3.0.5",
-        "react-resizable-panels": "^2.1.9",
+        "react-resizable-panels": "^3.0.6",
         "react-router": "^7.8.2",
         "react-virtualized-auto-sizer": "^1.0.26",
         "react-window": "^1.8.11",
         "reconnecting-websocket": "^4.4.0",
         "redux": "^5.0.1",
         "typeface-roboto": "^1.1.13",
-        "uuid": "^11.1.0",
+        "uuid": "^13.0.0",
         "yup": "^1.7.0"
     },
     "overrides": {
@@ -84,7 +84,7 @@
         "@types/eslint": "^8.56.12",
         "@types/eslint-config-prettier": "^6.11.3",
         "@types/identity-obj-proxy": "^3.0.2",
-        "@types/jest": "^29.5.14",
+        "@types/jest": "^30.0.0",
         "@types/json-schema": "^7.0.15",
         "@types/license-checker": "^25.0.6",
         "@types/localized-countries": "^2.0.3",
@@ -115,12 +115,11 @@
         "eslint-plugin-react-hooks": "^4.6.2",
         "eslint-plugin-react-refresh": "^0.4.20",
         "identity-obj-proxy": "^3.0.0",
-        "jest": "^29.7.0",
-        "jest-environment-jsdom": "^29.7.0",
+        "jest": "^30.1.3",
+        "jest-environment-jsdom": "^30.1.2",
         "license-checker": "^25.0.1",
         "prettier": "^3.6.2",
         "prettier-plugin-properties": "^0.3.0",
-        "svgo": "^3.3.2",
         "ts-node": "^10.9.2",
         "type-fest": "^4.41.0",
         "typescript": "~5.6.3",

package.json

@@ -6,7 +6,7 @@
  */
 
 import { Box, ListItemText, MenuItem, Select } from '@mui/material';
-import { UUID } from 'crypto';
+import type { UUID } from 'node:crypto';
 import { RemoveRedEye, VisibilityOff } from '@mui/icons-material';
 import { RootNetworkMetadata } from '../graph/menus/network-modifications/network-modification-menu.type';
 import { useSyncNavigationActions } from 'hooks/use-sync-navigation-actions';

src/components/breadcrumbs/root-network-select.tsx

@@ -12,7 +12,7 @@ import { CurrentTreeNode } from '../graph/tree-node.type';
 import { useSelector } from 'react-redux';
 import { AppState } from '../../redux/reducer';
 import { RootNetworkMetadata } from '../graph/menus/network-modifications/network-modification-menu.type';
-import { UUID } from 'crypto';
+import type { UUID } from 'node:crypto';
 import KeyboardArrowRightIcon from '@mui/icons-material/KeyboardArrowRight';
 import RootNetworkSelect from './root-network-select';
 

src/components/breadcrumbs/study-path-breadcrumbs.tsx

@@ -10,15 +10,14 @@ import {
     getDynamicSecurityAnalysisRunningStatus,
     getDynamicSimulationRunningStatus,
     getLoadFlowRunningStatus,
-    getNonEvacuatedEnergyRunningStatus,
     getSecurityAnalysisRunningStatus,
     getSensitivityAnalysisRunningStatus,
     getShortCircuitAnalysisRunningStatus,
     getStateEstimationRunningStatus,
     getVoltageInitRunningStatus,
 } from '../utils/running-status';
 
-import { UUID } from 'crypto';
+import type { UUID } from 'node:crypto';
 import { ComputingType } from '@gridsuite/commons-ui';
 import { fetchSensitivityAnalysisStatus } from '../../services/study/sensitivity-analysis';
 import { fetchSecurityAnalysisStatus } from '../../services/study/security-analysis';
@@ -31,7 +30,6 @@ import { fetchVoltageInitStatus } from '../../services/study/voltage-init';
 import { fetchLoadFlowStatus, fetchLoadFlowComputationInfos } from '../../services/study/loadflow';
 import { OptionalServicesNames } from '../utils/optional-services';
 import { useOptionalServiceStatus } from '../../hooks/use-optional-service-status';
-import { fetchNonEvacuatedEnergyStatus } from '../../services/study/non-evacuated-energy';
 import { fetchStateEstimationStatus } from '../../services/study/state-estimation';
 import { fetchDynamicSecurityAnalysisStatus } from '../../services/study/dynamic-security-analysis';
 import { NotificationType } from 'types/notification-types';
@@ -46,10 +44,6 @@ const sensitivityAnalysisStatusInvalidations = [
     NotificationType.SENSITIVITY_ANALYSIS_STATUS,
     NotificationType.SENSITIVITY_ANALYSIS_FAILED,
 ];
-const nonEvacuatedEnergyStatusInvalidations = [
-    NotificationType.NON_EVACUATED_ENERGY_ANALYSIS_STATUS,
-    NotificationType.NON_EVACUATED_ENERGY_ANALYSIS_FAILED,
-];
 const shortCircuitAnalysisStatusInvalidations = [
     NotificationType.SHORTCIRCUIT_ANALYSIS_STATUS,
     NotificationType.SHORTCIRCUIT_ANALYSIS_FAILED,
@@ -82,10 +76,6 @@ const sensitivityAnalysisStatusCompletions = [
     NotificationType.SENSITIVITY_ANALYSIS_RESULT,
     NotificationType.SENSITIVITY_ANALYSIS_FAILED,
 ];
-const nonEvacuatedEnergyStatusCompletions = [
-    NotificationType.NON_EVACUATED_ENERGY_ANALYSIS_RESULT,
-    NotificationType.NON_EVACUATED_ENERGY_ANALYSIS_FAILED,
-];
 const shortCircuitAnalysisStatusCompletions = [
     NotificationType.SHORTCIRCUIT_ANALYSIS_RESULT,
     NotificationType.SHORTCIRCUIT_ANALYSIS_FAILED,
@@ -111,7 +101,6 @@ const stateEstimationStatusCompletions = [
 // result invalidations
 export const loadflowResultInvalidations = [NotificationType.LOADFLOW_RESULT];
 export const securityAnalysisResultInvalidations = [NotificationType.SECURITY_ANALYSIS_RESULT];
-export const nonEvacuatedEnergyResultInvalidations = [NotificationType.NON_EVACUATED_ENERGY_ANALYSIS_RESULT];
 export const dynamicSimulationResultInvalidations = [NotificationType.DYNAMIC_SIMULATION_RESULT];
 export const dynamicSecurityAnalysisResultInvalidations = [NotificationType.DYNAMIC_SECURITY_ANALYSIS_RESULT];
 export const voltageInitResultInvalidations = [NotificationType.VOLTAGE_INIT_RESULT];
@@ -121,7 +110,6 @@ export const stateEstimationResultInvalidations = [NotificationType.STATE_ESTIMA
 export const useAllComputingStatus = (studyUuid: UUID, currentNodeUuid: UUID, currentRootNetworkUuid: UUID): void => {
     const securityAnalysisAvailability = useOptionalServiceStatus(OptionalServicesNames.SecurityAnalysis);
     const sensitivityAnalysisAvailability = useOptionalServiceStatus(OptionalServicesNames.SensitivityAnalysis);
-    const nonEvacuatedEnergyAvailability = useOptionalServiceStatus(OptionalServicesNames.SensitivityAnalysis);
     const dynamicSimulationAvailability = useOptionalServiceStatus(OptionalServicesNames.DynamicSimulation);
     const dynamicSecurityAnalysisAvailability = useOptionalServiceStatus(OptionalServicesNames.DynamicSecurityAnalysis);
     const voltageInitAvailability = useOptionalServiceStatus(OptionalServicesNames.VoltageInit);
@@ -166,19 +154,6 @@ export const useAllComputingStatus = (studyUuid: UUID, currentNodeUuid: UUID, cu
         sensitivityAnalysisAvailability
     );
 
-    useComputingStatus(
-        studyUuid,
-        currentNodeUuid,
-        currentRootNetworkUuid,
-        fetchNonEvacuatedEnergyStatus,
-        nonEvacuatedEnergyStatusInvalidations,
-        nonEvacuatedEnergyStatusCompletions,
-        getNonEvacuatedEnergyRunningStatus,
-        ComputingType.NON_EVACUATED_ENERGY_ANALYSIS,
-        undefined,
-        nonEvacuatedEnergyAvailability
-    );
-
     useComputingStatus(
         studyUuid,
         currentNodeUuid,

src/components/computing-status/use-all-computing-status.ts

@@ -6,7 +6,7 @@
  */
 
 import { RunningStatus } from 'components/utils/running-status';
-import { UUID } from 'crypto';
+import type { UUID } from 'node:crypto';
 import { RefObject, useCallback, useEffect, useRef } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { ComputingType } from '@gridsuite/commons-ui';

src/components/computing-status/use-computing-status.ts

@@ -11,7 +11,7 @@ import React, { ComponentType } from 'react';
 import { ColumnMenuProps } from '../../spreadsheet-view/columns/column-menu';
 import { SortParams } from '../hooks/use-custom-aggrid-sort';
 import { COLUMN_TYPES, CustomCellType } from '../custom-aggrid-header.type';
-import { UUID } from 'crypto';
+import type { UUID } from 'node:crypto';
 
 export enum FILTER_DATA_TYPES {
     TEXT = 'text',

src/components/custom-aggrid/custom-aggrid-filters/custom-aggrid-filter.type.ts

@@ -9,7 +9,7 @@ import { Grid } from '@mui/material';
 import { ConnectivityForm } from './connectivity-form';
 import { CONNECTIVITY, CONNECTIVITY_1, CONNECTIVITY_2 } from 'components/utils/field-constants';
 import useVoltageLevelsListInfos from '../../../hooks/use-voltage-levels-list-infos';
-import { UUID } from 'crypto';
+import type { UUID } from 'node:crypto';
 import GridSection from '../commons/grid-section';
 import GridItem from '../commons/grid-item';
 import { CurrentTreeNode } from '../../graph/tree-node.type';

src/components/dialogs/connectivity/branch-connectivity-form.tsx

@@ -38,7 +38,7 @@ import { fetchBusesOrBusbarSectionsForVoltageLevel } from 'services/study/networ
 import CheckboxNullableInput from '../../utils/rhf-inputs/boolean-nullable-input';
 import { areIdsEqual, getObjectId } from '../../utils/utils';
 import { getConnectivityBusBarSectionData, getConnectivityVoltageLevelData } from './connectivity-form-utils';
-import { UUID } from 'crypto';
+import type { UUID } from 'node:crypto';
 import { ConnectablePositionFormInfos } from './connectivity.type';
 import { CurrentTreeNode } from '../../graph/tree-node.type';
 

src/components/dialogs/connectivity/connectivity-form.tsx

@@ -21,7 +21,7 @@ import { fetchContingencyCount } from '../../services/study';
 import { isNodeBuilt } from 'components/graph/util/model-functions';
 import DeleteIcon from '@mui/icons-material/Delete';
 import IconButton from '@mui/material/IconButton';
-import { UUID } from 'crypto';
+import type { UUID } from 'node:crypto';
 import { toggleElementFromList } from 'components/utils/utils';
 import { Alert, Button, Dialog, DialogActions, DialogContent, DialogTitle, Grid, Typography } from '@mui/material';
 import { AppState } from '../../redux/reducer';