remove unecessary EquipmentUpdateType

Author: Tristan-WorkGH

src/components/spreadsheet-view/spreadsheet/spreadsheet-content/hooks/use-spreadsheet-equipments.ts

@@ -17,7 +17,7 @@ import {
     resetEquipmentsByTypes,
     updateEquipments,
 } from 'redux/actions';
-import { type AppState, EquipmentUpdateType } from 'redux/reducer';
+import { type AppState } from 'redux/reducer';
 import { SpreadsheetEquipmentType } from '../../../types/spreadsheet.type';
 import { fetchAllEquipments } from 'services/study/network-map';
 import type { NodeAlias } from '../../../types/node-alias.type';
@@ -28,47 +28,6 @@ import { NodeType } from '../../../../graph/tree-node.type';
 import { validAlias } from '../../../hooks/use-node-aliases';
 import { fetchNetworkElementInfos } from 'services/study/network';
 
-const getEquipmentUpdateTypeFromType = (type: SpreadsheetEquipmentType) => {
-    switch (type) {
-        case 'SUBSTATION':
-            return EquipmentUpdateType.SUBSTATIONS;
-        case 'VOLTAGE_LEVEL':
-            return EquipmentUpdateType.VOLTAGE_LEVELS;
-        case 'TIE_LINE':
-            return EquipmentUpdateType.TIE_LINES;
-        case 'LINE':
-            return EquipmentUpdateType.LINES;
-        case 'TWO_WINDINGS_TRANSFORMER':
-            return EquipmentUpdateType.TWO_WINDINGS_TRANSFORMERS;
-        case 'THREE_WINDINGS_TRANSFORMER':
-            return EquipmentUpdateType.THREE_WINDINGS_TRANSFORMERS;
-        case 'HVDC_LINE':
-            return EquipmentUpdateType.HVDC_LINES;
-        case 'BUS':
-            return EquipmentUpdateType.BUSES;
-        case 'BUSBAR_SECTION':
-            return EquipmentUpdateType.BUSBAR_SECTIONS;
-        case 'GENERATOR':
-            return EquipmentUpdateType.GENERATORS;
-        case 'BATTERY':
-            return EquipmentUpdateType.BATTERIES;
-        case 'LOAD':
-            return EquipmentUpdateType.LOADS;
-        case 'SHUNT_COMPENSATOR':
-            return EquipmentUpdateType.SHUNT_COMPENSATORS;
-        case 'DANGLING_LINE':
-            return EquipmentUpdateType.DANGLING_LINES;
-        case 'STATIC_VAR_COMPENSATOR':
-            return EquipmentUpdateType.STATIC_VAR_COMPENSATORS;
-        case 'VSC_CONVERTER_STATION':
-            return EquipmentUpdateType.VSC_CONVERTER_STATIONS;
-        case 'LCC_CONVERTER_STATION':
-            return EquipmentUpdateType.LCC_CONVERTER_STATIONS;
-        default:
-            return;
-    }
-};
-
 export const useSpreadsheetEquipments = (
     type: SpreadsheetEquipmentType,
     equipmentToUpdateId: string | null,
@@ -210,13 +169,7 @@ export const useSpreadsheetEquipments = (
                         false
                     ).then((value: Identifiable) => {
                         highlightUpdatedEquipment();
-                        const updateType = getEquipmentUpdateTypeFromType(type);
-                        if (updateType) {
-                            const equipmentsToUpdate: Partial<Record<EquipmentUpdateType, Identifiable[]>> = {
-                                [updateType]: [value],
-                            };
-                            dispatch(updateEquipments(equipmentsToUpdate, nodeId));
-                        }
+                        dispatch(updateEquipments({ [type]: [value] }, nodeId));
                     });
                 }
             }

src/redux/actions.ts

@@ -13,32 +13,31 @@ import {
     PARAM_USE_NAME,
     PARAMS_LOADED,
 } from '../utils/config-params';
