fix: MANO-PH

SocialGouv · Sep 15, 2023 · ff45d83 · ff45d83
1 parent 3e5bdf4
commit ff45d83
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 18 deletions.
diff --git a/dashboard/src/scenes/action/index.js b/dashboard/src/scenes/action/index.js
@@ -1,10 +1,16 @@
 import React from 'react';
 import { Switch } from 'react-router-dom';
-import SentryRoute from '../../components/Sentryroute';
+import { useRecoilValue } from 'recoil';
 
 import List from './list';
+import SentryRoute from '../../components/Sentryroute';
+import { currentTeamState } from '../../recoil/auth';
 
 const Router = () => {
+  const currentTeam = useRecoilValue(currentTeamState);
+
+  if (!currentTeam) return null;
+
   return (
     <Switch>
       <SentryRoute path="/" component={List} />

diff --git a/dashboard/src/scenes/reception/index.js b/dashboard/src/scenes/reception/index.js
@@ -1,10 +1,16 @@
 import React from 'react';
 import { Switch } from 'react-router-dom';
+import { useRecoilValue } from 'recoil';
 import SentryRoute from '../../components/Sentryroute';
 
 import View from './view';
+import { currentTeamState } from '../../recoil/auth';
 
 const Router = () => {
+  const currentTeam = useRecoilValue(currentTeamState);
+
+  if (!currentTeam) return null;
+
   return (
     <Switch>
       <SentryRoute path="/reception" component={View} />

diff --git a/dashboard/src/scenes/reception/view.js b/dashboard/src/scenes/reception/view.js
@@ -208,8 +208,8 @@ const Reception = () => {
       <SmallHeader
         title={
           <span data-test-id="reception-title">
-            Accueil du <b>{formatDateWithNameOfDay(now())}</b> de l'équipe {currentTeam?.nightSession ? 'de nuit ' : ''}
-            <b>{currentTeam?.name || ''}</b>
+            Accueil du <b>{formatDateWithNameOfDay(now())}</b> de l'équipe {currentTeam.nightSession ? 'de nuit ' : ''}
+            <b>{currentTeam.name || ''}</b>
           </span>
         }
       />
@@ -283,7 +283,7 @@ const Reception = () => {
           <ActionsCalendar
             actions={dataConsolidated}
             columns={['Heure', 'Nom', 'Personne suivie', 'Statut']}
-            isNightSession={currentTeam?.nightSession}
+            isNightSession={currentTeam.nightSession}
           />
         </Col>
         <Col md={4}>
@@ -306,20 +306,18 @@ const Reception = () => {
               )}
             </PassagesWrapper>
           )}
-          {!!currentTeam && (
-            <ServicesWrapper>
-              <h5 className="services-title">Services</h5>
-              <div className="services-incrementators">
-                <ReceptionService
-                  services={services}
-                  onUpdateServices={setServices}
-                  team={currentTeam}
-                  report={todaysReport}
-                  dateString={startOfToday().format('YYYY-MM-DD')}
-                />
-              </div>
-            </ServicesWrapper>
-          )}
+          <ServicesWrapper>
+            <h5 className="services-title">Services</h5>
+            <div className="services-incrementators">
+              <ReceptionService
+                services={services}
+                onUpdateServices={setServices}
+                team={currentTeam}
+                report={todaysReport}
+                dateString={startOfToday().format('YYYY-MM-DD')}
+              />
+            </div>
+          </ServicesWrapper>
         </Col>
       </Row>
       <PassagesToday isOpen={todaysPassagesOpen} setOpen={setTodaysPassagesOpen} passages={passages} />