Merge remote-tracking branch 'origin/main' into upgrade_lib_uuid_to_13.0.0

Signed-off-by: Franck LECUYER <[email protected]>

# Conflicts:
#	package-lock.json
#	package.json

Author: FranckLecuyer

jest.config.ts

@@ -10,7 +10,7 @@ import type { Config } from 'jest';
 const config: Config = {
     testEnvironment: 'jsdom',
     moduleNameMapper: {
-        '^.+\\.svg\\?react$': 'jest-svg-transformer',
+        '^.+\\.svg\\?react$': '<rootDir>/src/_mocks_/svg.tsx',
         '^.+\\.(css|less|scss)$': 'identity-obj-proxy',
     },
     // see https://github.com/react-dnd/react-dnd/issues/3443

package-lock.json

@@ -15,31 +15,31 @@
     },
     "dependencies": {
         "@emotion/react": "^11.14.0",
-        "@emotion/styled": "^11.14.0",
-        "@gridsuite/commons-ui": "file:../commons-ui/gridsuite-commons-ui-0.124.0.tgz",
-        "@hookform/resolvers": "^4.0.0",
-        "@mui/icons-material": "^5.16.14",
+        "@emotion/styled": "^11.14.1",
+        "@gridsuite/commons-ui": "file:../commons-ui/gridsuite-commons-ui-0.126.0.tgz",
+        "@hookform/resolvers": "^4.1.3",
+        "@mui/icons-material": "^5.18.0",
         "@mui/lab": "5.0.0-alpha.175",
-        "@mui/material": "^5.16.14",
-        "@mui/x-date-pickers": "^7.29.3",
-        "@mui/x-tree-view": "^7.28.1",
-        "@reduxjs/toolkit": "^2.5.1",
+        "@mui/material": "^5.18.0",
+        "@mui/x-date-pickers": "^7.29.4",
+        "@mui/x-tree-view": "^7.29.1",
+        "@reduxjs/toolkit": "^2.9.0",
         "ag-grid-community": "^33.1.0",
-        "ag-grid-react": "^33.1.0",
-        "core-js": "^3.40.0",
+        "ag-grid-react": "^33.3.2",
+        "core-js": "^3.45.1",
         "date-fns": "^4.1.0",
         "notistack": "^3.0.2",
         "oidc-client": "^1.11.5",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
-        "react-hook-form": "^7.54.2",
-        "react-hook-form-mui": "^7.6.0",
-        "react-intl": "^7.1.6",
+        "react-hook-form": "^7.62.0",
+        "react-hook-form-mui": "^7.6.2",
+        "react-intl": "^7.1.11",
         "react-redux": "^9.2.0",
-        "react-router": "^7.4.1",
+        "react-router": "^7.8.2",
         "redux": "^5.0.1",
         "typeface-roboto": "^1.1.13",
-        "yup": "^1.6.1"
+        "yup": "^1.7.0"
     },
     "scripts": {
         "start": "vite",
@@ -53,52 +53,52 @@
         "licenses-check": "license-checker --summary --excludePrivatePackages --production --onlyAllow \"$( jq -r .onlyAllow[] license-checker-config.json | tr '\n' ';')\""
     },
     "devDependencies": {
-        "@babel/helper-builder-react-jsx": "^7.25.9",
+        "@babel/helper-builder-react-jsx": "^7.27.1",
         "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-        "@babel/preset-env": "^7.26.8",
-        "@babel/preset-react": "^7.26.3",
-        "@babel/preset-typescript": "^7.26.0",
+        "@babel/preset-env": "^7.28.3",
+        "@babel/preset-react": "^7.27.1",
+        "@babel/preset-typescript": "^7.27.1",
         "@types/core-js": "^2.5.8",
         "@types/eslint": "^8.56.12",
         "@types/eslint-config-prettier": "^6.11.3",
         "@types/jest": "^27.5.2",
         "@types/license-checker": "^25.0.6",
-        "@types/node": "^22.13.4",
-        "@types/prop-types": "^15.7.14",
-        "@types/react": "^18.3.18",
-        "@types/react-dom": "^18.3.5",
+        "@types/node": "^22.18.1",
+        "@types/prop-types": "^15.7.15",
+        "@types/react": "^18.3.24",
+        "@types/react-dom": "^18.3.7",
         "@types/react-redux": "^7.1.34",
         "@types/react-window": "^1.8.8",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
-        "@vitejs/plugin-react": "^4.3.4",
+        "@vitejs/plugin-react": "^4.7.0",
         "babel-eslint": "^10.1.0",
         "babel-preset-vite": "^1.1.3",
         "eslint": "^8.57.1",
-        "eslint-config-prettier": "^10.1.1",
+        "eslint-config-prettier": "^10.1.8",
         "eslint-config-react-app": "^7.0.1",
         "eslint-import-resolver-typescript": "3.8.3",
         "eslint-plugin-flowtype": "^8.0.3",
-        "eslint-plugin-import": "^2.31.0",
+        "eslint-plugin-import": "^2.32.0",
         "eslint-plugin-jsx-a11y": "^6.10.2",
-        "eslint-plugin-prettier": "^5.2.5",
-        "eslint-plugin-react": "^7.37.4",
+        "eslint-plugin-prettier": "^5.5.4",
+        "eslint-plugin-react": "^7.37.5",
         "eslint-plugin-react-hooks": "^4.6.2",
-        "eslint-plugin-react-refresh": "^0.4.19",
+        "eslint-plugin-react-refresh": "^0.4.20",
         "identity-obj-proxy": "^3.0.0",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "jest-svg-transformer": "^1.0.0",
         "license-checker": "^25.0.1",
-        "prettier": "^3.5.3",
+        "prettier": "^3.6.2",
         "prettier-plugin-properties": "^0.3.0",
         "svgo": "^3.3.2",
         "ts-node": "^10.9.2",
-        "type-fest": "^4.34.1",
-        "typescript": "~5.1.6",
-        "vite": "^6.2.1",
+        "type-fest": "^4.41.0",
+        "typescript": "~5.6.3",
+        "vite": "^6.3.6",
         "vite-plugin-eslint": "^1.8.1",
-        "vite-plugin-svgr": "^4.3.0",
+        "vite-plugin-svgr": "^4.5.0",
         "vite-tsconfig-paths": "^5.1.4"
     }
 }