-import { Action } from 'redux';
+import type { Action } from 'redux';
 import {
-    GsLang,
-    GsLangUser,
-    GsTheme,
-    Identifiable,
-    NetworkVisualizationParameters,
     ComputingType,
+    type GsLang,
+    type GsLangUser,
+    type GsTheme,
+    type Identifiable,
+    type NetworkVisualizationParameters,
 } from '@gridsuite/commons-ui';
-import { UUID } from 'crypto';
+import type { UUID } from 'crypto';
 import type { UnknownArray } from 'type-fest';
-import NetworkModificationTreeModel from '../components/graph/network-modification-tree-model';
+import type NetworkModificationTreeModel from '../components/graph/network-modification-tree-model';
 import type { MapHvdcLine, MapLine, MapSubstation, MapTieLine } from '@powsybl/network-viewer';
 import type {
     AppState,
-    EquipmentUpdateType,
+    ComputingStatusParameters,
     GlobalFilterSpreadsheetState,
     NodeSelectionForCopy,
     OneBusShortCircuitAnalysisDiagram,
     SpreadsheetFilterState,
     TableSortKeysType,
-    ComputingStatusParameters,
 } from './reducer';
-import { RunningStatus } from '../components/utils/running-status';
-import { IOptionalService } from '../components/utils/optional-services';
-import { GlobalFilter } from '../components/results/common/global-filter/global-filter-types';
+import type { RunningStatus } from '../components/utils/running-status';
+import type { IOptionalService } from '../components/utils/optional-services';
+import type { GlobalFilter } from '../components/results/common/global-filter/global-filter-types';
 import {
     DYNAMIC_SIMULATION_RESULT_STORE_FIELD,
     LOADFLOW_RESULT_STORE_FIELD,
@@ -53,15 +52,15 @@ import { StudyDisplayMode } from '../components/network-modification.type';
 import { CurrentTreeNode, NetworkModificationNodeData, RootNodeData } from '../components/graph/tree-node.type';
 import type GSMapEquipments from 'components/network/gs-map-equipments';
 import {
-    SpreadsheetEquipmentsByNodes,
-    ColumnDefinition,
+    type ColumnDefinition,
+    type SpreadsheetEquipmentsByNodes,
     SpreadsheetEquipmentType,
-    SpreadsheetTabDefinition,
+    type SpreadsheetTabDefinition,
 } from '../components/spreadsheet-view/types/spreadsheet.type';
 import { FilterConfig, SortConfig } from '../types/custom-aggrid-types';
 import type { DiagramType } from '../components/diagrams/diagram.type';
-import { RootNetworkMetadata } from 'components/graph/menus/network-modifications/network-modification-menu.type';
-import { NodeInsertModes, RootNetworkIndexationStatus, StudyUpdateEventData } from 'types/notification-types';
+import type { RootNetworkMetadata } from 'components/graph/menus/network-modifications/network-modification-menu.type';
+import type { NodeInsertModes, RootNetworkIndexationStatus, StudyUpdateEventData } from 'types/notification-types';
 
 export type TableValue<TValue = unknown> = {
     uuid: UUID;
@@ -224,13 +223,13 @@ export function removeEquipmentData(equipmentType: SpreadsheetEquipmentType): Re
 
 export const UPDATE_EQUIPMENTS = 'UPDATE_EQUIPMENTS';
 export type UpdateEquipmentsAction = Readonly<Action<typeof UPDATE_EQUIPMENTS>> & {
-    equipments: Partial<Record<EquipmentUpdateType, Identifiable[]>>;
+    equipments: Partial<Record<SpreadsheetEquipmentType, Identifiable[]>>;
     nodeId: UUID;
 };
 
 export function updateEquipments(
-    equipments: Partial<Record<EquipmentUpdateType, Identifiable[]>>,
-    nodeId: UUID
+    equipments: UpdateEquipmentsAction['equipments'],
+    nodeId: UpdateEquipmentsAction['nodeId']
 ): UpdateEquipmentsAction {
     return {
         type: UPDATE_EQUIPMENTS,