Update loaders of navigation

RedHatInsights · Sep 14, 2020 · bf437b5 · bf437b5
1 parent 581386a
commit bf437b5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 16 deletions.
diff --git a/src/js/App/Header/Loader.js b/src/js/App/Header/Loader.js
diff --git a/src/js/App/Header/index.js b/src/js/App/Header/index.js
@@ -1,7 +1,6 @@
-import React, { lazy, Suspense } from 'react';
+import React, { lazy, Suspense, Fragment } from 'react';
 import { Provider } from 'react-redux';
 import { render } from 'react-dom';
-import HeaderLoader from './Loader';
 import { spinUpStore } from '../../redux-config';
 
 const Header = lazy(() => import(/* webpackChunkName: "Sidenav" */ './Header'));
@@ -11,7 +10,7 @@ export const headerLoader = () => {
     if (document.querySelector('header')) {
         render(
             <Provider store={store}>
-                <Suspense fallback={<HeaderLoader />}>
+                <Suspense fallback={<Fragment />}>
                     <Header />
                 </Suspense>
             </Provider>,

diff --git a/src/js/App/Sidenav/__snapshots__/Navigation.test.js.snap b/src/js/App/Sidenav/__snapshots__/Navigation.test.js.snap
@@ -244,7 +244,7 @@ exports[`Navigation should render corectly 1`] = `
     ariaRightScroll="Scroll right"
   >
     <NavExpandable
-      className="ins-m-navigation-align"
+      className=""
       groupId={null}
       id=""
       isActive={true}
@@ -348,7 +348,7 @@ exports[`Navigation should render correctly 2 1`] = `
     ariaRightScroll="Scroll right"
   >
     <NavExpandable
-      className="ins-m-navigation-align"
+      className=""
       groupId={null}
       id=""
       isActive={true}

diff --git a/src/js/nav/globalNav.js b/src/js/nav/globalNav.js
@@ -14,9 +14,9 @@ export let getNavFromConfig = async (masterConfig) => {
 };
 
 const isCurrVisible = (permissions) => Promise.all(
-    flatMap([permissions], ({ method } = {}) => (
+    flatMap([permissions], async ({ method, args } = {}) => (
         // (null, undefined, true) !== false
-        visibilityFunctions?.[method]?.(...permissions.args || []) !== false || false
+        await visibilityFunctions?.[method]?.(...args || []) !== false
     ))
 ).then(visibility => visibility.every(Boolean));
 
@@ -81,13 +81,12 @@ export async function loadNav(yamlConfig) {
     const groupedNav = await getNavFromConfig(safeLoad(yamlConfig));
 
     const [active, section] = [getUrl('bundle'), getUrl('app')];
-    const globalNav = (groupedNav[active] || groupedNav.insights).routes;
-    let activeSection = globalNav.find(({ id }) => id === section);
+    const globalNav = (groupedNav[active] || groupedNav.insights)?.routes;
     return groupedNav[active] ? {
         globalNav,
         activeTechnology: groupedNav[active].title,
         activeLocation: active,
-        activeSection
+        activeSection: globalNav?.find?.(({ id }) => id === section)
     } : {
         globalNav,
         activeTechnology: 'Applications'

diff --git a/testdata/masterConfigPermissions.json b/testdata/masterConfigPermissions.json
@@ -128,7 +128,8 @@
             "title": "Bla"
         },
         "permissions": {
-            "method": "isEntitled"
+            "method": "isEntitled",
+            "args": ["something"]
         },
         "title": "appF"
     }