fix(router,routerTypes): relax path comparison

* router, disable return the default nav details * routerHelpers, trim trailing slash
RedHatInsights · Feb 12, 2020 · 980e859 · 980e859
1 parent d283917
commit 980e859
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/components/router/router.js b/src/components/router/router.js
@@ -28,10 +28,11 @@ class Router extends React.Component {
               exact={item.hasParameters || item.exact}
               key={item.to}
               path={item.to}
+              strict={item.strict}
               render={routeProps => {
                 const navDetail = routerHelpers.getNavigationDetail({
                   pathname: routeProps.location && routeProps.location.pathname,
-                  returnDefault: true
+                  returnDefault: false
                 });
 
                 return (

diff --git a/src/components/router/routerHelpers.js b/src/components/router/routerHelpers.js
@@ -49,7 +49,9 @@ const getNavigationDetail = ({ id = null, pathname = null, returnDefault = false
   }
 
   if (!navigationItem && pathname) {
-    navigationItem = navigation.find(item => item.path === pathname) || (returnDefault && defaultItem);
+    navigationItem =
+      navigation.find(item => item.path.replace(/\/$/, '') === pathname.replace(/\/$/, '')) ||
+      (returnDefault && defaultItem);
   }
 
   if (!navigationItem && returnDefault) {