From a6b18dab4672d86a63da29b7983229464421e372 Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Mon, 22 Jun 2020 01:22:50 +0300 Subject: [PATCH] feat: convert required policy names to enums --- npm/ng-packs/packages/identity/config/src/enums/index.ts | 1 + .../packages/identity/config/src/enums/policy-names.ts | 5 +++++ .../identity/config/src/providers/route.provider.ts | 6 ++++-- .../packages/setting-management/config/src/enums/index.ts | 1 + .../setting-management/config/src/enums/policy-names.ts | 3 +++ .../config/src/providers/route.provider.ts | 3 ++- .../packages/tenant-management/config/src/enums/index.ts | 1 + .../tenant-management/config/src/enums/policy-names.ts | 4 ++++ .../config/src/providers/route.provider.ts | 4 +++- 9 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 npm/ng-packs/packages/identity/config/src/enums/policy-names.ts create mode 100644 npm/ng-packs/packages/setting-management/config/src/enums/policy-names.ts create mode 100644 npm/ng-packs/packages/tenant-management/config/src/enums/policy-names.ts diff --git a/npm/ng-packs/packages/identity/config/src/enums/index.ts b/npm/ng-packs/packages/identity/config/src/enums/index.ts index 3bda94b078..4a7a6a0e23 100644 --- a/npm/ng-packs/packages/identity/config/src/enums/index.ts +++ b/npm/ng-packs/packages/identity/config/src/enums/index.ts @@ -1 +1,2 @@ +export * from './policy-names'; export * from './route-names'; diff --git a/npm/ng-packs/packages/identity/config/src/enums/policy-names.ts b/npm/ng-packs/packages/identity/config/src/enums/policy-names.ts new file mode 100644 index 0000000000..f001c03964 --- /dev/null +++ b/npm/ng-packs/packages/identity/config/src/enums/policy-names.ts @@ -0,0 +1,5 @@ +export const enum eIdentityPolicyNames { + IdentityManagement = 'AbpIdentity.Roles || AbpIdentity.Users', + Roles = 'AbpIdentity.Roles', + Users = 'AbpIdentity.Users', +} diff --git a/npm/ng-packs/packages/identity/config/src/providers/route.provider.ts b/npm/ng-packs/packages/identity/config/src/providers/route.provider.ts index 3f88c68464..1ab2cbb3ee 100644 --- a/npm/ng-packs/packages/identity/config/src/providers/route.provider.ts +++ b/npm/ng-packs/packages/identity/config/src/providers/route.provider.ts @@ -1,6 +1,7 @@ import { eLayoutType, RoutesService } from '@abp/ng.core'; import { eThemeSharedRouteNames } from '@abp/ng.theme.shared'; import { APP_INITIALIZER } from '@angular/core'; +import { eIdentityPolicyNames } from '../enums/policy-names'; import { eIdentityRouteNames } from '../enums/route-names'; export const IDENTITY_ROUTE_PROVIDERS = [ @@ -14,6 +15,7 @@ export function configureRoutes(routes: RoutesService) { path: '/identity', name: eIdentityRouteNames.IdentityManagement, parentName: eThemeSharedRouteNames.Administration, + requiredPolicy: eIdentityPolicyNames.IdentityManagement, iconClass: 'fa fa-id-card-o', layout: eLayoutType.application, order: 1, @@ -22,14 +24,14 @@ export function configureRoutes(routes: RoutesService) { path: '/identity/roles', name: eIdentityRouteNames.Roles, parentName: eIdentityRouteNames.IdentityManagement, - requiredPolicy: 'AbpIdentity.Roles', + requiredPolicy: eIdentityPolicyNames.Roles, order: 1, }, { path: '/identity/users', name: eIdentityRouteNames.Users, parentName: eIdentityRouteNames.IdentityManagement, - requiredPolicy: 'AbpIdentity.Users', + requiredPolicy: eIdentityPolicyNames.Users, order: 2, }, ]); diff --git a/npm/ng-packs/packages/setting-management/config/src/enums/index.ts b/npm/ng-packs/packages/setting-management/config/src/enums/index.ts index 3bda94b078..4a7a6a0e23 100644 --- a/npm/ng-packs/packages/setting-management/config/src/enums/index.ts +++ b/npm/ng-packs/packages/setting-management/config/src/enums/index.ts @@ -1 +1,2 @@ +export * from './policy-names'; export * from './route-names'; diff --git a/npm/ng-packs/packages/setting-management/config/src/enums/policy-names.ts b/npm/ng-packs/packages/setting-management/config/src/enums/policy-names.ts new file mode 100644 index 0000000000..df66e95e3b --- /dev/null +++ b/npm/ng-packs/packages/setting-management/config/src/enums/policy-names.ts @@ -0,0 +1,3 @@ +export const enum eSettingManagementPolicyNames { + Settings = 'AbpAccount.SettingManagement', +} diff --git a/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts b/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts index dde2e0abfc..badc46ae9a 100644 --- a/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts +++ b/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts @@ -2,6 +2,7 @@ import { eLayoutType, RoutesService, SettingTabsService } from '@abp/ng.core'; import { eThemeSharedRouteNames } from '@abp/ng.theme.shared'; import { APP_INITIALIZER } from '@angular/core'; import { debounceTime, map } from 'rxjs/operators'; +import { eSettingManagementPolicyNames } from '../enums/policy-names'; import { eSettingManagementRouteNames } from '../enums/route-names'; export const SETTING_MANAGEMENT_ROUTE_PROVIDERS = [ @@ -21,7 +22,7 @@ export function configureRoutes(routes: RoutesService) { name: eSettingManagementRouteNames.Settings, path: '/setting-management', parentName: eThemeSharedRouteNames.Administration, - requiredPolicy: 'AbpAccount.SettingManagement', + requiredPolicy: eSettingManagementPolicyNames.Settings, layout: eLayoutType.application, order: 6, iconClass: 'fa fa-cog', diff --git a/npm/ng-packs/packages/tenant-management/config/src/enums/index.ts b/npm/ng-packs/packages/tenant-management/config/src/enums/index.ts index 3bda94b078..4a7a6a0e23 100644 --- a/npm/ng-packs/packages/tenant-management/config/src/enums/index.ts +++ b/npm/ng-packs/packages/tenant-management/config/src/enums/index.ts @@ -1 +1,2 @@ +export * from './policy-names'; export * from './route-names'; diff --git a/npm/ng-packs/packages/tenant-management/config/src/enums/policy-names.ts b/npm/ng-packs/packages/tenant-management/config/src/enums/policy-names.ts new file mode 100644 index 0000000000..4b78f4d397 --- /dev/null +++ b/npm/ng-packs/packages/tenant-management/config/src/enums/policy-names.ts @@ -0,0 +1,4 @@ +export const enum eTenantManagementPolicyNames { + TenantManagement = 'AbpTenantManagement.Tenants', + Tenants = 'AbpTenantManagement.Tenants', +} diff --git a/npm/ng-packs/packages/tenant-management/config/src/providers/route.provider.ts b/npm/ng-packs/packages/tenant-management/config/src/providers/route.provider.ts index 0be264745d..b191b46ce3 100644 --- a/npm/ng-packs/packages/tenant-management/config/src/providers/route.provider.ts +++ b/npm/ng-packs/packages/tenant-management/config/src/providers/route.provider.ts @@ -1,6 +1,7 @@ import { eLayoutType, RoutesService } from '@abp/ng.core'; import { eThemeSharedRouteNames } from '@abp/ng.theme.shared'; import { APP_INITIALIZER } from '@angular/core'; +import { eTenantManagementPolicyNames } from '../enums/policy-names'; import { eTenantManagementRouteNames } from '../enums/route-names'; export const TENANT_MANAGEMENT_ROUTE_PROVIDERS = [ @@ -14,6 +15,7 @@ export function configureRoutes(routes: RoutesService) { path: '/tenant-management', name: eTenantManagementRouteNames.TenantManagement, parentName: eThemeSharedRouteNames.Administration, + requiredPolicy: eTenantManagementPolicyNames.TenantManagement, layout: eLayoutType.application, iconClass: 'fa fa-users', order: 2, @@ -22,7 +24,7 @@ export function configureRoutes(routes: RoutesService) { path: '/tenant-management/tenants', name: eTenantManagementRouteNames.Tenants, parentName: eTenantManagementRouteNames.TenantManagement, - requiredPolicy: 'AbpTenantManagement.Tenants', + requiredPolicy: eTenantManagementPolicyNames.Tenants, order: 1, }, ]);