more typing

Signed-off-by: David BRAQUART <david.braquart@rte-france.com>

Author: dbraquart

src/components/dialogs/network-modifications/equipment-deletion/equipement-deletion-dialog.type.ts

@@ -6,13 +6,17 @@
  */
 import { EquipmentType, ModificationType } from '@gridsuite/commons-ui';
 import { UUID } from 'node:crypto';
-import { LccShuntCompensatorInfos } from '../../../../services/network-modification-types';
+
+export interface LccShuntCompensatorConnectionInfos {
+    id: string;
+    connectedToHvdc: boolean;
+}
 
 export interface EquipmentDeletionSpecificInfos {
     specificType: string;
     // below is specific to HVDC-LCC deletion (then specificType = HVDC_LINE_LCC_DELETION_SPECIFIC_TYPE)
-    mcsOnSide1: LccShuntCompensatorInfos[];
-    mcsOnSide2: LccShuntCompensatorInfos[];
+    mcsOnSide1: LccShuntCompensatorConnectionInfos[];
+    mcsOnSide2: LccShuntCompensatorConnectionInfos[];
 }
 
 export type EquipmentDeletionInfos = {

src/components/dialogs/network-modifications/equipment-deletion/equipment-deletion-dialog.tsx

@@ -17,17 +17,18 @@ import { useOpenShortWaitFetching } from 'components/dialogs/commons/handle-modi
 import { FORM_LOADING_DELAY } from 'components/network/constants';
 import { deleteEquipment } from '../../../../services/study/network-modifications';
 import { UUID } from 'node:crypto';
-import { CurrentTreeNode } from 'components/graph/tree-node.type';
 import { FetchStatus } from 'services/utils.type';
 import { DeepNullable } from 'components/utils/ts-utils';
 import { EquipmentDeletionInfos } from './equipement-deletion-dialog.type';
+import { NetworkModificationDialogProps } from '../../../graph/menus/network-modifications/network-modification-menu.type';
+import { getHvdcLccDeletionSchema } from './hvdc-lcc-deletion/hvdc-lcc-deletion-utils';
 
 const formSchema = yup
     .object()
     .shape({
         [EQUIPMENT_ID]: yup.string().nullable().required(),
         [TYPE]: yup.mixed<EquipmentType>().oneOf(Object.values(EquipmentType)).nullable().required(),
-        [DELETION_SPECIFIC_DATA]: yup.string().nullable(),
+        [DELETION_SPECIFIC_DATA]: getHvdcLccDeletionSchema(),
     })
     .required();
 
@@ -39,18 +40,12 @@ const emptyFormData: EquipmentDeletionFormInfos = {
     [DELETION_SPECIFIC_DATA]: null,
 };
 
-interface EquipmentDeletionDialogProps {
-    studyUuid: UUID;
-    currentNode: CurrentTreeNode;
-    currentRootNetworkUuid: UUID;
+type EquipmentDeletionDialogProps = NetworkModificationDialogProps & {
     editData?: EquipmentDeletionInfos;
-    isUpdate: boolean;
     defaultIdValue?: UUID;
     equipmentType: EquipmentType;
     editDataFetchStatus?: FetchStatus;
-    onClose?: () => void;
-    onValidated?: () => void;
-}
+};
 
 /**
  * Dialog to delete equipment from its type and ID.
@@ -95,6 +90,7 @@ const EquipmentDeletionDialog = ({
             reset({
                 [TYPE]: editData.equipmentType,
                 [EQUIPMENT_ID]: editData.equipmentId,
+                [DELETION_SPECIFIC_DATA]: null,
             });
         },
         [reset]
@@ -139,18 +135,16 @@ const EquipmentDeletionDialog = ({
 
     const onSubmit = useCallback(
         (formData: EquipmentDeletionFormInfos) => {
-            if (formData[EQUIPMENT_ID]) {
-                deleteEquipment({
-                    studyUuid,
-                    nodeUuid: currentNodeUuid,
-                    uuid: editData?.uuid,
-                    equipmentId: formData[EQUIPMENT_ID] as UUID,
-                    equipmentType: formData[TYPE],
-                    equipmentSpecificInfos: formData[DELETION_SPECIFIC_DATA],
-                }).catch((error) => {
-                    snackWithFallback(snackError, error, { headerId: 'UnableToDeleteEquipment' });
-                });
-            }
+            deleteEquipment({
+                studyUuid,
+                nodeUuid: currentNodeUuid,
+                uuid: editData?.uuid,
+                equipmentId: formData[EQUIPMENT_ID] as UUID,
+                equipmentType: formData[TYPE],
+                equipmentSpecificInfos: formData[DELETION_SPECIFIC_DATA] ?? undefined,
+            }).catch((error) => {
+                snackWithFallback(snackError, error, { headerId: 'UnableToDeleteEquipment' });
+            });
         },
         [currentNodeUuid, editData, snackError, studyUuid]
     );

src/components/dialogs/network-modifications/equipment-deletion/hvdc-lcc-deletion/hvdc-lcc-deletion-utils.ts

@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2026, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import yup from '../../../../utils/yup-config';
+
+const getMscConnectionsSchema = () =>
+    yup
+        .array()
+        .of(
+            yup.object().shape({
+                id: yup.string().required(),
+                connectedToHvdc: yup.boolean().required(),
+            })
+        )
+        .required();
+
+export const getHvdcLccDeletionSchema = () =>
+    yup
+        .object()
+        .shape({
+            specificType: yup.string().required(),
+            mcsOnSide1: getMscConnectionsSchema(),
+            mcsOnSide2: getMscConnectionsSchema(),
+        })
+        .optional()
+        .nullable();

src/components/dialogs/network-modifications/equipment-deletion/hvdc-lcc-deletion/shunt-compensator-selection-form.tsx

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023, RTE (http://www.rte-france.com)
+ * Copyright (c) 2026, RTE (http://www.rte-france.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.

src/components/dialogs/network-modifications/equipment-deletion/hvdc-lcc-deletion/use-hvdc-lcc-deletion.ts

@@ -16,9 +16,12 @@ import { useCallback } from 'react';
 import { useFieldArray, useFormContext } from 'react-hook-form';
 import { snackWithFallback, useSnackMessage } from '@gridsuite/commons-ui';
 import { fetchHvdcLineWithShuntCompensators } from '../../../../../services/study/network-map';
-import { EquipmentDeletionInfos, HvdcLccDeletionInfos } from '../equipement-deletion-dialog.type';
+import {
+    EquipmentDeletionInfos,
+    HvdcLccDeletionInfos,
+    LccShuntCompensatorConnectionInfos,
+} from '../equipement-deletion-dialog.type';
 import { UUID } from 'node:crypto';
-import { LccShuntCompensatorInfos } from '../../../../../services/network-modification-types';
 
 const useHvdcLccDeletion = () => {
     const { replace: replaceMcsList1 } = useFieldArray({
@@ -32,7 +35,10 @@ const useHvdcLccDeletion = () => {
 
     const updateMcsLists = useCallback(
         (hvdcLineData: HvdcLccDeletionInfos, editData?: EquipmentDeletionInfos) => {
-            function mergeMcsLists(dynamicList: LccShuntCompensatorInfos[], editList: LccShuntCompensatorInfos[]) {
+            function mergeMcsLists(
+                dynamicList: LccShuntCompensatorConnectionInfos[],
+                editList: LccShuntCompensatorConnectionInfos[]
+            ) {
                 if (!dynamicList && !editList) {
                     return [];
                 } else if (!dynamicList) {
@@ -41,7 +47,7 @@ const useHvdcLccDeletion = () => {
                 } else if (!editList) {
                     return dynamicList;
                 }
-                const mergedList: LccShuntCompensatorInfos[] = dynamicList.map((obj) => {
+                const mergedList: LccShuntCompensatorConnectionInfos[] = dynamicList.map((obj) => {
                     return { ...obj, connectedToHvdc: false };
                 });
                 // now overwrite dynamic values with edited modification values

src/services/study/network-modifications.ts

@@ -67,6 +67,7 @@ import {
     OLGS_MODIFICATION_TYPE,
     OPERATIONAL_LIMITS_GROUPS_MODIFICATION_TYPE,
 } from '../../components/utils/field-constants';
+import { EquipmentDeletionSpecificInfos } from '../../components/dialogs/network-modifications/equipment-deletion/equipement-deletion-dialog.type';
 
 function getNetworkModificationUrl(studyUuid: string | null | undefined, nodeUuid: string | undefined) {
     return getStudyUrlWithNodeUuid(studyUuid, nodeUuid) + '/network-modifications';
@@ -1701,12 +1702,12 @@ export function deleteAttachingLine({
 }
 
 export interface DeleteEquipmentInfo {
-    studyUuid: string;
+    studyUuid: UUID;
     nodeUuid: UUID;
     uuid?: UUID;
     equipmentId: UUID;
     equipmentType: EquipmentType;
-    equipmentSpecificInfos?: any;
+    equipmentSpecificInfos?: EquipmentDeletionSpecificInfos;
 }
 
 export function deleteEquipment({