add navigation resolver

Author: chriskapp

projects/fusio-sdk/src/lib/config/config.ts

@@ -2,7 +2,7 @@ import {InjectionToken} from "@angular/core";
 import {UserAccount} from "fusio-sdk/dist/src/generated/consumer/UserAccount";
 import {Plan} from "fusio-sdk/dist/src/generated/consumer/Plan";
 import {Message} from "fusio-sdk/dist/src/generated/consumer/Message";
-import {GroupItem, Item} from "../service/navigation.service";
+import {GroupItem, Items} from "../service/navigation.service";
 
 export interface Config {
   baseUrl: string,
@@ -13,9 +13,9 @@ export interface Config {
   homePath?: string,
   loginPath?: string,
   navigation?: Array<GroupItem>,
-  userNavigation?: Array<Item>,
-  anonymousNavigation?: Array<Item>,
-  accountNavigation?: Array<Item>,
+  userNavigation?: Items,
+  anonymousNavigation?: Items,
+  accountNavigation?: Items,
   paymentProvider?: string,
   paymentCurrency?: string,
   recaptcha?: string,

projects/fusio-sdk/src/lib/service/config.service.ts

@@ -4,7 +4,7 @@ import {
   EventListener,
   FUSIO_CONFIG,
 } from "../config/config";
-import {GroupItem, Item} from "./navigation.service";
+import {GroupItem, Items} from "./navigation.service";
 
 @Injectable({
   providedIn: 'root'
@@ -37,7 +37,7 @@ export class ConfigService {
     if (this.config.homePath) {
       return this.config.homePath;
     } else {
-      return '/backend';
+      return '/';
     }
   }
 
@@ -53,7 +53,7 @@ export class ConfigService {
     return this.config.navigation || [];
   }
 
-  public getUserNavigation(): Array<Item> {
+  public getUserNavigation(): Items {
     return this.config.userNavigation || [{
       title: 'Account',
       path: '/account'
@@ -63,7 +63,7 @@ export class ConfigService {
     }];
   }
 
-  public getAnonymousNavigation(): Array<Item> {
+  public getAnonymousNavigation(): Items {
     return this.config.anonymousNavigation || [{
       title: 'Login',
       path: '/login'
@@ -73,7 +73,7 @@ export class ConfigService {
     }];
   }
 
-  public getAccountNavigation(): Array<Item> {
+  public getAccountNavigation(): Items {
     return this.config.accountNavigation || [{
       title: 'Account',
       path: '/account',

projects/fusio-sdk/src/lib/service/navigation.service.ts

@@ -15,21 +15,21 @@ export class NavigationService {
   }
 
   getUserNavigation(): Array<Item> {
-    return this.checkPermissionsItems(this.config.getUserNavigation());
+    return this.checkPermissionItems(this.config.getUserNavigation());
   }
 
   getAnonymousNavigation(): Array<Item> {
-    return this.config.getAnonymousNavigation();
+    return this.checkPermissionItems(this.config.getAnonymousNavigation());
   }
 
   getAccountNavigation(): Array<Item> {
-    return this.checkPermissionsItems(this.config.getAccountNavigation());
+    return this.checkPermissionItems(this.config.getAccountNavigation());
   }
 
   private checkPermissions(navigation: Array<GroupItem>): Array<GroupItem> {
     let result = [];
     for (let i = 0; i < navigation.length; i++) {
-      const children = this.checkPermissionsItems(navigation[i].children);
+      const children = this.checkPermissionItems(navigation[i].children);
       if (children.length > 0) {
         let menu = navigation[i];
         menu.children = children;
@@ -40,7 +40,15 @@ export class NavigationService {
     return result;
   }
 
-  private checkPermissionsItems(items: Array<Item>): Array<Item> {
+  private checkPermissionItems(items: Items): Array<Item> {
+    if (items instanceof Function) {
+      items = items.apply(this);
+    }
+
+    if (!Array.isArray(items)) {
+      return [];
+    }
+
     let result = [];
     for (let i = 0; i < items.length; i++) {
       const scope = items[i].scope;
@@ -59,9 +67,13 @@ export class NavigationService {
 export interface GroupItem {
   title: string
   visible: boolean
-  children: Array<Item>
+  children: Items
 }
 
+export type ItemResolver = () => Array<Item>;
+
+export type Items = Array<Item>|ItemResolver;
+
 export interface Item {
   title: string
   icon?: string