Skip to content

Commit f7d4e68

Browse files
authored
add the nad generation mode to the api call. (#3079)
Signed-off-by: AAJELLAL <[email protected]>
1 parent d1252f5 commit f7d4e68

File tree

5 files changed

+28
-13
lines changed

5 files changed

+28
-13
lines changed

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dependencies": {
1212
"@emotion/react": "^11.14.0",
1313
"@emotion/styled": "^11.14.0",
14-
"@gridsuite/commons-ui": "0.120.1",
14+
"@gridsuite/commons-ui": "0.121.0",
1515
"@hello-pangea/dnd": "^18.0.1",
1616
"@hookform/resolvers": "^4.0.0",
1717
"@mui/icons-material": "^5.16.14",

src/components/diagrams/hooks/use-diagram-model.ts

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,8 @@ export const useDiagramModel = ({ diagramTypes, onAddDiagram, onDiagramAlreadyEx
224224
voltageLevelToExpandIds: diagram.voltageLevelToExpandIds,
225225
voltageLevelToOmitIds: diagram.voltageLevelToOmitIds,
226226
positions: diagram.positions,
227-
withGeoData: networkVisuParams.networkAreaDiagramParameters.initNadWithGeoData,
227+
nadPositionsGenerationMode:
228+
networkVisuParams.networkAreaDiagramParameters.nadPositionsGenerationMode,
228229
};
229230
fetchOptions = {
230231
method: 'POST',
@@ -283,6 +284,18 @@ export const useDiagramModel = ({ diagramTypes, onAddDiagram, onDiagramAlreadyEx
283284
})
284285
.catch((error) => {
285286
console.error('Error while fetching SVG', error.message);
287+
if (error.status === 400) {
288+
// remove the failed diagram from loading list and show a snack error.
289+
setDiagrams((diagrams) => {
290+
const newDiagrams = { ...diagrams };
291+
delete newDiagrams[diagram.diagramUuid];
292+
return newDiagrams;
293+
});
294+
snackError({
295+
headerId: 'nadConfiguredPositionsModeFailed',
296+
});
297+
return;
298+
}
286299
setDiagrams((diagrams) => {
287300
if (!diagrams[diagram.diagramUuid]) {
288301
console.warn(`Diagram ${diagram.diagramUuid} not found in state`);
@@ -318,7 +331,7 @@ export const useDiagramModel = ({ diagramTypes, onAddDiagram, onDiagramAlreadyEx
318331
});
319332
});
320333
},
321-
[getDiagramTitle, getUrl, snackError, networkVisuParams.networkAreaDiagramParameters.initNadWithGeoData]
334+
[getDiagramTitle, getUrl, snackError, networkVisuParams.networkAreaDiagramParameters.nadPositionsGenerationMode]
322335
);
323336

324337
const findSimilarDiagram = useCallback(

src/translations/en.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"studyNotFound": "Study with id \"{studyUuid}\" has not been found",
5757
"svgNotFound": "Diagram has not been found: {error}; {svgUrl}",
5858
"svgLoadingFail": "The diagram couldn't be loaded",
59+
"nadConfiguredPositionsModeFailed": "The configured positions have not been initialized. You need to change the initialization parameter of the network area diagrams.",
5960
"networkLoadingFail": "Network of study with id \"{studyUuid}\" couldn't be loaded",
6061
"geoDataLoadingFail": "An error occurred while loading geographical data.",
6162

@@ -518,8 +519,8 @@
518519
"removeNode": "Remove",
519520
"unbuildNode": "Unbuild",
520521
"exportCaseOnNode": "Export",
521-
"ConstructionNode":"Create a construction node",
522-
"SecurityNode":"Create a security node",
522+
"ConstructionNode": "Create a construction node",
523+
"SecurityNode": "Create a security node",
523524
"NetworkModificationTreeLoadError": "An error occurred while loading network modification tree",
524525
"MapEquipmentsLoadError": "An error occurred while loading network map",
525526
"StudyUnrecoverableStateRecreate": "Your study had a problem and has been recreated from initial data",
@@ -1034,7 +1035,7 @@
10341035
"cutNetworkModificationNode": "Cut",
10351036
"pasteNetworkModificationNode": "Paste",
10361037

1037-
"cancelCutNetworkModificationNode": "Cancel cut",
1038+
"cancelCutNetworkModificationNode": "Cancel cut",
10381039
"NetworkModificationSubtree": "Subtree",
10391040
"copyNetworkModificationSubtree": "Copy",
10401041
"pasteNetworkModificationSubtree": "Paste",

src/translations/fr.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"studyNotFound": "L'étude avec l'identifiant \"{studyUuid}\" n'a pas été trouvée",
5757
"svgNotFound": "L'image poste n'a pas été trouvée : {error}; {svgUrl}",
5858
"svgLoadingFail": "L'image n'a pas pu être chargée",
59+
"nadConfiguredPositionsModeFailed": "Les positions configurées n'ont pas été initialisées. Vous devez modifier le paramétrage d'initialisation des images nodales de la zone.",
5960
"networkLoadingFail": "Le réseau de l'étude avec l'identifiant \"{studyUuid}\" n'a pas pu être chargé",
6061
"geoDataLoadingFail": "Erreur lors du chargement des données géographiques.",
6162

@@ -518,8 +519,8 @@
518519
"removeNode": "Supprimer",
519520
"unbuildNode": "Déréaliser",
520521
"exportCaseOnNode": "Exporter",
521-
"ConstructionNode":"Créer un nœud de construction",
522-
"SecurityNode":"Créer un nœud de sécurité",
522+
"ConstructionNode": "Créer un nœud de construction",
523+
"SecurityNode": "Créer un nœud de sécurité",
523524
"NetworkModificationTreeLoadError": "Une erreur est survenue lors du chargement de l'arbre de modifications de réseau",
524525
"MapEquipmentsLoadError": "Une erreur est survenue lors du chargement des données de l'image réseau",
525526
"StudyUnrecoverableStateRecreate": "Votre étude a rencontré un problème et a été recréée à partir des données initiales",
@@ -1030,7 +1031,7 @@
10301031
"cutNetworkModificationNode": "Couper",
10311032
"pasteNetworkModificationNode": "Coller",
10321033

1033-
"cancelCutNetworkModificationNode": "Annuler couper",
1034+
"cancelCutNetworkModificationNode": "Annuler couper",
10341035
"NetworkModificationSubtree": "Sous-arbre",
10351036
"copyNetworkModificationSubtree": "Copier",
10361037
"pasteNetworkModificationSubtree": "Coller",

0 commit comments

Comments
 (0)