fix: [P4PU-848] update routing and error handling in PreLoginLayout (#…

…249)
pagopa · Feb 19, 2025 · 7707469 · 7707469
1 parent 5094293
commit 7707469
Show file tree

Hide file tree

Showing 5 changed files with 91 additions and 37 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Navigate, RouterProvider, createBrowserRouter, useRouteError } from 'react-router-dom';
 import { Theme } from './utils/style';
 import { Layout } from './components/Layout';
-import { ArcRoutes } from './routes/routes';
+import { ArcErrors, ArcRoutes } from './routes/routes';
 import TransactionRoute from './routes/Transaction';
 import DashboardRoute from './routes/Dashboard';
 import { theme } from '@pagopa/mui-italia';
@@ -36,15 +36,6 @@ const router = createBrowserRouter([
           throw useRouteError();
         }
       },
-      {
-        path: ArcRoutes.COURTESY_PAGE,
-        loader: ({ params }) => Promise.resolve(params.error),
-        element: (
-          <PreLoginLayout>
-            <CourtesyPage />
-          </PreLoginLayout>
-        )
-      },
       {
         path: ArcRoutes.LOGIN,
         element: (
@@ -53,27 +44,37 @@ const router = createBrowserRouter([
           </PreLoginLayout>
         )
       },
-      {
-        path: ArcRoutes.TOS,
-        element: (
-          <PreLoginLayout>
-            <Resources resource="tos" />
-          </PreLoginLayout>
-        )
-      },
-      {
-        path: ArcRoutes.PRIVACY_POLICY,
-        element: (
-          <PreLoginLayout>
-            <Resources resource="pp" />
-          </PreLoginLayout>
-        )
-      },
       {
         path: ArcRoutes.AUTH_CALLBACK,
         element: <AuthCallback />,
         loader: ({ request }) => getTokenOneidentity(request)
       },
+      {
+        path: ArcRoutes.COURTESY_PAGE.replace(':error', ''),
+        element: <PreLoginLayout />,
+        children: [
+          {
+            path: ArcErrors['401'],
+            loader: () => ArcErrors['401'],
+            element: <CourtesyPage />
+          },
+          {
+            path: ArcErrors['403'],
+            loader: () => ArcErrors['403'],
+            element: <CourtesyPage />
+          },
+          {
+            path: ArcErrors['404'],
+            loader: () => ArcErrors['404'],
+            element: <CourtesyPage />
+          },
+          {
+            path: ArcErrors['408'],
+            loader: () => ArcErrors['408'],
+            element: <CourtesyPage />
+          }
+        ]
+      },
       {
         path: ArcRoutes.DASHBOARD,
         element: (
@@ -171,7 +172,25 @@ const router = createBrowserRouter([
                   }
                 }
               ]
-            : [])
+            : []),
+          {
+            path: ArcRoutes.TOS,
+            element: <Resources resource="tos" />
+          },
+          {
+            path: ArcRoutes.PRIVACY_POLICY,
+            element: <Resources resource="pp" />
+          },
+          {
+            path: ArcRoutes.COURTESY_PAGE,
+            loader: ({ params }) => Promise.resolve(params.error),
+            element: <CourtesyPage />,
+            handle: {
+              sidebar: {
+                visibile: false
+              }
+            }
+          }
         ]
       }
     ]

diff --git a/src/components/AssistanceForm/AssistanceForm.tsx b/src/components/AssistanceForm/AssistanceForm.tsx
@@ -160,7 +160,12 @@ export const AssistanceForm = () => {
             <Trans
               i18nKey={t('app.assistance.privacy')}
               components={{
-                link1: <Link href="#" fontWeight={800} />
+                link1: (
+                  <Link
+                    href="https://www.pagopa.it/it/privacy-policy-assistenza/"
+                    fontWeight={800}
+                  />
+                )
               }}
             />
           </Typography>

diff --git a/src/components/Cart/CartDrawer.test.tsx b/src/components/Cart/CartDrawer.test.tsx
@@ -15,15 +15,10 @@ vi.mock(import('store/CartStore'), async (importOriginal) => {
   };
 });
 
+const mockUseStore = vi.hoisted(() => vi.fn());
 vi.mock('store/GlobalStore', () => {
   return {
-    useStore: () => ({
-      state: {
-        cart: {
-          items: []
-        }
-      }
-    })
+    useStore: mockUseStore
   };
 });
 
@@ -40,6 +35,14 @@ describe('CartDrawer', () => {
   });
 
   it('renders the cart drawer when empty', () => {
+    mockUseStore.mockReturnValue({
+      state: {
+        cart: {
+          items: []
+        }
+      }
+    });
+
     render(
       <QueryClientProvider client={queryClient}>
         <CartDrawer />
@@ -77,4 +80,29 @@ describe('CartDrawer', () => {
     expect(toggleCartDrawer).toHaveBeenCalled();
     expect(mockNavigate).toHaveBeenCalledWith(ArcRoutes.PAYMENT_NOTICES);
   });
+
+  it('allow the click on pay button when the cart is not empty', () => {
+    mockUseStore.mockReturnValue({
+      state: {
+        cart: {
+          items: [
+            {
+              amount: 100,
+              iuv: 'iuvTest',
+              paFullName: 'paFullNameTest',
+              description: 'descriptionTest'
+            }
+          ]
+        }
+      }
+    });
+
+    render(
+      <QueryClientProvider client={queryClient}>
+        <CartDrawer />
+      </QueryClientProvider>
+    );
+    const payButton = screen.getByText('app.cart.items.pay');
+    fireEvent.click(payButton);
+  });
 });
diff --git a/src/components/Cart/CartDrawer.tsx b/src/components/Cart/CartDrawer.tsx
@@ -43,6 +43,7 @@ export const CartDrawer = () => {
 
   const onPayButton = () => {
     carts.mutate({ notices: cart.items, email });
+    toggleCartDrawer();
   };
 
   return (

diff --git a/src/components/PreLoginLayout.tsx b/src/components/PreLoginLayout.tsx
@@ -4,8 +4,9 @@ import utils from 'utils';
 import { HeaderAccount } from '@pagopa/mui-italia';
 import { ReactJSXElement } from '@emotion/react/types/jsx-namespace';
 import { Footer } from './Footer';
+import { Outlet } from 'react-router-dom';
 
-export function PreLoginLayout({ children }: { children: ReactJSXElement }) {
+export function PreLoginLayout({ children }: { children?: ReactJSXElement }) {
   const ASSISTANCE_MAIL = utils.config.assistanceLink;
   const onAssistanceClick = () => {
     window.open(`mailto:${ASSISTANCE_MAIL}`);
@@ -44,7 +45,7 @@ export function PreLoginLayout({ children }: { children: ReactJSXElement }) {
             alignItems={'center'}
             justifyContent={'center'}
             width={'100%'}>
-            {children}
+            {children || <Outlet />}
           </Grid>
           <Grid
             item