@valtimo/components 10.2.0 → 10.2.1

package/fesm2020/valtimo-components.mjs

@@ -1166,13 +1166,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
  * limitations under the License.
  */
 class MenuService {
-    constructor(configService, documentService, userProviderService, logger, menuIncludeService, router) {
+    constructor(configService, documentService, userProviderService, logger, menuIncludeService, router, keycloakService) {
         this.configService = configService;
         this.documentService = documentService;
         this.userProviderService = userProviderService;
         this.logger = logger;
         this.menuIncludeService = menuIncludeService;
         this.router = router;
+        this.keycloakService = keycloakService;
         this.includeFunctionObservables = {};
         this._menuItems$ = new BehaviorSubject(undefined);
         this.currentRoute$ = this.router.events.pipe(filter(event => event instanceof NavigationEnd), map$1(event => event?.url));
@@ -1226,9 +1227,10 @@ class MenuService {
         return this._menuItems$.asObservable();
     }
     reload() {
-        return this._menuItems$.next(this.loadMenuItems());
+        const roles = this.keycloakService.getUserRoles(true);
+        return this._menuItems$.next(this.loadMenuItems(roles));
     }
-    loadMenuItems() {
+    loadMenuItems(userRoles) {
         let menuItems = [];
         this.menuConfig.menuItems.forEach((menuItem) => {
             if (menuItem.includeFunction !== undefined) {
@@ -1236,7 +1238,9 @@ class MenuService {
                     this.menuIncludeService.getIncludeFunction(menuItem.includeFunction);
             }
             menuItem.show = true;
-            menuItems.push(menuItem);
+            if (userRoles.find(userRole => menuItem.roles.includes(userRole))) {
+                menuItems.push(menuItem);
+            }
         });
         menuItems = this.sortMenuItems(menuItems);
         this.appendDossierSubMenuItems(menuItems).subscribe(value => (menuItems = this.applyMenuRoleSecurity(value)));
@@ -1317,14 +1321,14 @@ class MenuService {
         return !menuItem.roles || menuItem.roles.some(role => roles.includes(role));
     }
 }
-MenuService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: MenuService, deps: [{ token: i2$1.ConfigService }, { token: i2$2.DocumentService }, { token: i3.UserProviderService }, { token: i4.NGXLogger }, { token: i2$1.MenuIncludeService }, { token: i1$4.Router }], target: i0.ɵɵFactoryTarget.Injectable });
+MenuService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: MenuService, deps: [{ token: i2$1.ConfigService }, { token: i2$2.DocumentService }, { token: i3.UserProviderService }, { token: i4.NGXLogger }, { token: i2$1.MenuIncludeService }, { token: i1$4.Router }, { token: i1$3.KeycloakService }], target: i0.ɵɵFactoryTarget.Injectable });
 MenuService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: MenuService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: MenuService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: i2$1.ConfigService }, { type: i2$2.DocumentService }, { type: i3.UserProviderService }, { type: i4.NGXLogger }, { type: i2$1.MenuIncludeService }, { type: i1$4.Router }]; } });
+        }], ctorParameters: function () { return [{ type: i2$1.ConfigService }, { type: i2$2.DocumentService }, { type: i3.UserProviderService }, { type: i4.NGXLogger }, { type: i2$1.MenuIncludeService }, { type: i1$4.Router }, { type: i1$3.KeycloakService }]; } });
 
 /*
  * Copyright 2015-2020 Ritense BV, the Netherlands.