display current root network name on root node (#3081)

* display current root network name on root node
---------

Signed-off-by: SOUISSI Maissa (Externe) <[email protected]>

Author: souissimai

src/components/graph/network-modification-tree-model.ts

@@ -274,20 +274,4 @@ export default class NetworkModificationTreeModel {
         this.isAnyNodeBuilding =
             this.treeNodes.find((node) => node?.data?.globalBuildStatus === BUILD_STATUS.BUILDING) !== undefined;
     }
-
-    setCaseName(newCaseName: string) {
-        if (this.treeNodes.length > 0 && this.treeNodes[0].data && newCaseName) {
-            const nodeWithOldName = this.treeNodes[0];
-            //check if the node we are modifying is a ROOT node
-            if (isReactFlowRootNodeData(nodeWithOldName)) {
-                this.treeNodes[0] = {
-                    ...nodeWithOldName,
-                    data: {
-                        ...nodeWithOldName.data,
-                        caseName: newCaseName,
-                    },
-                };
-            }
-        }
-    }
 }

src/components/graph/nodes/root-node.tsx

@@ -42,6 +42,13 @@ const styles = {
 
 const RootNode = (props: NodeProps<RootNodeType>) => {
     const currentNode = useSelector((state: AppState) => state.currentTreeNode);
+    const currentRootNetworkUuid = useSelector((state: AppState) => state.currentRootNetworkUuid);
+    const rootNetworks = useSelector((state: AppState) => state.rootNetworks);
+
+    const currentRootNetwork = rootNetworks.find(
+        (rootNetwork) => rootNetwork.rootNetworkUuid === currentRootNetworkUuid
+    );
+
     const isSelectedNode = () => {
         return props.id === currentNode?.id;
     };
@@ -57,7 +64,7 @@ const RootNode = (props: NodeProps<RootNodeType>) => {
                 }}
                 isConnectable={false}
             />
-            <Tooltip title={props.data.caseName} placement="top" disableHoverListener={!props.data.caseName}>
+            <Tooltip title={currentRootNetwork?.name} placement="top" disableHoverListener={!currentRootNetwork?.name}>
                 <IconButton sx={isSelectedNode() ? styles.rootSelected : styles.root}>
                     {(props.data.globalBuildStatus === BUILD_STATUS.BUILDING && <CircularProgress size={24} />) || (
                         <PhotoIcon />

src/components/graph/tree-node.type.ts

@@ -65,7 +65,7 @@ export type NetworkModificationNodeData = AbstractNode & {
     nodeType?: NetworkModificationNodeType;
 };
 
-type NodeCommonData = {
+export type NodeCommonData = {
     label: string;
     globalBuildStatus?: BUILD_STATUS;
     description?: string;
@@ -78,8 +78,7 @@ export type ModificationNode = Node<ReactFlowModificationNodeData, NodeType.NETW
     id: UUID;
 };
 
-export type ReactFlowRootNodeData = NodeCommonData & { caseName?: string };
-export type RootNode = Node<ReactFlowRootNodeData, NodeType.ROOT> & { id: UUID };
+export type RootNode = Node<NodeCommonData, NodeType.ROOT> & { id: UUID };
 
 export type CurrentTreeNode = ModificationNode | RootNode;
 

src/components/graph/util/model-functions.ts

@@ -11,9 +11,9 @@ import type NetworkModificationTreeModel from '../network-modification-tree-mode
 import {
     CurrentTreeNode,
     NetworkModificationNodeData,
+    NodeCommonData,
     NodeType,
     ReactFlowModificationNodeData,
-    ReactFlowRootNodeData,
     RootNodeData,
 } from '../tree-node.type';
 
@@ -35,7 +35,7 @@ export function isRootNode(node: NetworkModificationNodeData | RootNodeData): no
     return node.type === NodeType.ROOT;
 }
 
-function convertRootNodeToReactFlowModelNode(node: NetworkModificationNodeData | RootNodeData): ReactFlowRootNodeData {
+function convertRootNodeToReactFlowModelNode(node: NetworkModificationNodeData | RootNodeData): NodeCommonData {
     return {
         label: node.name,
         description: node.description ?? undefined,

src/components/study-container.jsx

@@ -32,7 +32,6 @@ import NetworkModificationTreeModel from './graph/network-modification-tree-mode
 import { getFirstNodeOfType, isNodeBuilt, isNodeRenamed, isSameNode } from './graph/util/model-functions';
 import { BUILD_STATUS } from './network/constants';
 import { useAllComputingStatus } from './computing-status/use-all-computing-status';
-import { fetchCaseName } from '../services/study/index';
 import { fetchNetworkModificationTree } from '../services/study/tree-subtree';
 import { fetchNetworkExistence, fetchRootNetworkIndexationStatus } from '../services/study/network';
 import { fetchStudy, recreateStudyNetwork, reindexAllRootNetwork } from 'services/study/study';
@@ -293,19 +292,8 @@ export function StudyContainer({ view, onChangeTab }) {
                 .then((tree) => {
                     const networkModificationTreeModel = new NetworkModificationTreeModel();
                     networkModificationTreeModel.setTreeElements(tree);
+                    dispatch(loadNetworkModificationTreeSuccess(networkModificationTreeModel));
 
-                    fetchCaseName(studyUuid, currentRootNetworkUuid)
-                        .then((res) => {
-                            if (res) {
-                                networkModificationTreeModel.setCaseName(res);
-                                dispatch(loadNetworkModificationTreeSuccess(networkModificationTreeModel));
-                            }
-                        })
-                        .catch((err) => {
-                            snackWarning({
-                                headerId: 'CaseNameLoadError',
-                            });
-                        });
                     // If a current node is already defined then override it cause it could have diferent status in different root networks
                     if (currentNodeRef.current) {
                         // Find the updated current node in the tree model
@@ -348,7 +336,7 @@ export function StudyContainer({ view, onChangeTab }) {
                 .finally(() => console.debug('Network modification tree loading finished'));
             // Note: studyUuid and dispatch don't change
         },
-        [studyUuid, currentRootNetworkUuid, dispatch, snackError, snackWarning]
+        [studyUuid, currentRootNetworkUuid, dispatch, snackError]
     );
 
     const checkRootNetworkIndexation = useCallback(() => {

src/services/study/index.ts

@@ -295,14 +295,6 @@ export function buildNode(studyUuid: UUID, currentNodeUuid: UUID, currentRootNet
     return backendFetchText(url, { method: 'post' });
 }
 
-export function fetchCaseName(studyUuid: UUID, rootNetworkUuid: UUID) {
-    console.info('Fetching case name');
-    const url = getStudyUrl(studyUuid) + '/root-networks/' + encodeURIComponent(rootNetworkUuid) + '/case/name';
-    console.debug(url);
-
-    return backendFetchText(url);
-}
-
 export function isNodeExists(studyUuid: UUID, nodeName: string) {
     const existsNodeUrl =
         getStudyUrl(studyUuid) +

src/translations/en.json

@@ -515,7 +515,6 @@
     "exportCaseOnNode": "Export case",
     "NetworkModificationTreeLoadError": "An error occurred while loading network modification tree",
     "MapEquipmentsLoadError": "An error occurred while loading network map",
-    "CaseNameLoadError": "An error occurred while loading case name",
     "StudyUnrecoverableStateRecreate": "Your study had a problem and has been recreated from initial data",
     "StudyUnrecoverableState": "Your study had a problem and can not be recreated",
     "NodeCreateError": "An error occurred while creating node",

src/translations/fr.json

@@ -515,7 +515,6 @@
     "exportCaseOnNode": "Exporter la situation",
     "NetworkModificationTreeLoadError": "Une erreur est survenue lors du chargement de l'arbre de modifications de réseau",
     "MapEquipmentsLoadError": "Une erreur est survenue lors du chargement des données de l'image réseau",
-    "CaseNameLoadError": "Une erreur est survenue lors de la récupération du nom de la situation",
     "StudyUnrecoverableStateRecreate": "Votre étude a rencontré un problème et a été recréée à partir des données initiales",
     "StudyUnrecoverableState": "Impossible de récupérer le réseau de l'étude. Veuillez sélectionner une nouvelle situation initiale",
     "NodeCreateError": "Une erreur est survenue lors de la création du nœud",