deduplicate config & local-storage

Tristan-WorkGH · Tristan-WorkGH · commit 8d89e4823baf · 2024-08-13T00:54:32.000+02:00
diff --git a/src/components/app-top-bar.tsx b/src/components/app-top-bar.tsx
@@ -5,9 +5,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 import { useCallback, useEffect, useRef, useState } from 'react';
-import { LIGHT_THEME, logout, TopBar, UserManagerState } from '@gridsuite/commons-ui';
+import { LIGHT_THEME, logout, PARAM_LANGUAGE, PARAM_THEME, TopBar, UserManagerState } from '@gridsuite/commons-ui';
 import ParametersDialog, { useParameterState } from './dialogs/parameters-dialog';
-import { APP_NAME, PARAM_LANGUAGE, PARAM_THEME } from '../utils/config-params';
+import { APP_NAME } from '../utils/config-params';
 import { useDispatch, useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import { useNavigate } from 'react-router-dom';
diff --git a/src/components/app-wrapper.tsx b/src/components/app-wrapper.tsx
@@ -34,6 +34,7 @@ import {
     login_fr,
     multiple_selection_dialog_en,
     multiple_selection_dialog_fr,
+    PARAM_THEME,
     SnackbarProvider,
     table_en,
     table_fr,
@@ -57,7 +58,6 @@ import import_parameters_en from '../translations/external/import-parameters-en'
 import import_parameters_fr from '../translations/external/import-parameters-fr';
 import { store } from '../redux/store';
 import CssBaseline from '@mui/material/CssBaseline';
-import { PARAM_THEME } from '../utils/config-params';
 import { AppState } from '../redux/reducer';
 import { Theme } from '@mui/material';
 
diff --git a/src/components/app.tsx b/src/components/app.tsx
@@ -12,14 +12,16 @@ import { selectComputedLanguage, selectLanguage, selectTheme } from '../redux/ac
 import {
     AuthenticationRouter,
     CardErrorBoundary,
+    getComputedLanguage,
     getPreLoginPath,
     initializeAuthenticationProd,
+    PARAM_LANGUAGE,
+    PARAM_THEME,
     UserManagerState,
     useSnackMessage,
 } from '@gridsuite/commons-ui';
 import { FormattedMessage } from 'react-intl';
-import { APP_NAME, COMMON_APP_NAME, PARAM_LANGUAGE, PARAM_THEME } from '../utils/config-params';
-import { getComputedLanguage } from '../utils/language';
+import { APP_NAME } from '../utils/config-params';
 import AppTopBar from './app-top-bar';
 import { Grid } from '@mui/material';
 import TreeViewsContainer from './tree-views-container';
@@ -138,7 +140,7 @@ const App = () => {
     useEffect(() => {
         if (user !== undefined) {
             configSrv
-                .fetchConfigParameters(COMMON_APP_NAME)
+                .fetchConfigParameters('common')
                 .then((params) => updateParams(params))
                 .catch((error) =>
                     snackError({
diff --git a/src/components/dialogs/contingency-list/creation/contingency-list-creation-dialog.jsx b/src/components/dialogs/contingency-list/creation/contingency-list-creation-dialog.jsx
@@ -6,7 +6,13 @@
  */
 
 import { useSelector } from 'react-redux';
-import { useSnackMessage, CustomMuiDialog, getCriteriaBasedSchema, FieldConstants } from '@gridsuite/commons-ui';
+import {
+    CustomMuiDialog,
+    FieldConstants,
+    getCriteriaBasedSchema,
+    PARAM_LANGUAGE,
+    useSnackMessage,
+} from '@gridsuite/commons-ui';
 import { useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup/dist/yup';
 import ContingencyListCreationForm from './contingency-list-creation-form';
@@ -15,7 +21,6 @@ import yup from '../../../utils/yup-config';
 import { getExplicitNamingSchema } from '../explicit-naming/explicit-naming-form';
 import { ContingencyListType } from '../../../../utils/elementType';
 import { useParameterState } from '../../parameters-dialog';
-import { PARAM_LANGUAGE } from '../../../../utils/config-params';
 import { exploreSrv } from '../../../../services';
 
 const schema = yup.object().shape({
diff --git a/src/components/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-dialog.jsx b/src/components/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-dialog.jsx
@@ -5,7 +5,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { CustomMuiDialog, FieldConstants, getCriteriaBasedSchema, useSnackMessage } from '@gridsuite/commons-ui';
+import {
+    CustomMuiDialog,
+    FieldConstants,
+    getCriteriaBasedSchema,
+    PARAM_LANGUAGE,
+    useSnackMessage,
+} from '@gridsuite/commons-ui';
 import { useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup/dist/yup';
 import { useEffect, useState } from 'react';
@@ -19,7 +25,6 @@ import { useDispatch, useSelector } from 'react-redux';
 import { noSelectionForCopy } from 'utils/constants';
 import { setSelectionForCopy } from '../../../../../redux/actions';
 import { useParameterState } from '../../../parameters-dialog';
-import { PARAM_LANGUAGE } from '../../../../../utils/config-params';
 import { actionsSrv, exploreSrv } from '../../../../../services';
 
 const schema = yup.object().shape({
diff --git a/src/components/directory-content.jsx b/src/components/directory-content.jsx
@@ -20,6 +20,7 @@ import {
     ExpertFilterEditionDialog,
     ExplicitNamingFilterEditionDialog,
     noSelectionForCopy,
+    PARAM_LANGUAGE,
     useSnackMessage,
 } from '@gridsuite/commons-ui';
 import ContentContextualMenu from './menus/content-contextual-menu';
@@ -29,7 +30,6 @@ import CriteriaBasedEditionDialog from './dialogs/contingency-list/edition/crite
 import ExplicitNamingEditionDialog from './dialogs/contingency-list/edition/explicit-naming/explicit-naming-edition-dialog';
 import ScriptEditionDialog from './dialogs/contingency-list/edition/script/script-edition-dialog';
 import { useParameterState } from './dialogs/parameters-dialog';
-import { PARAM_LANGUAGE } from '../utils/config-params';
 import { useDirectoryContent } from '../hooks/useDirectoryContent';
 import {
     computeCheckedElements,
diff --git a/src/components/menus/content-contextual-menu.jsx b/src/components/menus/content-contextual-menu.jsx
@@ -28,15 +28,14 @@ import CopyToScriptDialog from '../dialogs/copy-to-script-dialog';
 import CreateStudyDialog from '../dialogs/create-study-dialog/create-study-dialog';
 import { DialogsId } from '../../utils/UIconstants';
 import { ContingencyListType, FilterType } from '../../utils/elementType';
-import { ElementType, FilterCreationDialog, useSnackMessage } from '@gridsuite/commons-ui';
+import { ElementType, FilterCreationDialog, PARAM_LANGUAGE, useSnackMessage } from '@gridsuite/commons-ui';
 import CommonContextualMenu from './common-contextual-menu';
 import { useDeferredFetch, useMultipleDeferredFetch } from '../../utils/custom-hooks';
 import MoveDialog from '../dialogs/move-dialog';
 import { useDownloadUtils } from '../utils/caseUtils';
 import ExportCaseDialog from '../dialogs/export-case-dialog';
 import { setSelectionForCopy } from '../../redux/actions';
 import { useParameterState } from '../dialogs/parameters-dialog';
-import { PARAM_LANGUAGE } from '../../utils/config-params';
 import { handleMaxElementsExceededError } from '../utils/rest-errors';
 import { exploreSrv } from '../../services';
 
diff --git a/src/components/menus/directory-tree-contextual-menu.jsx b/src/components/menus/directory-tree-contextual-menu.jsx
@@ -24,11 +24,10 @@ import DeleteDialog from '../dialogs/delete-dialog';
 import { DialogsId } from '../../utils/UIconstants';
 import CommonContextualMenu from './common-contextual-menu';
 import { useDeferredFetch } from '../../utils/custom-hooks';
-import { ElementType, FilterCreationDialog, useSnackMessage } from '@gridsuite/commons-ui';
+import { ElementType, FilterCreationDialog, PARAM_LANGUAGE, useSnackMessage } from '@gridsuite/commons-ui';
 import ContingencyListCreationDialog from '../dialogs/contingency-list/creation/contingency-list-creation-dialog';
 import CreateCaseDialog from '../dialogs/create-case-dialog/create-case-dialog';
 import { useParameterState } from '../dialogs/parameters-dialog';
-import { PARAM_LANGUAGE } from '../../utils/config-params';
 import { handleMaxElementsExceededError } from '../utils/rest-errors';
 import { directorySrv, exploreSrv } from '../../services';
 
diff --git a/src/redux/actions.ts b/src/redux/actions.ts
@@ -6,7 +6,7 @@
  */
 
 import { Action } from 'redux';
-import { PARAM_LANGUAGE } from '../utils/config-params';
+import { PARAM_LANGUAGE } from '@gridsuite/commons-ui';
 import { AppState } from './reducer';
 
 export type AppActions =
diff --git a/src/redux/local-storage.ts b/src/redux/local-storage.ts
diff --git a/src/redux/reducer.ts b/src/redux/reducer.ts
@@ -6,13 +6,6 @@
  */
 
 import { createReducer } from '@reduxjs/toolkit';
-import {
-    getLocalStorageComputedLanguage,
-    getLocalStorageLanguage,
-    getLocalStorageTheme,
-    saveLocalStorageLanguage,
-    saveLocalStorageTheme,
-} from './local-storage';
 import {
     ACTIVE_DIRECTORY,
     ActiveDirectoryAction,
@@ -51,12 +44,19 @@ import {
     AuthenticationRouterErrorState,
     ElementAttributes,
     ElementType,
+    getLocalStorageComputedLanguage,
+    getLocalStorageLanguage,
+    getLocalStorageTheme,
     GsLang,
     GsLangUser,
     GsTheme,
     LOGOUT_ERROR,
     LogoutErrorAction,
+    PARAM_LANGUAGE,
+    PARAM_THEME,
     RESET_AUTHENTICATION_ROUTER_ERROR,
+    saveLocalStorageLanguage,
+    saveLocalStorageTheme,
     SHOW_AUTH_INFO_LOGIN,
     ShowAuthenticationRouterLoginAction,
     SIGNIN_CALLBACK_ERROR,
@@ -68,7 +68,7 @@ import {
     UserAction,
     UserValidationErrorAction,
 } from '@gridsuite/commons-ui';
-import { PARAM_LANGUAGE, PARAM_THEME } from '../utils/config-params';
+import { APP_NAME } from '../utils/config-params';
 import { UUID } from 'crypto';
 import { User } from 'oidc-client';
 
@@ -144,9 +144,9 @@ const initialState: AppState = {
     showAuthenticationRouterLogin: false,
 
     // params
-    computedLanguage: getLocalStorageComputedLanguage(),
-    [PARAM_THEME]: getLocalStorageTheme(),
-    [PARAM_LANGUAGE]: getLocalStorageLanguage(),
+    computedLanguage: getLocalStorageComputedLanguage(APP_NAME),
+    [PARAM_THEME]: getLocalStorageTheme(APP_NAME),
+    [PARAM_LANGUAGE]: getLocalStorageLanguage(APP_NAME),
 
     currentChildren: undefined,
     selectedDirectory: null,
@@ -181,12 +181,12 @@ function filterFromObject<K extends string | number | symbol, V>(
 export const reducer = createReducer(initialState, (builder) => {
     builder.addCase(SELECT_THEME, (state, action: ThemeAction) => {
         state.theme = action.theme;
-        saveLocalStorageTheme(state.theme);
+        saveLocalStorageTheme(APP_NAME, state.theme);
     });
 
     builder.addCase(SELECT_LANGUAGE, (state, action: LanguageAction) => {
         state.language = action.language;
-        saveLocalStorageLanguage(state.language);
+        saveLocalStorageLanguage(APP_NAME, state.language);
     });
 
     builder.addCase(USER, (state, action: UserAction) => {
diff --git a/src/utils/config-params.js b/src/utils/config-params.js
diff --git a/src/utils/config-params.ts b/src/utils/config-params.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) 2021, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+export const APP_NAME = 'Explore';
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
@@ -4,9 +4,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
+
 export const noSelectionForCopy = {
     sourceCaseUuid: null,
     name: null,
     description: null,
     parentDirectoryUuid: null,
-};
+} as const;
diff --git a/src/utils/language.js b/src/utils/language.js
