fix(routerHelpers): dynamic route, handle additional directories (#609)

RedHatInsights · Apr 13, 2021 · 345fca7 · 345fca7
1 parent 1d0d9c1
commit 345fca7
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 39 deletions.
diff --git a/config/cspell.config.json b/config/cspell.config.json
@@ -3,6 +3,7 @@
   "words": [
     "alibaba",
     "amet",
+    "appname",
     "bindto",
     "chartarea",
     "cloudigrade",

diff --git a/src/components/router/__tests__/__snapshots__/routerHelpers.test.js.snap b/src/components/router/__tests__/__snapshots__/routerHelpers.test.js.snap
@@ -28,15 +28,17 @@ exports[`RouterHelpers should return a generated baseName using NO path prefix:
 
 exports[`RouterHelpers should return a generated baseName using NO path prefix: empty pathPrefix: app base name 1`] = `"/appName"`;
 
-exports[`RouterHelpers should return a generated baseName using NO path prefix: root reference pathPrefix: app base name 1`] = `"/appName"`;
+exports[`RouterHelpers should return a generated baseName using a beta path prefix: beta app base name 1`] = `"/beta/appName"`;
 
-exports[`RouterHelpers should return a generated baseName using NO path prefix: undefined pathPrefix: app base name 1`] = `"/appName"`;
+exports[`RouterHelpers should return a generated baseName using a beta path prefix: beta app lorem route name 1`] = `"/beta/appName"`;
 
-exports[`RouterHelpers should return a generated baseName using a beta path prefix: app base name 1`] = `"/appName"`;
+exports[`RouterHelpers should return a generated baseName using an insights path prefix: insights, app base name 1`] = `"/insights/appName"`;
 
-exports[`RouterHelpers should return a generated baseName using a beta path prefix: beta app base name 1`] = `"/beta/appName"`;
+exports[`RouterHelpers should return a generated baseName using an insights path prefix: insights, app lorem route name 1`] = `"/insights/appName"`;
 
-exports[`RouterHelpers should return a generated baseName using a beta path prefix: beta app lorem route name 1`] = `"/beta/appName"`;
+exports[`RouterHelpers should return a generated baseName using an insights path prefix: insights, beta app base name 1`] = `"/beta/insights/appName"`;
+
+exports[`RouterHelpers should return a generated baseName using an insights path prefix: insights, beta app lorem route name 1`] = `"/beta/insights/appName"`;
 
 exports[`RouterHelpers should return an error route: error route 1`] = `
 Object {

diff --git a/src/components/router/__tests__/routerHelpers.test.js b/src/components/router/__tests__/routerHelpers.test.js
@@ -29,52 +29,62 @@ describe('RouterHelpers', () => {
     expect(
       dynamicBaseName({
         pathName: '/appName',
-        pathPrefix: ''
+        appName: 'appName'
       })
     ).toMatchSnapshot('empty pathPrefix: app base name');
 
     expect(
       dynamicBaseName({
-        pathName: '/appName'
+        pathName: '/appName/loremRoute',
+        appName: 'appName'
       })
-    ).toMatchSnapshot('undefined pathPrefix: app base name');
+    ).toMatchSnapshot('app lorem route name');
+  });
 
+  it('should return a generated baseName using a beta path prefix', () => {
     expect(
       dynamicBaseName({
-        pathName: '/appName',
-        pathPrefix: '/'
+        pathName: '/beta/appName',
+        appName: 'appName'
       })
-    ).toMatchSnapshot('root reference pathPrefix: app base name');
+    ).toMatchSnapshot('beta app base name');
 
     expect(
       dynamicBaseName({
-        pathName: '/appName/loremRoute',
-        pathPrefix: ''
+        pathName: '/beta/appName/loremRoute',
+        appName: 'appName'
       })
-    ).toMatchSnapshot('app lorem route name');
+    ).toMatchSnapshot('beta app lorem route name');
   });
 
-  it('should return a generated baseName using a beta path prefix', () => {
+  it('should return a generated baseName using an insights path prefix', () => {
     expect(
       dynamicBaseName({
-        pathName: '/appName',
-        pathPrefix: '/beta'
+        pathName: '/insights/appName',
+        appName: 'appName'
       })
-    ).toMatchSnapshot('app base name');
+    ).toMatchSnapshot('insights, app base name');
 
     expect(
       dynamicBaseName({
-        pathName: '/beta/appName',
-        pathPrefix: '/beta'
+        pathName: '/beta/insights/appName',
+        appName: 'appName'
       })
-    ).toMatchSnapshot('beta app base name');
+    ).toMatchSnapshot('insights, beta app base name');
 
     expect(
       dynamicBaseName({
-        pathName: '/beta/appName/loremRoute',
-        pathPrefix: '/beta'
+        pathName: '/insights/appName/loremRoute',
+        appName: 'appName'
       })
-    ).toMatchSnapshot('beta app lorem route name');
+    ).toMatchSnapshot('insights, app lorem route name');
+
+    expect(
+      dynamicBaseName({
+        pathName: '/beta/insights/appName/loremRoute',
+        appName: 'appName'
+      })
+    ).toMatchSnapshot('insights, beta app lorem route name');
   });
 
   it('should return an error route', () => {

diff --git a/src/components/router/routerHelpers.js b/src/components/router/routerHelpers.js
@@ -2,32 +2,24 @@ import { helpers } from '../../common/helpers';
 import { routes, navigation } from './routerConfig';
 
 /**
- * Return an assumed dynamic route baseName directory
- * based on a predictable platform directory depth of
- * /[OPTIONAL]/[environment]/[APP NAME]
+ * Return an assumed route baseName directory based on existing app name.
+ * App name is defined in dotenv and package.json/insights.appname
+ * [environment]/[OPTIONAL]/[OPTIONAL]/[APP NAME]
  *
  * @param {object} params
  * @param {string} params.pathName
- * @param {string} params.pathPrefix
+ * @param {string} params.appName
  * @returns {string}
  */
-const dynamicBaseName = ({ pathName, pathPrefix }) => {
-  const path = pathName.split('/');
-  path.shift();
-  const pathSlice = pathPrefix && new RegExp(path[0]).test(pathPrefix) ? 2 : 1;
-
-  return `/${path.slice(0, pathSlice).join('/')}`;
-};
+const dynamicBaseName = ({ pathName = window.location.pathname, appName = helpers.UI_NAME } = {}) =>
+  `${pathName.split(appName)[0]}${appName}`;
 
 /**
  * The app baseName.
  *
  * @type {string}
  */
-const baseName =
-  (helpers.TEST_MODE && '/') ||
-  (helpers.DEV_MODE && '/') ||
-  dynamicBaseName({ pathName: window.location.pathname, pathPrefix: helpers.UI_DEPLOY_PATH_PREFIX });
+const baseName = (helpers.TEST_MODE && '/') || (helpers.DEV_MODE && '/') || dynamicBaseName();
 
 /**
  * The first error route.