AKR:OTR:VKT:YKI:SHARED(Frontend) useBlocker fixes

Opetushallitus · Jan 15, 2024 · a05b49f · a05b49f
1 parent a7e1034
commit a05b49f
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/...r/src/tests/cypress/integration/clerk/translatorOverview/clerk_translator_details.spec.ts b/...r/src/tests/cypress/integration/clerk/translatorOverview/clerk_translator_details.spec.ts
@@ -303,7 +303,7 @@ describe('ClerkTranslatorOverview:ClerkTranslatorDetails', () => {
     onClerkTranslatorOverviewPage.expectSaveAuthorisationButtonDisabled();
   });
 
-  it.skip('should display a confirmation dialog if the back button is clicked and there are unsaved changes', () => {
+  it('should display a confirmation dialog if the back button is clicked and there are unsaved changes', () => {
     onClerkTranslatorOverviewPage.navigateById(translatorResponse.id);
     cy.wait('@getClerkTranslatorOverview');
     onClerkTranslatorOverviewPage.clickEditTranslatorDetailsButton();

diff --git a/...s/otr/src/tests/cypress/integration/interpreterOverview/clerk_interpreter_details.spec.ts b/...s/otr/src/tests/cypress/integration/interpreterOverview/clerk_interpreter_details.spec.ts
@@ -125,7 +125,7 @@ describe('ClerkInterpreterOverview:ClerkInterpreterDetails', () => {
     );
   });
 
-  it.skip('should display a confirmation dialog if the back button is clicked and there are unsaved changes', () => {
+  it('should display a confirmation dialog if the back button is clicked and there are unsaved changes', () => {
     onClerkInterpreterOverviewPage.clickEditInterpreterDetailsButton();
     onClerkInterpreterOverviewPage.editInterpreterField(
       'lastName',

diff --git a/frontend/packages/shared/src/hooks/useNavigationProtection/useNavigationProtection.ts b/frontend/packages/shared/src/hooks/useNavigationProtection/useNavigationProtection.ts
@@ -1,5 +1,5 @@
 import { useCallback, useEffect } from 'react';
-import { Location, unstable_useBlocker as useBlocker } from 'react-router-dom';
+import { Location, unstable_useBlocker as useBlocker, unstable_usePrompt as usePrompt } from 'react-router-dom';
 
 export const useNavigationProtection = (
   when: boolean,
@@ -15,13 +15,22 @@ export const useNavigationProtection = (
   }: {
     currentLocation: Location;
     nextLocation: Location;
-  }): boolean =>
-    !!(
-      when &&
-      baseUrl &&
-      !nextLocation.pathname.includes(baseUrl) &&
-      currentLocation.pathname !== nextLocation.pathname
-    );
+  }): boolean => {
+
+    if (baseUrl) {
+      return !!(
+        when &&
+        baseUrl &&
+        !nextLocation.pathname.includes(baseUrl) &&
+        currentLocation.pathname !== nextLocation.pathname
+      );
+    } else {
+      return !!(
+        when &&
+        currentLocation.pathname !== nextLocation.pathname
+      );
+    }
+  }
 
   const blocker = useBlocker(shouldBlock);
 

diff --git a/...ages/vkt/src/tests/cypress/integration/examEventOverview/clerk_exam_event_details.spec.ts b/...ages/vkt/src/tests/cypress/integration/examEventOverview/clerk_exam_event_details.spec.ts
@@ -129,7 +129,7 @@ describe('ClerkExamEventOverview:ClerkExamEventDetails', () => {
     cy.isOnPage(AppRoutes.ClerkHomePage);
   });
 
-  it.skip('should display a confirmation dialog if the back button is clicked and there are unsaved changes', () => {
+  it('should display a confirmation dialog if the back button is clicked and there are unsaved changes', () => {
     onClerkExamEventOverviewPage.clickEditExamEventDetailsButton();
     onClerkExamEventOverviewPage.editExamEventField(
       'level',

diff --git a/frontend/packages/vkt/src/tests/msw/handlers.ts b/frontend/packages/vkt/src/tests/msw/handlers.ts
@@ -18,6 +18,9 @@ export const handlers = [
   http.get(APIEndpoints.PublicExamEvent, () => {
     return new Response(JSON.stringify(publicExamEvents11));
   }),
+  http.get(APIEndpoints.PublicUser, () => {
+    return new Response(JSON.stringify(null));
+  }),
   http.put(`${APIEndpoints.PublicReservation}/1/renew`, () => {
     const response: PublicReservationResponse = {
       id: 1,