go to new version

Author: Tristan-WorkGH

package-lock.json

@@ -16,7 +16,7 @@
     "dependencies": {
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.5",
-        "@gridsuite/commons-ui": "0.63.2",
+        "@gridsuite/commons-ui": "file:../commons-ui/gridsuite-commons-ui-0.63.2.tgz",
         "@hookform/resolvers": "^3.3.4",
         "@mui/icons-material": "^5.15.14",
         "@mui/lab": "5.0.0-alpha.169",

package.json

@@ -15,7 +15,7 @@ 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 { AppMetadataCommon, logout, TopBar } from '@gridsuite/commons-ui';
 import { useParameterState } from '../parameters';
 import {
     APP_NAME,
@@ -25,7 +25,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 { AppsMetadataSrv, 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';
@@ -67,7 +67,7 @@ const tabs = new Map<MainPaths, ReactElement>([
 const AppTopBar: FunctionComponent = () => {
     const theme = useTheme();
     const dispatch = useDispatch<AppDispatch>();
-    const user = useSelector((state: AppState) => state.user);
+    const user = useSelector((state: AppState) => state.user ?? null);
     const userManagerInstance = useSelector(
         (state: AppState) => state.userManager?.instance
     );
@@ -87,7 +87,7 @@ const AppTopBar: FunctionComponent = () => {
     const [languageLocal, handleChangeLanguage] =
         useParameterState(PARAM_LANGUAGE);
 
-    const [appsAndUrls, setAppsAndUrls] = useState<MetadataJson[]>([]);
+    const [appsAndUrls, setAppsAndUrls] = useState<AppMetadataCommon[]>([]);
     useEffect(() => {
         if (user !== null) {
             AppsMetadataSrv.fetchAppsAndUrls().then((res) => {

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

@@ -37,7 +37,7 @@ const App: FunctionComponent<PropsWithChildren<{}>> = (props, context) => {
     useDebugRender('app');
     const { snackError } = useSnackMessage();
     const dispatch = useDispatch<AppDispatch>();
-    const user = useSelector((state: AppState) => state.user);
+    const user = useSelector((state: AppState) => state.user ?? null);
 
     const updateParams = useCallback(
         (params: ConfigParameters) => {

src/components/App/app.tsx

@@ -30,7 +30,6 @@ import {
     AuthenticationActions,
     AuthenticationRouterErrorAction,
     AuthenticationRouterErrorState,
-    CommonStoreState,
     GsLang,
     GsLangUser,
     GsTheme,
@@ -51,8 +50,10 @@ import {
 } from '@gridsuite/commons-ui';
 import { PARAM_LANGUAGE, PARAM_THEME } from '../utils/config-params';
 import { ReducerWithInitialState } from '@reduxjs/toolkit/dist/createReducer';
+import { User } from 'oidc-client';
 
-export type AppState = CommonStoreState & {
+export type AppState = {
+    user?: User;
     computedLanguage: GsLangUser;
     [PARAM_THEME]: GsTheme;
     [PARAM_LANGUAGE]: GsLang;
@@ -69,7 +70,7 @@ const initialState: AppState = {
         instance: null,
         error: null,
     },
-    user: null,
+    user: undefined,
     signInCallbackError: null,
     authenticationRouterError: null,
     showAuthenticationRouterLogin: false,

src/redux/reducer.ts

@@ -7,10 +7,11 @@
 
 import { legacy_createStore as createStore, Store } from 'redux';
 import { Actions, AppState, reducer } from './reducer';
-import { setCommonStore } from '@gridsuite/commons-ui';
+import { initCommonServices } from '@gridsuite/commons-ui';
+import { APP_NAME } from '../utils/config-params';
 
 export const store: Store<AppState, Actions> = createStore(reducer);
-setCommonStore(store);
+initCommonServices(APP_NAME, () => store.getState().user);
 export type AppDispatch = typeof store.dispatch;
 
 // to avoid to reset the state with HMR

src/redux/store.ts

@@ -176,7 +176,7 @@ export const AppWithAuthRouter: FunctionComponent<{
     basename: string;
     layout: App;
 }> = (props, context) => {
-    const user = useSelector((state: AppState) => state.user);
+    const user = useSelector((state: AppState) => state.user ?? null);
     const router = useMemo(
         () =>
             createBrowserRouter(

src/routes/router.tsx

@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { Env } from '@gridsuite/commons-ui';
+import { AppMetadata, Env } from '@gridsuite/commons-ui';
 import { getErrorMessage } from '../utils/error';
 import { Url } from '../utils/api-rest';
 
@@ -84,7 +84,7 @@ export type MetadataStudy = MetadataCommon & {
 // https://github.com/gridsuite/deployment/blob/main/k8s/resources/common/config/apps-metadata.json
 export type MetadataJson = MetadataCommon | MetadataStudy;
 
-export function fetchAppsAndUrls(): Promise<MetadataJson[]> {
+export function fetchAppsAndUrls(): Promise<AppMetadata[]> {
     console.debug('Fetching apps and urls...');
     return fetchEnv()
         .then((env: EnvJson) =>

src/services/apps-metadata.ts

@@ -6,7 +6,6 @@
  */
 
 import { User } from 'oidc-client';
-import { AppState } from '../redux/reducer';
 import { store } from '../redux/store';
 
 export type Token = string;
@@ -16,8 +15,7 @@ export function getToken(user?: User): Token | null {
 }
 
 export function getUser(): User | null {
-    const state: AppState = store.getState();
-    return state.user;
+    return store.getState().user ?? null;
 }
 
 export function extractUserSub(user: User | null): Promise<unknown> {