Clean code after commons-ui update

Signed-off-by: Florent MILLOT <[email protected]>

Author: flomillot

package.json

@@ -32,6 +32,7 @@
         "ag-grid-react": "^31.1.1",
         "core-js": "^3.6.4",
         "notistack": "^3.0.0",
+        "oidc-client": "^1.10.1",
         "prop-types": "^15.7.2",
         "react": "^18.0.0",
         "react-dom": "^18.0.0",

src/components/App/app.test.tsx

@@ -14,7 +14,6 @@ import {
     ThemeProvider,
 } from '@mui/material/styles';
 import { SnackbarProvider } from '@gridsuite/commons-ui';
-import { UserManagerMock } from '@gridsuite/commons-ui/es/utils/UserManagerMock';
 import { CssBaseline } from '@mui/material';
 import { appRoutes } from '../../routes';
 

src/module-commons-ui.d.ts

@@ -49,7 +49,7 @@ export type AppState = {
     [PARAM_LANGUAGE]: LanguageParameters;
 
     userManager: UserManagerState;
-    user: User | null; //TODO use true definition when commons-ui passed to typescript
+    user: User | null; //TODO delete when migrated into commons-ui
     signInCallbackError: unknown;
     authenticationRouterError: unknown;
     showAuthenticationRouterLogin: boolean;

src/redux/reducer.ts

@@ -79,7 +79,7 @@ export function appRoutes(): RouteObject[] {
 }
 
 const AuthRouter: FunctionComponent<{
-    userManager: (typeof AuthenticationRouter)['userManager'];
+    userManager: Parameters<typeof AuthenticationRouter>[0]['userManager'];
 }> = (props, context) => {
     const signInCallbackError = useSelector(
         (state: AppState) => state.signInCallbackError

src/routes/router.tsx

@@ -11,7 +11,7 @@ import { APP_NAME } from '../utils/config-params';
 
 const STUDY_URL = `${getRestBase()}/study/v1`;
 
-//TODO delete when commons-ui will be in typescript
+//TODO delete when migrated into commons-ui
 export type ServerAbout = {
     type?: 'app' | 'server' | 'other';
     name?: string;

src/services/study.ts

@@ -7,11 +7,9 @@
 
 import { LANG_ENGLISH, LANG_FRENCH, LANG_SYSTEM } from '@gridsuite/commons-ui';
 
-const supportedLanguages = [LANG_FRENCH, LANG_ENGLISH];
-//export type SupportedLanguagesType = typeof supportedLanguages[number]; //TODO when commons-ui in typescript
-export type SupportedLanguages = 'en' | 'fr';
-//export type LanguageParameters = SupportedLanguages | typeof LANG_SYSTEM; //TODO when commons-ui in typescript
-export type LanguageParameters = SupportedLanguages | 'sys';
+const supportedLanguages: string[] = [LANG_FRENCH, LANG_ENGLISH];
+export type SupportedLanguages = typeof supportedLanguages[number];
+export type LanguageParameters = SupportedLanguages | typeof LANG_SYSTEM;
 
 export function getSystemLanguage(): SupportedLanguages {
     const systemLanguage = navigator.language.split(/[-_]/)[0];
@@ -25,6 +23,5 @@ export function getComputedLanguage(
 ): SupportedLanguages {
     return language === LANG_SYSTEM
         ? getSystemLanguage()
-        : (language as SupportedLanguages);
-    //TODO remove cast when commons-ui in typescript
+        : language;
 }