fix(routing): Use dynamic router basename

RedHatInsights · Oct 27, 2021 · 2a73ac2 · 2a73ac2
1 parent 1cdcf03
commit 2a73ac2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/AppEntry.js b/src/AppEntry.js
@@ -9,7 +9,7 @@ import '@patternfly/react-styles/css/components/Select/select.css';
 
 const AppEntry = () => (
   <Provider store={store}>
-    <BrowserRouter basename={routerHelpers.baseName}>
+    <BrowserRouter basename={routerHelpers.dynamicBaseName()}>
       <App />
     </BrowserRouter>
   </Provider>

diff --git a/src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap b/src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap
@@ -301,7 +301,7 @@ exports[`Authentication Component should return a message on 401 error: 401 erro
 
 exports[`Authentication Component should return a redirect on 418 error: 418 error 1`] = `
 <Redirect
-  baseName="/"
+  baseName="/subscriptions"
   isForced={false}
   route="/optin"
   routes={
@@ -441,7 +441,7 @@ exports[`Authentication Component should return a redirect on a specific 403 err
 
 exports[`Authentication Component should return a redirect on a specific 403 error and error code: 403 redirect error 1`] = `
 <Redirect
-  baseName="/"
+  baseName="/subscriptions"
   isForced={false}
   route="/optin"
   routes={

diff --git a/src/components/router/__tests__/__snapshots__/redirect.test.js.snap b/src/components/router/__tests__/__snapshots__/redirect.test.js.snap
@@ -10,7 +10,7 @@ exports[`Redirect Component should handle a forced redirect: forced route 1`] =
 exports[`Redirect Component should handle a forced redirect: forced route, replace 1`] = `
 Array [
   Array [
-    "/dolor?dolor=sit",
+    "/subscriptions/dolor?dolor=sit",
   ],
 ]
 `;

diff --git a/src/components/router/redirect.js b/src/components/router/redirect.js
@@ -58,7 +58,7 @@ Redirect.propTypes = {
  *    isForced: boolean}}
  */
 Redirect.defaultProps = {
-  baseName: routerHelpers.baseName,
+  baseName: routerHelpers.dynamicBaseName(),
   isForced: false,
   route: null,
   routes: routerHelpers.routes,

diff --git a/src/components/router/router.js b/src/components/router/router.js
@@ -59,7 +59,7 @@ const Router = ({ routes } = {}) => {
               };
 
               const routeDetail = {
-                baseName: routerHelpers.baseName,
+                baseName: routerHelpers.dynamicBaseName(),
                 errorRoute: activateOnErrorRoute,
                 routes,
                 routeItem: { ...item },
-Original file line number
+Diff line change
@@ Expand Up @@
     exports[`Redirect Component should handle a forced redirect: forced route, replace 1`] = `
     Array [
       Array [
-        "/dolor?dolor=sit",
+        "/subscriptions/dolor?dolor=sit",
       ],
     ]
     `;
@@ Expand Down @@