Remove mutualized ws functions

Author: Hugo Marcellin

package-lock.json

@@ -16,7 +16,7 @@
     "dependencies": {
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.5",
-        "@gridsuite/commons-ui": "0.53.0",
+        "@gridsuite/commons-ui": "file:../commons-ui/gridsuite-commons-ui-0.59.0.tgz",
         "@hookform/resolvers": "^3.3.4",
         "@mui/icons-material": "^5.15.14",
         "@mui/lab": "5.0.0-alpha.169",
@@ -85,8 +85,8 @@
         "jest-environment-jsdom": "^29.7.0",
         "jest-svg-transformer": "^1.0.0",
         "prettier": "^2.8.8",
-        "typescript": "5.1.6",
         "ts-node": "^10.9.2",
+        "typescript": "5.1.6",
         "vite": "^5.2.7",
         "vite-plugin-eslint": "^1.8.1",
         "vite-plugin-svgr": "^4.2.0",

package.json

@@ -15,7 +15,13 @@ import {
 } from 'react';
 import { capitalize, Tab, Tabs, useTheme } from '@mui/material';
 import { ManageAccounts, PeopleAlt } from '@mui/icons-material';
-import { logout, TopBar } from '@gridsuite/commons-ui';
+import {
+    logout,
+    TopBar,
+    fetchVersion,
+    fetchAppsMetadata,
+    CommonMetadata,
+} from '@gridsuite/commons-ui';
 import { useParameterState } from '../parameters';
 import {
     APP_NAME,
@@ -25,7 +31,7 @@ import {
 import { NavLink, useMatches, useNavigate } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import { FormattedMessage } from 'react-intl';
-import { AppsMetadataSrv, MetadataJson, StudySrv } from '../../services';
+import { StudySrv } from '../../services';
 import GridAdminLogoLight from '../../images/GridAdmin_logo_light.svg?react';
 import GridAdminLogoDark from '../../images/GridAdmin_logo_dark.svg?react';
 import AppPackage from '../../../package.json';
@@ -86,11 +92,11 @@ const AppTopBar: FunctionComponent = () => {
     const [languageLocal, handleChangeLanguage] =
         useParameterState(PARAM_LANGUAGE);
 
-    const [appsAndUrls, setAppsAndUrls] = useState<MetadataJson[]>([]);
+    const [appsMetadata, setAppsMetadata] = useState<CommonMetadata[]>([]);
     useEffect(() => {
         if (user !== null) {
-            AppsMetadataSrv.fetchAppsAndUrls().then((res) => {
-                setAppsAndUrls(res);
+            fetchAppsMetadata().then((res) => {
+                setAppsMetadata(res);
             });
         }
     }, [user]);
@@ -111,9 +117,9 @@ const AppTopBar: FunctionComponent = () => {
             onLogoutClick={() => logout(dispatch, userManagerInstance)}
             onLogoClick={() => navigate('/', { replace: true })}
             user={user}
-            appsAndUrls={appsAndUrls}
+            appsAndUrls={appsMetadata}
             globalVersionPromise={() =>
-                AppsMetadataSrv.fetchVersion().then((res) => res?.deployVersion)
+                fetchVersion().then((res) => res?.deployVersion)
             }
             additionalModulesPromise={StudySrv.getServersInfos}
             onThemeClick={handleChangeTheme}

src/components/App/app-top-bar.tsx

@@ -15,6 +15,7 @@ import {
 import { FormattedMessage } from 'react-intl';
 import {
     AuthenticationRouter,
+    fetchAuthorizationCodeFlowFeatureFlag,
     getPreLoginPath,
     initializeAuthenticationProd,
 } from '@gridsuite/commons-ui';
@@ -31,7 +32,7 @@ import {
 import { UserManager } from 'oidc-client';
 import { useDispatch, useSelector } from 'react-redux';
 import { AppState } from '../redux/reducer';
-import { AppsMetadataSrv, UserAdminSrv } from '../services';
+import { UserAdminSrv } from '../services';
 import { App } from '../components/App';
 import { Users, Profiles } from '../pages';
 import ErrorPage from './ErrorPage';
@@ -138,7 +139,7 @@ const AppAuthStateWithRouterLayer: FunctionComponent<
     );
 
     useEffect(() => {
-        AppsMetadataSrv.fetchAuthorizationCodeFlowFeatureFlag()
+        fetchAuthorizationCodeFlowFeatureFlag()
             .then((authorizationCodeFlowEnabled) =>
                 initializeAuthenticationProd(
                     dispatch,

src/routes/router.tsx

@@ -7,7 +7,7 @@
 
 import ReconnectingWebSocket, { Event } from 'reconnecting-websocket';
 import { APP_NAME } from '../utils/config-params';
-import { getUrlWithToken, getWsBase } from '../utils/api-ws';
+import { getUrlWithToken, getWsBase } from '@gridsuite/commons-ui';
 
 const PREFIX_CONFIG_NOTIFICATION_WS = `${getWsBase()}/config-notification`;
 

src/services/apps-metadata.ts

@@ -1,13 +1,11 @@
 import * as Config from './config';
 import * as ConfigNotif from './config-notification';
-import * as AppsMetadata from './apps-metadata';
 import * as Study from './study';
 import * as UserAdmin from './user-admin';
 
 const _ = {
     ...Config,
     ...ConfigNotif,
-    ...AppsMetadata,
     ...Study,
     ...UserAdmin,
 };
@@ -19,9 +17,6 @@ export type * from './config';
 export * as ConfigNotif from './config-notification';
 export type * from './config-notification';
 
-export * as AppsMetadataSrv from './apps-metadata';
-export type * from './apps-metadata';
-
 export * as StudySrv from './study';
 export type * from './study';