Fix frame reload on 404 (SAP#378)

Fix frame reload on 404 error
stanleychh · Jan 23, 2019 · 6d93924 · 6d93924
1 parent 9796560
commit 6d93924
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/core/src/services/routing.js b/core/src/services/routing.js
@@ -108,9 +108,9 @@ export const getCurrentPath = () =>
   LuigiConfig.getConfigValue('routing.useHashRouting')
     ? window.location.hash.replace('#', '') // TODO: GenericHelpers.getPathWithoutHash(window.location.hash) fails in ContextSwitcher
     : window.location.search
-    ? GenericHelpers.trimLeadingSlash(window.location.pathname) +
-      window.location.search
-    : GenericHelpers.trimLeadingSlash(window.location.pathname);
+      ? GenericHelpers.trimLeadingSlash(window.location.pathname) +
+        window.location.search
+      : GenericHelpers.trimLeadingSlash(window.location.pathname);
 
 export const handleRouteChange = async (
   path,
@@ -194,6 +194,7 @@ export const handleRouteChange = async (
 
     if (!pathData.isExistingRoute) {
       showPageNotFoundError(component, pathData.matchedPath, pathUrlRaw, true);
+      return;
     }
 
     const hideNav = LuigiConfig.getConfigBooleanValue(