Update "about" dialog (#317)

update dialog and use new url
gridsuite · Dec 27, 2023 · 4f94af5 · 4f94af5
1 parent ffbd8ba
commit 4f94af5
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 43 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "dependencies": {
         "@emotion/react": "^11.8.2",
         "@emotion/styled": "^11.8.1",
-        "@gridsuite/commons-ui": "^0.42.0",
+        "@gridsuite/commons-ui": "^0.43.0",
         "@hookform/resolvers": "^3.0.0",
         "@mui/icons-material": "^5.5.0",
         "@mui/lab": "^5.0.0-alpha.72",

diff --git a/src/components/app-top-bar.js b/src/components/app-top-bar.js
@@ -69,43 +69,10 @@ const AppTopBar = ({ user, userManager }) => {
                 theme={themeLocal}
                 onLanguageClick={handleChangeLanguage}
                 language={languageLocal}
-                getGlobalVersion={(setGlobalVersion) =>
-                    fetchVersion()
-                        .then((res) => setGlobalVersion(res.deployVersion))
-                        .catch((reason) => {
-                            console.error(
-                                'Error while fetching the version : ' + reason
-                            );
-                            setGlobalVersion(null);
-                        })
-                }
-                getAdditionalModules={(setServers) =>
-                    getServersInfos()
-                        .then((res) =>
-                            setServers(
-                                Object.entries(res).map(([name, infos]) => ({
-                                    name:
-                                        infos?.build?.name ||
-                                        infos?.build?.artifact ||
-                                        name,
-                                    type: 'server',
-                                    version: infos?.build?.version,
-                                    gitTag:
-                                        infos?.git?.tags ||
-                                        infos?.git?.commit?.id[
-                                            'describe-short'
-                                        ],
-                                }))
-                            )
-                        )
-                        .catch((reason) => {
-                            console.error(
-                                'Error while fetching the servers infos : ' +
-                                    reason
-                            );
-                            setServers(null);
-                        })
+                globalVersionPromise={() =>
+                    fetchVersion().then((res) => res?.deployVersion)
                 }
+                additionalModulesPromise={getServersInfos}
             />
             <ParametersDialog
                 showParameters={showParameters}

diff --git a/src/utils/rest-api.js b/src/utils/rest-api.js
@@ -217,7 +217,11 @@ export function fetchVersion() {
     console.info(`Fetching global metadata...`);
     return fetchEnv()
         .then((env) => fetch(env.appsMetadataServerUrl + '/version.json'))
-        .then((response) => response.json());
+        .then((response) => response.json())
+        .catch((reason) => {
+            console.error('Error while fetching the version : ' + reason);
+            return reason;
+        });
 }
 
 export function fetchConfigParameters(appName) {
@@ -989,5 +993,10 @@ export function downloadCase(caseUuid) {
 
 export function getServersInfos() {
     console.info('get backend servers informations');
-    return backendFetchJson(PREFIX_STUDY_QUERIES + '/v1/servers/infos');
+    return backendFetchJson(
+        PREFIX_STUDY_QUERIES + '/v1/servers/about?view=explore'
+    ).catch((reason) => {
+        console.error('Error while fetching the servers infos : ' + reason);
+        return reason;
+    });
 }