diff --git a/package-lock.json b/package-lock.json index 4a399a4ea..df92d9042 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,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", @@ -2471,9 +2471,9 @@ } }, "node_modules/@gridsuite/commons-ui": { - "version": "0.42.0", - "resolved": "https://registry.npmjs.org/@gridsuite/commons-ui/-/commons-ui-0.42.0.tgz", - "integrity": "sha512-v8b52OEMGmyDNvosXpnC/Q8HXPY6v93g2qFKr6NB46ubKmADB1Q0fcKoopHg8/fbcFrkdvcGUFpWpHdqZ5fPog==", + "version": "0.43.0", + "resolved": "https://registry.npmjs.org/@gridsuite/commons-ui/-/commons-ui-0.43.0.tgz", + "integrity": "sha512-AHJdND94kdrBxXs8NvMtO4vFaBYxWACneq8Tri0msuH1xlxkbmWCeUtbtt71S1x3FDoAHs4dfTuF0g2YLLa0OA==", "dependencies": { "autosuggest-highlight": "^3.2.0", "clsx": "^1.0.4", diff --git a/package.json b/package.json index 1e9ab5c2b..8f9d7f3d9 100644 --- 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 index 1b4e6750d..31f7ac4c3 100644 --- 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} /> 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; + }); }