set print width to 120 instead of default 80. (#114)

gridsuite · Aug 5, 2024 · e345e4e · e345e4e
1 parent cb21474
commit e345e4e
Show file tree

Hide file tree

Showing 23 changed files with 168 additions and 646 deletions.
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -1,5 +1,6 @@
 {
     "trailingComma": "es5",
     "tabWidth": 4,
+    "printWidth": 120,
     "singleQuote": true
 }
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ To check dependencies license compatibility with this project one locally, pleas
 npm run licenses-check
 ```
 
-Notes : 
+Notes :
 * Check [license-checker-config.json](license-checker-config.json) for license white list and exclusion.
 If you need to update this list, please inform organization's owners.
 * Excluded dependencies :

diff --git a/license-checker-config.json b/license-checker-config.json
@@ -1,5 +1,5 @@
 {
-    "onlyAllow" : [
+    "onlyAllow": [
         "MPL-2.0",
         "MIT",
         "BSD-3-Clause",

diff --git a/src/components/app-top-bar.js b/src/components/app-top-bar.js
@@ -10,12 +10,7 @@ import { logout, TopBar } from '@gridsuite/commons-ui';
 import Parameters, { useParameterState } from './parameters';
 import { PARAM_LANGUAGE, PARAM_THEME } from '../utils/config-params';
 import { useDispatch, useSelector } from 'react-redux';
-import {
-    fetchAppsAndUrls,
-    fetchMergeConfigs,
-    fetchVersion,
-    getServersInfos,
-} from '../utils/rest-api';
+import { fetchAppsAndUrls, fetchMergeConfigs, fetchVersion, getServersInfos } from '../utils/rest-api';
 import PropTypes from 'prop-types';
 import { useMatch, useNavigate } from 'react-router-dom';
 import { ReactComponent as GridMergeLogoLight } from '../images/GridMerge_logo_light.svg';
@@ -50,13 +45,11 @@ const AppTopBar = ({ user, userManager }) => {
 
     const [themeLocal, handleChangeTheme] = useParameterState(PARAM_THEME);
 
-    const [languageLocal, handleChangeLanguage] =
-        useParameterState(PARAM_LANGUAGE);
+    const [languageLocal, handleChangeLanguage] = useParameterState(PARAM_LANGUAGE);
 
     const [showParameters, setShowParameters] = useState(false);
 
-    const [showConfigurationProcesses, setShowConfigurationProcesses] =
-        useState(false);
+    const [showConfigurationProcesses, setShowConfigurationProcesses] = useState(false);
 
     useEffect(() => {
         if (user !== null) {
@@ -77,11 +70,7 @@ const AppTopBar = ({ user, userManager }) => {
 
     const selectedTabId = useMemo(() => {
         let index =
-            matchProcess !== null
-                ? configs.findIndex(
-                      (c) => c.process === matchProcess.params.processName
-                  )
-                : -1;
+            matchProcess !== null ? configs.findIndex((c) => c.process === matchProcess.params.processName) : -1;
         return index !== -1 ? matchProcess.params.processName : false;
     }, [configs, matchProcess]);
 
@@ -90,13 +79,7 @@ const AppTopBar = ({ user, userManager }) => {
             <TopBar
                 appName="Merge"
                 appColor="#4795D1"
-                appLogo={
-                    theme.palette.mode === 'light' ? (
-                        <GridMergeLogoLight />
-                    ) : (
-                        <GridMergeLogoDark />
-                    )
-                }
+                appLogo={theme.palette.mode === 'light' ? <GridMergeLogoLight /> : <GridMergeLogoDark />}
                 appVersion={AppPackage.version}
                 appLicense={AppPackage.license}
                 onParametersClick={() => setShowParameters(true)}
@@ -108,28 +91,20 @@ const AppTopBar = ({ user, userManager }) => {
                 theme={themeLocal}
                 onLanguageClick={handleChangeLanguage}
                 language={languageLocal}
-                globalVersionPromise={() =>
-                    fetchVersion().then((res) => res?.deployVersion)
-                }
+                globalVersionPromise={() => fetchVersion().then((res) => res?.deployVersion)}
                 additionalModulesPromise={getServersInfos}
             >
                 <Tabs
                     value={selectedTabId}
                     indicatorColor="primary"
                     variant="scrollable"
                     scrollButtons="auto"
-                    onChange={(event, newValue) =>
-                        navigate(PREFIX_URL_PROCESSES + '/' + newValue)
-                    }
+                    onChange={(event, newValue) => navigate(PREFIX_URL_PROCESSES + '/' + newValue)}
                     aria-label="parameters"
                     sx={styles.process}
                 >
                     {configs.map((config) => (
-                        <Tab
-                            key={config.processUuid}
-                            label={config.process}
-                            value={config.process}
-                        />
+                        <Tab key={config.processUuid} label={config.process} value={config.process} />
                     ))}
                 </Tabs>
                 {user && (
@@ -150,10 +125,7 @@ const AppTopBar = ({ user, userManager }) => {
                     </>
                 )}
             </TopBar>
-            <Parameters
-                showParameters={showParameters}
-                hideParameters={() => setShowParameters(false)}
-            />
+            <Parameters showParameters={showParameters} hideParameters={() => setShowParameters(false)} />
         </>
     );
 };

diff --git a/src/components/app-wrapper.js b/src/components/app-wrapper.js
@@ -7,11 +7,7 @@
 
 import App from './app';
 import React from 'react';
-import {
-    createTheme,
-    ThemeProvider,
-    StyledEngineProvider,
-} from '@mui/material/styles';
+import { createTheme, ThemeProvider, StyledEngineProvider } from '@mui/material/styles';
 import {
     LIGHT_THEME,
     CardErrorBoundary,
@@ -124,10 +120,7 @@ const AppWrapperWithRedux = () => {
     const theme = useSelector((state) => state[PARAM_THEME]);
 
     return (
-        <IntlProvider
-            locale={computedLanguage}
-            messages={messages[computedLanguage]}
-        >
+        <IntlProvider locale={computedLanguage} messages={messages[computedLanguage]}>
             <BrowserRouter basename={basename}>
                 <StyledEngineProvider injectFirst>
                     <ThemeProvider theme={getMuiTheme(theme)}>

diff --git a/src/components/app.js b/src/components/app.js
@@ -9,22 +9,9 @@ import React, { useEffect, useState, useCallback } from 'react';
 
 import { useDispatch, useSelector } from 'react-redux';
 
-import {
-    Navigate,
-    Routes,
-    Route,
-    useNavigate,
-    useLocation,
-    useParams,
-    useMatch,
-} from 'react-router-dom';
+import { Navigate, Routes, Route, useNavigate, useLocation, useParams, useMatch } from 'react-router-dom';
 
-import {
-    selectTheme,
-    selectTimelineDiagonalLabels,
-    selectLanguage,
-    selectComputedLanguage,
-} from '../redux/actions';
+import { selectTheme, selectTimelineDiagonalLabels, selectLanguage, selectComputedLanguage } from '../redux/actions';
 
 import {
     AuthenticationRouter,
@@ -82,15 +69,9 @@ const App = () => {
 
     const user = useSelector((state) => state.user);
 
-    const signInCallbackError = useSelector(
-        (state) => state.signInCallbackError
-    );
-    const authenticationRouterError = useSelector(
-        (state) => state.authenticationRouterError
-    );
-    const showAuthenticationRouterLogin = useSelector(
-        (state) => state.showAuthenticationRouterLogin
-    );
+    const signInCallbackError = useSelector((state) => state.signInCallbackError);
+    const authenticationRouterError = useSelector((state) => state.authenticationRouterError);
+    const showAuthenticationRouterLogin = useSelector((state) => state.showAuthenticationRouterLogin);
 
     const [userManager, setUserManager] = useState(noUserManager);
 
@@ -122,17 +103,11 @@ const App = () => {
                         dispatch(selectTheme(param.value));
                         break;
                     case PARAM_TIMELINE_DIAGONAL_LABELS:
-                        dispatch(
-                            selectTimelineDiagonalLabels(param.value === 'true')
-                        );
+                        dispatch(selectTimelineDiagonalLabels(param.value === 'true'));
                         break;
                     case PARAM_LANGUAGE:
                         dispatch(selectLanguage(param.value));
-                        dispatch(
-                            selectComputedLanguage(
-                                getComputedLanguage(param.value)
-                            )
-                        );
+                        dispatch(selectComputedLanguage(getComputedLanguage(param.value)));
                         break;
                     default:
                 }
@@ -166,11 +141,7 @@ const App = () => {
                 setUserManager({ instance: null, error: error.message });
             });
         // Note: initialMatchSilentRenewCallbackUrl and dispatch don't change
-    }, [
-        initialMatchSilentRenewCallbackUrl,
-        dispatch,
-        initialMatchSigninCallbackUrl,
-    ]);
+    }, [initialMatchSilentRenewCallbackUrl, dispatch, initialMatchSigninCallbackUrl]);
 
     const connectNotificationsUpdateConfig = useCallback(() => {
         const ws = connectNotificationsWsUpdateConfig();
@@ -219,13 +190,7 @@ const App = () => {
                 ws.close();
             };
         }
-    }, [
-        user,
-        dispatch,
-        updateParams,
-        connectNotificationsUpdateConfig,
-        snackError,
-    ]);
+    }, [user, dispatch, updateParams, connectNotificationsUpdateConfig, snackError]);
 
     return (
         <>
@@ -238,39 +203,19 @@ const App = () => {
                                 path={'/'}
                                 element={
                                     configs.length > 0 && (
-                                        <Navigate
-                                            replace
-                                            to={
-                                                PREFIX_URL_PROCESSES +
-                                                '/' +
-                                                configs[0].process
-                                            }
-                                        />
+                                        <Navigate replace to={PREFIX_URL_PROCESSES + '/' + configs[0].process} />
                                     )
                                 }
                             />
                             <Route
                                 path="/sign-in-callback"
-                                element={
-                                    <Navigate
-                                        replace
-                                        to={getPreLoginPath() || '/'}
-                                    />
-                                }
+                                element={<Navigate replace to={getPreLoginPath() || '/'} />}
                             />
                             <Route
                                 path="/logout-callback"
-                                element={
-                                    <h1>
-                                        Error: logout failed; you are still
-                                        logged in.
-                                    </h1>
-                                }
-                            />
-                            <Route
-                                path={PREFIX_URL_PROCESSES + '/:processName'}
-                                element={<ProcessRouteElement />}
+                                element={<h1>Error: logout failed; you are still logged in.</h1>}
                             />
+                            <Route path={PREFIX_URL_PROCESSES + '/:processName'} element={<ProcessRouteElement />} />
                             <Route
                                 path="*"
                                 element={
@@ -286,9 +231,7 @@ const App = () => {
                         userManager={userManager}
                         signInCallbackError={signInCallbackError}
                         authenticationRouterError={authenticationRouterError}
-                        showAuthenticationRouterLogin={
-                            showAuthenticationRouterLogin
-                        }
+                        showAuthenticationRouterLogin={showAuthenticationRouterLogin}
                         dispatch={dispatch}
                         navigate={navigate}
                         location={location}

diff --git a/src/components/country-state-item.js b/src/components/country-state-item.js
@@ -48,26 +48,18 @@ const CountryStateItem = (props) => {
     const status = getIgmStatus(props.tso, props.merge);
     const color = tsoColor(status);
 
-    let replacedWith = status.replacingBusinessProcess
-        ? status.replacingBusinessProcess + ' '
-        : '';
+    let replacedWith = status.replacingBusinessProcess ? status.replacingBusinessProcess + ' ' : '';
     if (status.replacingDate) {
         replacedWith += new Date(status.replacingDate).toLocaleString();
     }
     return (
         <Box sx={styles.listItem}>
             <Grid container>
-                <Grid
-                    item
-                    xs={12}
-                    style={{ display: 'flex', width: '100%', padding: 8 }}
-                >
+                <Grid item xs={12} style={{ display: 'flex', width: '100%', padding: 8 }}>
                     <LensIcon sx={styles.stateIcon} style={{ color: color }} />
                     <Box sx={styles.tsosColumn}>
                         <Typography variant="body1">{props.tso}</Typography>
-                        <Typography variant="caption">
-                            {detail.countryName}
-                        </Typography>
+                        <Typography variant="caption">{detail.countryName}</Typography>
                     </Box>
                     {replacedWith && (
                         <Box sx={styles.textReplace}>