From 7634aaf74be9458ecf10c8609ba63903c3684523 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 19 Jun 2020 10:27:53 +0300 Subject: [PATCH 01/12] feat: add route.provider to dev-app --- .../apps/dev-app/src/app/app.module.ts | 2 ++ .../apps/dev-app/src/app/route.provider.ts | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 npm/ng-packs/apps/dev-app/src/app/route.provider.ts diff --git a/npm/ng-packs/apps/dev-app/src/app/app.module.ts b/npm/ng-packs/apps/dev-app/src/app/app.module.ts index acf8fcaaa8..7c9e2781e2 100644 --- a/npm/ng-packs/apps/dev-app/src/app/app.module.ts +++ b/npm/ng-packs/apps/dev-app/src/app/app.module.ts @@ -13,6 +13,7 @@ import { environment } from '../environments/environment'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { SharedModule } from './shared/shared.module'; +import { APP_ROUTE_PROVIDER } from './route.provider'; const LOGGERS = [NgxsLoggerPluginModule.forRoot({ disabled: false })]; @@ -35,6 +36,7 @@ const LOGGERS = [NgxsLoggerPluginModule.forRoot({ disabled: false })]; SharedModule, ...(environment.production ? [] : LOGGERS), ], + providers: [APP_ROUTE_PROVIDER], declarations: [AppComponent], bootstrap: [AppComponent], }) diff --git a/npm/ng-packs/apps/dev-app/src/app/route.provider.ts b/npm/ng-packs/apps/dev-app/src/app/route.provider.ts new file mode 100644 index 0000000000..5a14ad7ba0 --- /dev/null +++ b/npm/ng-packs/apps/dev-app/src/app/route.provider.ts @@ -0,0 +1,20 @@ +import { RoutesService, eLayoutType } from '@abp/ng.core'; +import { APP_INITIALIZER } from '@angular/core'; + +export const APP_ROUTE_PROVIDER = [ + { provide: APP_INITIALIZER, useFactory: configureRoutes, deps: [RoutesService], multi: true }, +]; + +function configureRoutes(routes: RoutesService) { + return () => { + routes.add([ + { + path: '/', + name: '::Menu:Home', + iconClass: 'fas fa-home', + order: 1, + layout: eLayoutType.application, + }, + ]); + }; +} From 6395a6c65bcacfdfee4fc1b05ddc2697890600e1 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 19 Jun 2020 10:28:08 +0300 Subject: [PATCH 02/12] chore: remove ApplicationLayoutComponent from home-routing.module --- npm/ng-packs/apps/dev-app/src/app/home/home-routing.module.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/npm/ng-packs/apps/dev-app/src/app/home/home-routing.module.ts b/npm/ng-packs/apps/dev-app/src/app/home/home-routing.module.ts index 367affb583..634706a36c 100644 --- a/npm/ng-packs/apps/dev-app/src/app/home/home-routing.module.ts +++ b/npm/ng-packs/apps/dev-app/src/app/home/home-routing.module.ts @@ -1,12 +1,10 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { HomeComponent } from './home.component'; -import { ApplicationLayoutComponent } from '@abp/ng.theme.basic'; const routes: Routes = [ { path: '', - component: ApplicationLayoutComponent, children: [{ path: '', component: HomeComponent }], }, ]; From e88d5b4cba80e18a51ffe7bfdf83fdd59fdf04b8 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 19 Jun 2020 14:21:30 +0300 Subject: [PATCH 03/12] feat: define DynamicLayoutComponent in root level --- .../dev-app/src/app/app-routing.module.ts | 55 ++++++++++--------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/npm/ng-packs/apps/dev-app/src/app/app-routing.module.ts b/npm/ng-packs/apps/dev-app/src/app/app-routing.module.ts index be5089316a..8f6973079d 100644 --- a/npm/ng-packs/apps/dev-app/src/app/app-routing.module.ts +++ b/npm/ng-packs/apps/dev-app/src/app/app-routing.module.ts @@ -1,36 +1,37 @@ -import { ABP } from '@abp/ng.core'; +import { ABP, DynamicLayoutComponent } from '@abp/ng.core'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; const routes: Routes = [ { path: '', - loadChildren: () => import('./home/home.module').then(m => m.HomeModule), - data: { - routes: { - name: '::Menu:Home', - order: 1, - } as ABP.Route, - }, - }, - { - path: 'account', - loadChildren: () => - import('@abp/ng.account').then(m => m.AccountModule.forLazy({ redirectUrl: '/' })), - }, - { - path: 'identity', - loadChildren: () => import('@abp/ng.identity').then(m => m.IdentityModule.forLazy()), - }, - { - path: 'tenant-management', - loadChildren: () => - import('@abp/ng.tenant-management').then(m => m.TenantManagementModule.forLazy()), - }, - { - path: 'setting-management', - loadChildren: () => - import('@abp/ng.setting-management').then(m => m.SettingManagementModule.forLazy()), + component: DynamicLayoutComponent, + children: [ + { + path: '', + pathMatch: 'full', + loadChildren: () => import('./home/home.module').then(m => m.HomeModule), + }, + { + path: 'account', + loadChildren: () => + import('@abp/ng.account').then(m => m.AccountModule.forLazy({ redirectUrl: '/' })), + }, + { + path: 'identity', + loadChildren: () => import('@abp/ng.identity').then(m => m.IdentityModule.forLazy()), + }, + { + path: 'tenant-management', + loadChildren: () => + import('@abp/ng.tenant-management').then(m => m.TenantManagementModule.forLazy()), + }, + { + path: 'setting-management', + loadChildren: () => + import('@abp/ng.setting-management').then(m => m.SettingManagementModule.forLazy()), + }, + ], }, ]; From c0896e6806660bf894cf480a4abcd4210cd1b88b Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 19 Jun 2020 14:22:03 +0300 Subject: [PATCH 04/12] feat: check dynamic layout other instance --- .../core/src/lib/components/dynamic-layout.component.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts b/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts index 5455187086..d2248550d8 100644 --- a/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts +++ b/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts @@ -1,4 +1,4 @@ -import { Component, Injector, OnDestroy, Type } from '@angular/core'; +import { Component, Injector, OnDestroy, Type, Optional, SkipSelf } from '@angular/core'; import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; import { Store } from '@ngxs/store'; import { eLayoutType } from '../enums/common'; @@ -28,7 +28,10 @@ export class DynamicLayoutComponent implements OnDestroy { private route: ActivatedRoute, private routes: RoutesService, private store: Store, + @Optional() @SkipSelf() dynamicLayoutComponent: DynamicLayoutComponent, ) { + if (dynamicLayoutComponent) return; + const router = injector.get(Router); const layouts = { application: this.getComponent('Theme.ApplicationLayoutComponent'), From 0508ebabef63c8585b12515c974b1420a63e1407 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 19 Jun 2020 14:22:19 +0300 Subject: [PATCH 05/12] chore: deprecate visibility.directive --- .../core/src/lib/directives/visibility.directive.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/core/src/lib/directives/visibility.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/visibility.directive.ts index 2dffa1532d..f5f4d22f5e 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/visibility.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/visibility.directive.ts @@ -2,6 +2,10 @@ import { Directive, Input, Optional, ElementRef, Renderer2, AfterViewInit } from import { Subject } from 'rxjs'; import snq from 'snq'; +/** + * + * @deprecated To be deleted in v3.3 + */ @Directive({ selector: '[abpVisibility]', }) @@ -40,7 +44,8 @@ export class VisibilityDirective implements AfterViewInit { setTimeout(() => { const htmlNodes = snq( - () => Array.from(this.focusedElement.childNodes).filter(node => node instanceof HTMLElement), + () => + Array.from(this.focusedElement.childNodes).filter(node => node instanceof HTMLElement), [], ); From c27791e52a4da175c492cb71d675eaf45ef78884 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 19 Jun 2020 14:22:40 +0300 Subject: [PATCH 06/12] feat: add findRequiredPolicy method to routes.component --- .../components/routes/routes.component.html | 5 ++- .../lib/components/routes/routes.component.ts | 35 +++++++++++++++++-- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html index 4d22ddc8d2..60f2de6c1c 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html @@ -18,8 +18,8 @@
  • > = (_, item) => item.name; - constructor(public readonly routes: RoutesService) {} + constructor(public readonly routes: RoutesService, private store: Store) {} + + findRequiredPolicy(route: TreeNode): boolean { + if (route.requiredPolicy || !route.children?.length) return true; + + const policies = getPolicies(route.children); + + let isVisible = true; + for (let i = 0; i < policies.length; i++) { + if (!this.store.selectSnapshot(ConfigState.getGrantedPolicy(policies[i]))) { + isVisible = false; + break; + } + } + + return isVisible; + } +} + +function getPolicies(routes: TreeNode[]): string[] { + return routes.reduce((acc, val) => { + if (val.requiredPolicy) acc.push(val.requiredPolicy); + + if (val.children?.length) { + const childPolicies = getPolicies(val.children); + + if (childPolicies?.length) acc.push(...childPolicies); + } + + return acc; + }, []); } From 750866c8d51cab9a153c617b2a666bb53cfafadf Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 19 Jun 2020 18:06:20 +0300 Subject: [PATCH 07/12] chore: undo deprecation for visibility.directive --- .../packages/core/src/lib/directives/visibility.directive.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/directives/visibility.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/visibility.directive.ts index f5f4d22f5e..0f18126b62 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/visibility.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/visibility.directive.ts @@ -2,10 +2,6 @@ import { Directive, Input, Optional, ElementRef, Renderer2, AfterViewInit } from import { Subject } from 'rxjs'; import snq from 'snq'; -/** - * - * @deprecated To be deleted in v3.3 - */ @Directive({ selector: '[abpVisibility]', }) From 654efbd4ece57161022789b7123e2a04e8dc9e41 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 19 Jun 2020 18:07:17 +0300 Subject: [PATCH 08/12] fix: routes permissions problem --- .../components/routes/routes.component.html | 7 +-- .../lib/components/routes/routes.component.ts | 48 +++++++------------ 2 files changed, 20 insertions(+), 35 deletions(-) diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html index 60f2de6c1c..6601300293 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html @@ -1,4 +1,4 @@ -