Merge pull request #7323 from gashcrumb/ENTESB-11500

feat: add a mechanism to hide top-level nav items
syndesisio · Dec 5, 2019 · 2c884b6 · 2c884b6
2 parents 8a98967 + 4769c1f
commit 2c884b6
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 6 deletions.
diff --git a/app/ui-react/packages/ui/src/Layout/PfVerticalNavItem.tsx b/app/ui-react/packages/ui/src/Layout/PfVerticalNavItem.tsx
@@ -7,6 +7,7 @@ import { Link } from 'react-router-dom';
 export interface IPfVerticalNavItem {
   className?: string;
   exact?: boolean;
+  hidden?: boolean;
   isActive?: (match: any, location: any) => boolean;
   location?: any;
   strict?: boolean;
@@ -18,6 +19,7 @@ export interface IPfVerticalNavItem {
 function PfVerticalNavItem({
   className,
   exact,
+  hidden,
   isActive: isActiveProp,
   location,
   strict,
@@ -42,6 +44,10 @@ function PfVerticalNavItem({
       ? isActiveProp(match, childLocation)
       : match);
 
+    if (hidden) {
+      return null;
+    }
+
     return children ? (
       <NavExpandable title={label} isActive={isActive} isExpanded={isActive}>
         {children}

diff --git a/app/ui-react/syndesis/config.minishift.json b/app/ui-react/syndesis/config.minishift.json
@@ -44,6 +44,9 @@
     "enabled": 1
   },
   "features": {
-    "logging": false
+    "extensions": true,
+    "integrations": true,
+    "connections": true,
+    "data": true
   }
 }
diff --git a/app/ui-react/syndesis/config.proxy.json b/app/ui-react/syndesis/config.proxy.json
@@ -43,6 +43,9 @@
     "enabled": 1
   },
   "features": {
-    "logging": false
+    "extensions": true,
+    "integrations": true,
+    "connections": true,
+    "data": true
   }
 }
diff --git a/app/ui-react/syndesis/config.staging.json b/app/ui-react/syndesis/config.staging.json
@@ -43,6 +43,9 @@
     "enabled": 1
   },
   "features": {
-    "logging": false
+    "extensions": true,
+    "integrations": true,
+    "connections": true,
+    "data": true
   }
 }
diff --git a/app/ui-react/syndesis/src/app/UI.tsx b/app/ui-react/syndesis/src/app/UI.tsx
@@ -1,4 +1,5 @@
 import { WithApiVersion, WithUserHelpers } from '@syndesis/api';
+import { StringMap } from '@syndesis/models';
 import {
   AboutModal,
   AboutModalContent,
@@ -40,6 +41,36 @@ export interface IAppUIState {
   showAboutModal: boolean;
 }
 
+/**
+ * Convert a route to a feature name based on it's path, returns
+ * undefined if the route doesn't have a path.
+ * @param route
+ */
+function routeToFeatureName(route: IAppRoute) {
+  if (!route.to) {
+    return undefined;
+  }
+  return route.to.replace(/\//g, '').trim();
+}
+
+/**
+ * Compares the supplied route to the given feature map and
+ * returns whether or not that module should be visible to the
+ * user or not
+ * @param features
+ * @param route
+ */
+function featureEnabled(features: StringMap<any>, route: IAppRoute) {
+  const feature = routeToFeatureName(route);
+  if (typeof feature === 'undefined') {
+    return true;
+  }
+  return (
+    typeof features[feature] === 'undefined' ||
+    (typeof features[feature] === 'boolean' && features[feature])
+  );
+}
+
 export const UI: React.FunctionComponent<IAppUIProps> = ({ routes }) => {
   const [showNavigation, setShowNavigation] = React.useState(true);
   const onHideNavigation = () => setShowNavigation(false);
@@ -151,6 +182,7 @@ export const UI: React.FunctionComponent<IAppUIProps> = ({ routes }) => {
                 const isProductBuild = config && config.branding.productBuild;
                 setProductBuild(isProductBuild);
                 const productName = isProductBuild ? 'Fuse Online' : 'Syndesis';
+                const features = (config && config.features) || {} as Map<string, any>;
                 return (
                   <>
                     {
@@ -260,6 +292,12 @@ export const UI: React.FunctionComponent<IAppUIProps> = ({ routes }) => {
                                     !(route as IAppRouteWithChildrens)
                                       .childrens ? (
                                       <PfVerticalNavItem
+                                        hidden={
+                                          !featureEnabled(
+                                            features,
+                                            route as IAppRoute
+                                          )
+                                        }
                                         exact={(route as IAppRoute).exact}
                                         label={t((route as IAppRoute).label)}
                                         to={(route as IAppRoute).to}
@@ -277,6 +315,12 @@ export const UI: React.FunctionComponent<IAppUIProps> = ({ routes }) => {
                                         {(route as IAppRouteWithChildrens).childrens.map(
                                           (subRoute, subIndex) => (
                                             <PfVerticalNavItem
+                                              hidden={
+                                                !featureEnabled(
+                                                  features,
+                                                  subRoute as IAppRoute
+                                                )
+                                              }
                                               exact={subRoute.exact}
                                               label={t(subRoute.label)}
                                               to={subRoute.to}

diff --git a/app/ui-react/syndesis/src/app/WithConfig.tsx b/app/ui-react/syndesis/src/app/WithConfig.tsx
@@ -1,3 +1,4 @@
+import { StringMap } from '@syndesis/models';
 import * as React from 'react';
 
 export interface IConfigFile {
@@ -17,9 +18,7 @@ export interface IConfigFile {
     dvUrl: string;
     enabled: number;
   };
-  features: {
-    logging: boolean;
-  };
+  features: StringMap<any>,
   branding: {
     logoWhiteBg: string;
     logoDarkBg: string;