AKR:OTR:VKT:YKI:SHARED(Frontend) fix error toast. Also revert date pi…

…cker back to 5.x
Opetushallitus · Jan 8, 2024 · 985b03d · 985b03d
1 parent 24d5f2a
commit 985b03d
Show file tree

Hide file tree

Showing 13 changed files with 186 additions and 66 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@opetushallitus/kieli-ja-kaantajatutkinnot.root",
   "engines": {
-    "node": "16.16.0"
+    "node": "v20.9.0"
   },
   "packageManager": "[email protected]",
   "private": true,
@@ -31,7 +31,7 @@
     "@mui/icons-material": "^5.14.16",
     "@mui/material": "^5.14.17",
     "@mui/system": "^5.14.17",
-    "@mui/x-date-pickers": "^6.18.0",
+    "@mui/x-date-pickers": "^5.0.20",
     "@reduxjs/toolkit": "^1.9.7",
     "@types/js-cookie": "^3.0.5",
     "axios": "^1.6.0",

diff --git a/frontend/packages/akr/src/routers/AppRouter.tsx b/frontend/packages/akr/src/routers/AppRouter.tsx
@@ -33,10 +33,17 @@ import { StatisticsPage } from 'pages/StatisticsPage';
 export const AppRouter: FC = () => {
   const translateCommon = useCommonTranslation();
 
+  const ErrorToast = () => {
+    useAPIErrorToast();
+
+    return <></>;
+  };
+
   const Root = (
     <div className="app">
       <NotifierContextProvider>
         <Header />
+        <ErrorToast />
         <Notifier />
         <ScrollToTop />
         <main className="content" id="main-content">
@@ -52,7 +59,6 @@ export const AppRouter: FC = () => {
   useEffect(() => {
     document.title = translateCommon('appTitle');
   }, [translateCommon]);
-  useAPIErrorToast();
 
   const router = createBrowserRouter(
     createRoutesFromElements(

diff --git a/frontend/packages/akr/src/tests/cypress/integration/clerk/clerk_send_email.spec.ts b/frontend/packages/akr/src/tests/cypress/integration/clerk/clerk_send_email.spec.ts
@@ -61,7 +61,7 @@ describe('ClerkSendEmailPage', () => {
     onToast.expectText('Sähköpostisi lähetettiin kääntäjille');
   });
 
-  it.skip('should display an error toast if there was an error when sending the email', () => {
+  it('should display an error toast if there was an error when sending the email', () => {
     fillAndSendMessage();
 
     runWithIntercept(

diff --git a/frontend/packages/akr/src/tests/cypress/integration/clerk/examination_dates.spec.ts b/frontend/packages/akr/src/tests/cypress/integration/clerk/examination_dates.spec.ts
@@ -54,7 +54,7 @@ describe('ExaminationDatesPage', () => {
     onExaminationDatesPage.expectRowToContain(1, '18.11.2021');
   });
 
-  it.skip('should let user to add a new, unique examination date', () => {
+  it('should let user to add a new, unique examination date', () => {
     onExaminationDatesPage.expectTotalExaminationDatesCount(10);
     onExaminationDatesPage.expectAddButtonDisabled();
 
@@ -74,12 +74,12 @@ describe('ExaminationDatesPage', () => {
     onToast.expectText('Tutkintopäivän 04.10.2030 lisäys onnistui');
   });
 
-  it.skip('should not add duplicate examination dates', () => {
+  it('should not add duplicate examination dates', () => {
     onExaminationDatesPage.setDateForNewExaminationDate('01.01.2022');
     onExaminationDatesPage.expectAddButtonDisabled();
   });
 
-  it.skip('should show a generic API error toast when trying to add a examination date', () => {
+  it('should show a generic API error toast when trying to add a examination date', () => {
     onExaminationDatesPage.setDateForNewExaminationDate('04.10.2030');
 
     cy.intercept('POST', APIEndpoints.ExaminationDate, {
@@ -128,7 +128,7 @@ describe('ExaminationDatesPage', () => {
     onToast.expectText('Tutkintopäivä 18.11.2021 poistettu');
   });
 
-  it.skip('should show an error toast if examination date is chosen to be deleted, but an API error occurs', () => {
+  it('should show an error toast if examination date is chosen to be deleted, but an API error occurs', () => {
     onExaminationDatesPage.filterByStatus(ExaminationDateStatus.Passed);
     onExaminationDatesPage.clickDeleteRowIcon(1);
 

diff --git a/frontend/packages/akr/src/tests/cypress/integration/clerk/meeting_dates.spec.ts b/frontend/packages/akr/src/tests/cypress/integration/clerk/meeting_dates.spec.ts
@@ -53,7 +53,7 @@ describe('MeetingDatesPage', () => {
     onMeetingDatesPage.expectRowToContain(1, '18.11.2021');
   });
 
-  it.skip('should let user to add a new, unique meeting date', () => {
+  it('should let user to add a new, unique meeting date', () => {
     onMeetingDatesPage.expectTotalMeetingDatesCount(10);
     onMeetingDatesPage.expectAddButtonDisabled();
 
@@ -73,12 +73,12 @@ describe('MeetingDatesPage', () => {
     onToast.expectText('Kokouspäivän 04.10.2030 lisäys onnistui');
   });
 
-  it.skip('should not add duplicate meeting dates', () => {
+  it('should not add duplicate meeting dates', () => {
     onMeetingDatesPage.setDateForNewMeetingDate('01.01.2022');
     onMeetingDatesPage.expectAddButtonDisabled();
   });
 
-  it.skip('should show a generic API error toast when trying to add a meeting date', () => {
+  it('should show a generic API error toast when trying to add a meeting date', () => {
     onMeetingDatesPage.setDateForNewMeetingDate('04.10.2030');
 
     cy.intercept('POST', APIEndpoints.MeetingDate, {
@@ -126,7 +126,7 @@ describe('MeetingDatesPage', () => {
     onToast.expectText('Kokouspäivä 18.11.2021 poistettu');
   });
 
-  it.skip('should show an error toast if meeting date is chosen to be deleted, but an API error occurs', () => {
+  it('should show an error toast if meeting date is chosen to be deleted, but an API error occurs', () => {
     onMeetingDatesPage.filterByStatus(MeetingDateStatus.Passed);
     onMeetingDatesPage.clickDeleteRowIcon(1);
 

diff --git a/.../src/tests/cypress/integration/clerk/translatorOverview/clerk_translator_overview.spec.ts b/.../src/tests/cypress/integration/clerk/translatorOverview/clerk_translator_overview.spec.ts
@@ -13,7 +13,7 @@ beforeEach(() => {
 });
 
 describe('ClerkTranslatorOverview:Page', () => {
-  it.skip('should display a "not found" message if no translator exists with the id given as the route parameter', () => {
+  it('should display a "not found" message if no translator exists with the id given as the route parameter', () => {
     onClerkTranslatorOverviewPage.navigateById(1234567890);
     onClerkTranslatorOverviewPage.expectTranslatorNotFoundText();
     cy.isOnPage(AppRoutes.ClerkHomePage);

diff --git a/frontend/packages/otr/src/routers/AppRouter.tsx b/frontend/packages/otr/src/routers/AppRouter.tsx
@@ -30,10 +30,17 @@ import { PublicHomePage } from 'pages/PublicHomePage';
 export const AppRouter: FC = () => {
   const translateCommon = useCommonTranslation();
 
+  const ErrorToast = () => {
+    useAPIErrorToast();
+
+    return <></>;
+  };
+
   const Root = (
     <div className="app">
       <NotifierContextProvider>
         <Header />
+        <ErrorToast />
         <Notifier />
         <ScrollToTop />
         <main className="content" id="main-content">
@@ -49,7 +56,6 @@ export const AppRouter: FC = () => {
   useEffect(() => {
     document.title = translateCommon('appTitle');
   }, [translateCommon]);
-  useAPIErrorToast();
 
   const router = createBrowserRouter(
     createRoutesFromElements(

diff --git a/frontend/packages/otr/src/tests/cypress/integration/meeting_dates.spec.ts b/frontend/packages/otr/src/tests/cypress/integration/meeting_dates.spec.ts
@@ -37,19 +37,19 @@ describe('MeetingDatesPage', () => {
     onMeetingDatesPage.expectRowToContain(1, '01.01.2022');
   });
 
-  it.skip('should let user to add a new, unique meeting date', () => {
+  it('should let user to add a new, unique meeting date', () => {
     onMeetingDatesPage.setDateForNewMeetingDate(dateForNewMeetingDate);
     onMeetingDatesPage.clickAddButton();
 
     onToast.expectText(`Kokouspäivän ${dateForNewMeetingDate} lisäys onnistui`);
   });
 
-  it.skip('should not allow adding duplicate meeting dates', () => {
+  it('should not allow adding duplicate meeting dates', () => {
     onMeetingDatesPage.setDateForNewMeetingDate('01.01.2022');
     onMeetingDatesPage.expectAddButtonDisabled();
   });
 
-  it.skip('should show an error toast when trying to add a meeting date fails', () => {
+  it('should show an error toast when trying to add a meeting date fails', () => {
     onMeetingDatesPage.setDateForNewMeetingDate('01.01.2030');
     onMeetingDatesPage.clickAddButton();
 
@@ -64,7 +64,7 @@ describe('MeetingDatesPage', () => {
     onToast.expectText('Kokouspäivä 01.01.2022 poistettu');
   });
 
-  it.skip('should show an error toast if meeting date is chosen to be deleted, but an API error occurs', () => {
+  it('should show an error toast if meeting date is chosen to be deleted, but an API error occurs', () => {
     onMeetingDatesPage.clickDeleteRowIcon(0);
     onDialog.clickButtonByText('Kyllä');
 

diff --git a/frontend/packages/shared/src/components/CustomDatePicker/CustomDatePicker.tsx b/frontend/packages/shared/src/components/CustomDatePicker/CustomDatePicker.tsx
@@ -46,17 +46,15 @@ export const CustomDatePicker = ({
         disabled={disabled}
         minDate={minDate ?? dayjs(MIN_DATE)}
         maxDate={maxDate ?? dayjs(MAX_DATE)}
-        slots={{
-          textField: (params) => {
-            const textFieldParams = {
-              ...params,
-              error,
-              helperText,
-              showHelperText,
-            };
+        renderInput={(params) => {
+          const textFieldParams = {
+            ...params,
+            error,
+            helperText,
+            showHelperText,
+          };
 
-            return <CustomTextField {...textFieldParams} />;
-          },
+          return <CustomTextField {...textFieldParams} />;
         }}
       />
     </LocalizationProvider>

diff --git a/frontend/packages/shared/src/configs/materialUI.ts b/frontend/packages/shared/src/configs/materialUI.ts
@@ -82,7 +82,7 @@ export const theme = createTheme({
         },
       },
     },
-    MuiDateCalendar: {
+    MuiCalendarPicker: {
       styleOverrides: {
         root: {
           '& .MuiTypography-caption': {

diff --git a/frontend/packages/vkt/src/routers/AppRouter.tsx b/frontend/packages/vkt/src/routers/AppRouter.tsx
@@ -36,15 +36,20 @@ export const AppRouter: FC = () => {
   const translateCommon = useCommonTranslation();
   const appTitle = translateCommon('appTitle');
 
-  useAPIErrorToast();
-
   const createTitle = (title: string) =>
     translateCommon('pageTitle.' + title) + ' - ' + appTitle;
 
+  const ErrorToast = () => {
+    useAPIErrorToast();
+
+    return <></>;
+  };
+
   const Root = (
     <div className="app">
       <NotifierContextProvider>
         <Header />
+        <ErrorToast />
         <Notifier />
         <ScrollToTop />
         <PersistGate persistor={persistor} />

diff --git a/frontend/packages/yki/src/routers/AppRouter.tsx b/frontend/packages/yki/src/routers/AppRouter.tsx
@@ -48,12 +48,17 @@ export const AppRouter: FC = () => {
     }
   }, [dispatch, sessionStatus]);
 
-  useAPIErrorToast();
+  const ErrorToast = () => {
+    useAPIErrorToast();
+
+    return <></>;
+  };
 
   const Root = (
     <div className="app">
       <NotifierContextProvider>
         <Header />
+        <ErrorToast />
         <Notifier />
         <ScrollToTop />
         <main className="content" id="main-content">