package.json

@@ -1,8 +1,13 @@
-/*
+/**
  * Copyright (c) 2024, 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 * from './router';
+export default function fetchMock() {
+    return Promise.resolve({
+        ok: true,
+        json: () => ({ appsMetadataServerUrl: '' }), // just to remove the error logs when fetching env
+    });
+}

src/routes/index.ts renamed to src/_mocks_/fetch.ts

@@ -1,11 +1,12 @@
-/*
+/**
  * Copyright (c) 2024, 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/.
  */
 
-import AppComponent from './app';
-export type App = typeof AppComponent;
+import { forwardRef, SVGProps } from 'react';
 
-export { AppWrapper } from './app-wrapper';
+const SvgrMock = forwardRef<SVGSVGElement, SVGProps<SVGSVGElement>>((props, ref) => <svg ref={ref} {...props} />);
+
+export default SvgrMock;

src/components/App/index.ts renamed to src/_mocks_/svg.tsx

@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2020, 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/.
+ */
+
+import { useCallback, useEffect, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { Grid } from '@mui/material';
+import {
+    AnnouncementNotification,
+    AuthenticationRouter,
+    CardErrorBoundary,
+    fetchConfigParameter,
+    fetchConfigParameters,
+    getComputedLanguage,
+    getPreLoginPath,
+    initializeAuthenticationProd,
+    NotificationsUrlKeys,
+    useNotificationsListener,
+    UserManagerState,
+    useSnackMessage,
+} from '@gridsuite/commons-ui';
+import { selectComputedLanguage, selectLanguage, selectTheme } from '../../redux/actions';
+import { AppState } from '../../redux/reducer';
+import { AppsMetadataSrv, ConfigParameters } from '../../services';
+import { APP_NAME, COMMON_APP_NAME, PARAM_LANGUAGE, PARAM_THEME } from '../../utils/config-params';
+import AppTopBar from './AppTopBar';
+import { useDebugRender } from '../../utils/hooks';
+import { AppDispatch } from '../../redux/store';
+import { Navigate, Route, Routes, useLocation, useMatch, useNavigate } from 'react-router';
+import PageNotFound from './PageNotFound';
+import { FormattedMessage } from 'react-intl';
+import { MainPaths } from './utils';
+import { Announcements, Groups, Profiles, Users } from '../../pages';
+import HomePage from './HomePage';
+
+export default function App() {
+    useDebugRender('app');
+    const { snackError } = useSnackMessage();
+    const dispatch = useDispatch<AppDispatch>();
+    const user = useSelector((state: AppState) => state.user);
+
+    const updateParams = useCallback(
+        (params: ConfigParameters) => {
+            console.groupCollapsed('received UI parameters');
+            console.table(params);
+            console.groupEnd();
+            params.forEach((param) => {
+                switch (param.name) {
+                    case PARAM_THEME:
+                        dispatch(selectTheme(param.value));
+                        break;
+                    case PARAM_LANGUAGE:
+                        dispatch(selectLanguage(param.value));
+                        dispatch(selectComputedLanguage(getComputedLanguage(param.value)));
+                        break;
+                    default:
+                        break;
+                }
+            });
+        },
+        [dispatch]
+    );
+
+    const updateConfig = useCallback(
+        (event: MessageEvent) => {
+            const eventData = JSON.parse(event.data);
+            if (eventData?.headers?.parameterName) {
+                fetchConfigParameter(APP_NAME, eventData.headers.parameterName)
+                    .then((param) => updateParams([param]))
+                    .catch((error) => snackError({ messageTxt: error.message, headerId: 'paramsRetrievingError' }));
+            }
+        },
+        [updateParams, snackError]
+    );
+
+    useNotificationsListener(NotificationsUrlKeys.CONFIG, { listenerCallbackMessage: updateConfig });
+
+    useEffect(() => {
+        if (user !== null) {
+            fetchConfigParameters(COMMON_APP_NAME)
+                .then((params) => updateParams(params))
+                .catch((error) =>
+                    snackError({
+                        messageTxt: error.message,
+                        headerId: 'paramsRetrievingError',
+                    })
+                );
+
+            fetchConfigParameters(APP_NAME)
+                .then((params) => updateParams(params))
+                .catch((error) =>
+                    snackError({
+                        messageTxt: error.message,
+                        headerId: 'paramsRetrievingError',
+                    })
+                );
+        }
+    }, [user, dispatch, updateParams, snackError]);
+
+    const signInCallbackError = useSelector((state: AppState) => state.signInCallbackError);
+    const authenticationRouterError = useSelector((state: AppState) => state.authenticationRouterError);
+    const showAuthenticationRouterLogin = useSelector((state: AppState) => state.showAuthenticationRouterLogin);
+    const [userManager, setUserManager] = useState<UserManagerState>({
+        instance: null,
+        error: null,
+    });
+    const navigate = useNavigate();
+    const location = useLocation();
+
+    // Can't use lazy initializer because useRouteMatch is a hook
+    const [initialMatchSilentRenewCallbackUrl] = useState(
+        useMatch({
+            path: '/silent-renew-callback',
+        })
+    );
+
+    const [initialMatchSigninCallbackUrl] = useState(
+        useMatch({
+            path: '/sign-in-callback',
+        })
+    );
+
+    useEffect(() => {
+        // need subfunction when async as suggested by rule react-hooks/exhaustive-deps
+        (async function initializeAuthentication() {
+            try {
+                setUserManager({
+                    instance: await initializeAuthenticationProd(
+                        dispatch,
+                        initialMatchSilentRenewCallbackUrl != null,
+                        AppsMetadataSrv.fetchIdpSettings,
+                        initialMatchSigninCallbackUrl != null
+                    ),
+                    error: null,
+                });
+            } catch (error: any) {
+                setUserManager({ instance: null, error: error.message });
+            }
+        })();
+        // Note: initialMatchSilentRenewCallbackUrl and dispatch don't change
+    }, [initialMatchSilentRenewCallbackUrl, dispatch, initialMatchSigninCallbackUrl]);
+
+    return (
+        <Grid
+            container
+            direction="column"
+            spacing={0}
+            justifyContent="flex-start"
+            alignItems="stretch"
+            sx={{ height: '100vh', width: '100vw' }}
+        >
+            <Grid item xs="auto">
+                <AppTopBar userManagerInstance={userManager.instance} />
+            </Grid>
+            <Grid item xs="auto">
+                <AnnouncementNotification user={user} />
+            </Grid>
+            <Grid item container xs component="main" height={'100%'}>
+                <CardErrorBoundary>
+                    <div
+                        className="singlestretch-parent"
+                        style={{
+                            flexGrow: 1,
+                        }}
+                    >
+                        {user !== null ? (
+                            <Routes>
+                                <Route path={'/'} element={<HomePage />} />
+                                <Route path={`/${MainPaths.users}`} element={<Users />} />
+                                <Route path={`/${MainPaths.profiles}`} element={<Profiles />} />
+                                <Route path={`/${MainPaths.groups}`} element={<Groups />} />
+                                <Route path={`/${MainPaths.announcements}`} element={<Announcements />} />
+                                <Route
+                                    path="/sign-in-callback"
+                                    element={<Navigate replace to={getPreLoginPath() || '/'} />}
+                                />
+                                <Route
+                                    path="/logout-callback"
+                                    element={<h1>Error: logout failed; you are still logged in.</h1>}
+                                />
+                                <Route
+                                    path="*"
+                                    element={<PageNotFound message={<FormattedMessage id="PageNotFound" />} />}
+                                />
+                            </Routes>
+                        ) : (
+                            <AuthenticationRouter
+                                userManager={userManager}
+                                signInCallbackError={signInCallbackError}
+                                authenticationRouterError={authenticationRouterError}
+                                showAuthenticationRouterLogin={showAuthenticationRouterLogin}
+                                dispatch={dispatch}
+                                navigate={navigate}
+                                location={location}
+                            />
+                        )}
+                    </div>
+                </CardErrorBoundary>
+            </Grid>
+        </Grid>
+    );
+}