feat(fe-piattaforma): fe updates 08112022

teamdigitale · Aug 11, 2022 · d9e1f6e · d9e1f6e
1 parent e8b1766
commit d9e1f6e
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 6 deletions.
diff --git a/fe-piattaforma/src/components/Breadcrumb/breadCrumb.tsx b/fe-piattaforma/src/components/Breadcrumb/breadCrumb.tsx
@@ -95,10 +95,12 @@ const Breadcrumb = () => {
               label: getLabelBreadcrumb(elem),
               url: createUrl(index),
               link:
-                (userProfile?.codiceRuolo === userRoles.REGP &&
+                ((userProfile?.codiceRuolo === userRoles.REGP ||
+                  userProfile?.codiceRuolo === userRoles.FAC) &&
                   getLabelBreadcrumb(elem) === 'Progetti') ||
                 ((userProfile?.codiceRuolo === userRoles.REG ||
-                  userProfile?.codiceRuolo === userRoles.REGP) &&
+                  userProfile?.codiceRuolo === userRoles.REGP ||
+                  userProfile?.codiceRuolo === userRoles.FAC) &&
                   getLabelBreadcrumb(elem) === 'Programmi')
                   ? false
                   : index !== 0 && index !== currentLocation?.length - 2,

diff --git a/fe-piattaforma/src/components/Header/header.tsx b/fe-piattaforma/src/components/Header/header.tsx
@@ -42,7 +42,8 @@ const parseMenuRoute = (menuRoute: MenuItem, userProfile: UserProfileI) => {
       }
       return menuRoute;
     }
-    case userRoles.REGP: {
+    case userRoles.REGP:
+    case userRoles.FAC: {
       if (userProfile?.idProgetto && menuRoute.path === '/area-amministrativa/progetti') {
         return {
           ...menuRoute,

diff --git a/...ttaforma/src/pages/administrator/AdministrativeArea/Entities/Programs/programsDetails.tsx b/...ttaforma/src/pages/administrator/AdministrativeArea/Entities/Programs/programsDetails.tsx
@@ -1030,7 +1030,7 @@ const ProgramsDetails: React.FC = () => {
           buttonsPosition={buttonsPosition}
           goBackTitle='Elenco programmi'
           goBackPath='/area-amministrativa/programmi'
-          showGoBack={userRole !== userRoles.REG && userRole !== userRoles.REGP}
+          showGoBack={userRole !== userRoles.REG && userRole !== userRoles.REGP && userRole !== userRoles.FAC}
           surveyDefault={surveyDefault}
           isRadioButtonItem={radioButtonsSurveys}
           onRadioChange={(surveyCheckedId: string) =>

diff --git a/...ttaforma/src/pages/administrator/AdministrativeArea/Entities/Projects/projectsDetails.tsx b/...ttaforma/src/pages/administrator/AdministrativeArea/Entities/Projects/projectsDetails.tsx
@@ -1135,7 +1135,7 @@ const ProjectsDetails = () => {
                 ? 'Elenco progetti'
                 : 'Torna indietro'
             }
-            showGoBack={userRole !== userRoles.REGP}
+            showGoBack={userRole !== userRoles.REGP && userRole !== userRoles.FAC}
           >
             <>
               {currentForm}

diff --git a/fe-piattaforma/src/pages/administrator/AdministrativeArea/Entities/utils.ts b/fe-piattaforma/src/pages/administrator/AdministrativeArea/Entities/utils.ts
@@ -175,4 +175,5 @@ export const userRoles = {
   REG: 'REG',
   REGP: 'REGP',
   VOL: 'VOL',
+  FAC: 'FAC',
 }
diff --git a/fe-piattaforma/src/pages/common/Auth/authRedirect.tsx b/fe-piattaforma/src/pages/common/Auth/authRedirect.tsx
@@ -15,6 +15,8 @@ const AuthRedirect = () => {
   const profile = useAppSelector(selectProfile);
   const navigate = useNavigate();
 
+  console.log('passa')
+
   const redirectTo = (to: string, replace = true) => {
     navigate(to, { replace });
   };
@@ -23,6 +25,7 @@ const AuthRedirect = () => {
     if (profile?.codiceRuolo) {
       const { codiceRuolo, idProgramma, idProgetto } = profile;
       switch (codiceRuolo) {
+        case userRoles.FAC:
         case userRoles.VOL:
         case userRoles.REG:
         case userRoles.REGP: {

diff --git a/fe-piattaforma/src/routes/index.tsx b/fe-piattaforma/src/routes/index.tsx
@@ -199,16 +199,24 @@ const AppRoutes: React.FC = () => {
           </>
         ) : (
           <>
+            <Route path='/auth' element={<Auth />} />
             <Route path='/' element={<FullLayout />}>
               <Route path='/onboarding' element={<Onboarding />} />
+              <Route
+                path='/'
+                element={<Navigate replace to={defaultRedirectUrl} />}
+              />
             </Route>
-            <Route path='/auth' element={<Auth />} />
           </>
         )}
         <Route path='/' element={<FullLayout />}>
           {/* Public Paths */}
           <Route path='/open-data' element={<OpenData />} />
         </Route>
+        <Route
+          path='/'
+          element={<Navigate replace to={defaultRedirectUrl} />}
+        />
         <Route
           path='*'
           element={<Navigate replace to={defaultRedirectUrl} />}