Merge branch 'v2-master' into v2-develop

InseeFr · Oct 17, 2023 · 26eccca · 26eccca
2 parents 08e15b9 + cc707b7
commit 26eccca
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stromae",
-  "version": "2.4.10",
+  "version": "2.4.11",
   "description": "Web application for the management of questionnaires powered by Lunatic",
   "repository": {
     "type": "git",

diff --git a/src/components/auth/provider/component.js b/src/components/auth/provider/component.js
@@ -5,8 +5,26 @@ import { useRef, useState } from 'react';
 import { OIDC, READ_ONLY } from '../../../utils/constants';
 import { useAsyncEffect } from '../../../utils/hooks/useAsyncEffect';
 import { environment, oidcConf } from '../../../utils/read-env-vars';
+import { Button } from '../../designSystem';
 import { LoaderSimple } from '../../shared/loader';
 
+const SessionLostComponent = () => (
+  <>
+    <h1 className=''>Vous avez été déconnecté.</h1>
+    <p>
+      Vos réponses ont été sauvegardées, vous pourrez ainsi compléter
+      ultèrieurement votre questionnaire.
+    </p>
+    <Button
+      onClick={() => {
+        window.location = window.location.href;
+      }}
+    >
+      Se reconnecter
+    </Button>
+  </>
+);
+
 const AuthenticatingErrorComponent = () => (
   <h1>Erreur lors de l'authentification</h1>
 );
@@ -56,7 +74,7 @@ export function AuthProvider({ children }) {
         loadingComponent={LoaderSimple}
         authenticatingComponent={LoaderSimple}
         callbackSuccessComponent={LoaderSimple}
-        sessionLostComponent={LoaderSimple}
+        sessionLostComponent={SessionLostComponent}
         authenticatingErrorComponent={AuthenticatingErrorComponent}
         serviceWorkerNotSupportedComponent={ServiceWorkerNotSupportedComponent}
       >

diff --git a/src/components/orchestrator/collector/index.js b/src/components/orchestrator/collector/index.js
@@ -2,7 +2,7 @@ import * as lunatic from '@inseefr/lunatic';
 import Card from '@material-ui/core/Card';
 import Container from '@material-ui/core/Container';
 import { makeStyles } from '@material-ui/core/styles';
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { memo, useCallback, useEffect, useRef, useState } from 'react';
 import { simpleLog } from '../../../utils/events';
 import {
   END_PAGE,
@@ -23,7 +23,7 @@ import '../custom-lunatic.scss';
 import { ButtonsNavigation } from '../navigation';
 import { StyleWrapper } from '../styleWrapper';
 
-export const Orchestrator = ({
+const OrchestratorComponent = ({
   source,
   logoutAndClose: quit,
   stromaeData,
@@ -299,6 +299,8 @@ export const Orchestrator = ({
   );
 };
 
+export const Orchestrator = memo(OrchestratorComponent);
+
 const useStyles = makeStyles((theme) => ({
   root: {
     flex: '1 1 auto',

diff --git a/src/components/orchestrator/manager/orchestratorManager.js b/src/components/orchestrator/manager/orchestratorManager.js
@@ -16,6 +16,7 @@ import {
 import {
   useAPI,
   useAPIRemoteData,
+  useConstCallback,
   useGetReferentiel,
 } from '../../../utils/hooks';
 import { useAuth, useAuthUser } from '../../../utils/oidc';
@@ -32,6 +33,10 @@ const useStyles = makeStyles((theme) => ({
   },
 }));
 
+const preferences = ['COLLECTED'];
+const features = ['VTL', 'MD'];
+const savingType = 'COLLECTED';
+
 const { PORTAIL_URL: portail } = environment;
 
 const OrchestratorManager = () => {
@@ -58,7 +63,7 @@ const OrchestratorManager = () => {
 
   const [errorSending, setErrorSending] = useState(null);
 
-  const sendData = async (dataToSave) => {
+  const sendData = useConstCallback(async (dataToSave) => {
     if (!readonly) {
       const { data, stateData } = dataToSave;
       const { /*status,*/ error: dataError } = await putData(data);
@@ -71,11 +76,11 @@ const OrchestratorManager = () => {
         if (paradataPostError) setErrorSending('Error during sending');
       LOGGER.clear();
     }
-  };
+  });
 
-  const logoutAndClose = () => {
+  const logoutAndClose = useConstCallback(() => {
     logout(`${portail}/${getCurrentSurvey(window.location.href)}`);
-  };
+  });
 
   useEffect(() => {
     if (isAuthenticated && questionnaire) {
@@ -109,9 +114,9 @@ const OrchestratorManager = () => {
           autoSuggesterLoading={true}
           getReferentiel={getReferentiel}
           save={sendData}
-          savingType='COLLECTED'
-          preferences={['COLLECTED']}
-          features={['VTL', 'MD']}
+          savingType={savingType}
+          preferences={preferences}
+          features={features}
           pagination={true}
           activeControls={true}
           readonly={readonly}