From b192c515f4bbb42c44b182182d35a74c15c4d0f4 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Wed, 14 May 2025 12:29:58 +0300 Subject: [PATCH] refactoring --- npm/ng-packs/apps/dev-app/src/app/app.routes.ts | 13 ++++--------- .../lib/{account.config.ts => account.routes.ts} | 2 +- npm/ng-packs/packages/account/src/public-api.ts | 2 +- .../src/lib/directives/prop-data.directive.ts | 1 - .../src/lib/pipes/create-injector.pipe.ts | 1 - .../core/src/lib/directives/for.directive.ts | 1 - .../lib/{identity.config.ts => identity.routes.ts} | 2 +- npm/ng-packs/packages/identity/src/public-api.ts | 2 +- .../email-setting-group.component.ts | 8 +++++++- ...ement.config.ts => setting-management.routes.ts} | 2 +- .../packages/setting-management/src/public-api.ts | 2 +- ...gement.config.ts => tenant-management.routes.ts} | 4 +--- .../packages/tenant-management/src/public-api.ts | 2 +- .../src/lib/components/spinner/spinner.component.ts | 1 - 14 files changed, 19 insertions(+), 24 deletions(-) rename npm/ng-packs/packages/account/src/lib/{account.config.ts => account.routes.ts} (97%) rename npm/ng-packs/packages/identity/src/lib/{identity.config.ts => identity.routes.ts} (96%) rename npm/ng-packs/packages/setting-management/src/lib/{setting-management.config.ts => setting-management.routes.ts} (92%) rename npm/ng-packs/packages/tenant-management/src/lib/{tenant-management.config.ts => tenant-management.routes.ts} (94%) diff --git a/npm/ng-packs/apps/dev-app/src/app/app.routes.ts b/npm/ng-packs/apps/dev-app/src/app/app.routes.ts index 29a058386e..47462b7f8f 100644 --- a/npm/ng-packs/apps/dev-app/src/app/app.routes.ts +++ b/npm/ng-packs/apps/dev-app/src/app/app.routes.ts @@ -8,23 +8,18 @@ export const appRoutes: Routes = [ }, { path: 'account', - loadChildren: () => import('@abp/ng.account').then(m => m.createAccountRoutingConfiguration()), + loadChildren: () => import('@abp/ng.account').then(m => m.createRoutes()), }, { path: 'identity', - loadChildren: () => - import('@abp/ng.identity').then(m => m.createIdentityRoutingConfiguration()), + loadChildren: () => import('@abp/ng.identity').then(m => m.createRoutes()), }, { path: 'tenant-management', - loadChildren: () => - import('@abp/ng.tenant-management').then(m => m.createTenantManagementRoutingConfiguration()), + loadChildren: () => import('@abp/ng.tenant-management').then(m => m.createRoutes()), }, { path: 'setting-management', - loadChildren: () => - import('@abp/ng.setting-management').then(m => - m.createSettingManagementRoutingConfiguration(), - ), + loadChildren: () => import('@abp/ng.setting-management').then(m => m.createRoutes()), }, ]; diff --git a/npm/ng-packs/packages/account/src/lib/account.config.ts b/npm/ng-packs/packages/account/src/lib/account.routes.ts similarity index 97% rename from npm/ng-packs/packages/account/src/lib/account.config.ts rename to npm/ng-packs/packages/account/src/lib/account.routes.ts index 6ec29aceca..5fb4236ee1 100644 --- a/npm/ng-packs/packages/account/src/lib/account.config.ts +++ b/npm/ng-packs/packages/account/src/lib/account.routes.ts @@ -44,7 +44,7 @@ export function provideAccount(options: AccountConfigOptions = {}) { const canActivate = [authenticationFlowGuard]; -export const createAccountRoutingConfiguration = (options: AccountConfigOptions = {}): Routes => [ +export const createRoutes = (options: AccountConfigOptions = {}): Routes => [ { path: '', component: RouterOutletComponent, diff --git a/npm/ng-packs/packages/account/src/public-api.ts b/npm/ng-packs/packages/account/src/public-api.ts index a6c747de91..0e4be6fd23 100644 --- a/npm/ng-packs/packages/account/src/public-api.ts +++ b/npm/ng-packs/packages/account/src/public-api.ts @@ -7,4 +7,4 @@ export * from './lib/services'; export * from './lib/tokens'; export * from './lib/utils'; export * from './lib/resolvers'; -export * from './lib/account.config'; +export * from './lib/account.routes'; diff --git a/npm/ng-packs/packages/components/extensible/src/lib/directives/prop-data.directive.ts b/npm/ng-packs/packages/components/extensible/src/lib/directives/prop-data.directive.ts index 52ccd286ad..2bba45ff70 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/directives/prop-data.directive.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/directives/prop-data.directive.ts @@ -13,7 +13,6 @@ import { PropData, PropList } from '../models/props'; @Directive({ exportAs: 'abpPropData', selector: '[abpPropData]', - standalone: true, }) export class PropDataDirective> extends PropData> diff --git a/npm/ng-packs/packages/components/extensible/src/lib/pipes/create-injector.pipe.ts b/npm/ng-packs/packages/components/extensible/src/lib/pipes/create-injector.pipe.ts index 4b410fcea9..3536fa4dad 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/pipes/create-injector.pipe.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/pipes/create-injector.pipe.ts @@ -12,7 +12,6 @@ import { EXTENSIONS_ACTION_CALLBACK, EXTENSIONS_ACTION_DATA } from '../tokens/ex @Pipe({ name: 'createInjector', - standalone: true, }) export class CreateInjectorPipe implements PipeTransform { public transform( diff --git a/npm/ng-packs/packages/core/src/lib/directives/for.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/for.directive.ts index 387cfac844..1e37e1c908 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/for.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/for.directive.ts @@ -33,7 +33,6 @@ class RecordView { } @Directive({ - standalone: true, selector: '[abpFor]', }) export class ForDirective implements OnChanges { diff --git a/npm/ng-packs/packages/identity/src/lib/identity.config.ts b/npm/ng-packs/packages/identity/src/lib/identity.routes.ts similarity index 96% rename from npm/ng-packs/packages/identity/src/lib/identity.config.ts rename to npm/ng-packs/packages/identity/src/lib/identity.routes.ts index 04d26d81a3..dc7cda3f08 100644 --- a/npm/ng-packs/packages/identity/src/lib/identity.config.ts +++ b/npm/ng-packs/packages/identity/src/lib/identity.routes.ts @@ -44,7 +44,7 @@ export function provideIdentity(options: IdentityConfigOptions = {}): Provider[] ]; } -export const createIdentityRoutingConfiguration = (options: IdentityConfigOptions = {}): Routes => [ +export const createRoutes = (options: IdentityConfigOptions = {}): Routes => [ { path: '', component: RouterOutletComponent, diff --git a/npm/ng-packs/packages/identity/src/public-api.ts b/npm/ng-packs/packages/identity/src/public-api.ts index eaa4782d50..74cd5cce35 100644 --- a/npm/ng-packs/packages/identity/src/public-api.ts +++ b/npm/ng-packs/packages/identity/src/public-api.ts @@ -5,4 +5,4 @@ export * from './lib/identity.module'; export * from './lib/models'; export * from './lib/tokens'; export * from './lib/resolvers'; -export * from './lib/identity.config'; +export * from './lib/identity.routes'; diff --git a/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts b/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts index a0c7903bb5..7743cd34d9 100644 --- a/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts +++ b/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts @@ -18,7 +18,12 @@ import { finalize } from 'rxjs/operators'; import { SettingManagementPolicyNames } from '../../enums/policy-names'; import { EmailSettingsService } from '@abp/ng.setting-management/proxy'; import { EmailSettingsDto } from '../../proxy/models'; -import { ConfigStateService, LocalizationPipe, LocalizationService } from '@abp/ng.core'; +import { + ConfigStateService, + LocalizationPipe, + LocalizationService, + PermissionDirective, +} from '@abp/ng.core'; import { NgxValidateCoreModule, ValidationDirective } from '@ngx-validate/core'; import { CommonModule } from '@angular/common'; @@ -36,6 +41,7 @@ const { required, email } = Validators; ModalComponent, ModalCloseDirective, NgxValidateCoreModule, + PermissionDirective, ], }) export class EmailSettingGroupComponent implements OnInit { diff --git a/npm/ng-packs/packages/setting-management/src/lib/setting-management.config.ts b/npm/ng-packs/packages/setting-management/src/lib/setting-management.routes.ts similarity index 92% rename from npm/ng-packs/packages/setting-management/src/lib/setting-management.config.ts rename to npm/ng-packs/packages/setting-management/src/lib/setting-management.routes.ts index 773555d080..090df0ea56 100644 --- a/npm/ng-packs/packages/setting-management/src/lib/setting-management.config.ts +++ b/npm/ng-packs/packages/setting-management/src/lib/setting-management.routes.ts @@ -12,7 +12,7 @@ export function provideSettingManagement() { return []; } -export const createSettingManagementRoutingConfiguration = (): Routes => [ +export const createRoutes = (): Routes => [ { path: '', component: RouterOutletComponent, diff --git a/npm/ng-packs/packages/setting-management/src/public-api.ts b/npm/ng-packs/packages/setting-management/src/public-api.ts index aa3993a99e..673b3f281a 100644 --- a/npm/ng-packs/packages/setting-management/src/public-api.ts +++ b/npm/ng-packs/packages/setting-management/src/public-api.ts @@ -1,4 +1,4 @@ export * from './lib/setting-management.module'; export * from './lib/components/setting-management.component'; export * from './lib/enums'; -export * from './lib/setting-management.config'; +export * from './lib/setting-management.routes'; diff --git a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.config.ts b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.routes.ts similarity index 94% rename from npm/ng-packs/packages/tenant-management/src/lib/tenant-management.config.ts rename to npm/ng-packs/packages/tenant-management/src/lib/tenant-management.routes.ts index dfac357db4..7b38035d2f 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.config.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.routes.ts @@ -44,9 +44,7 @@ export function provideTenantManagement(options: TenantManagementConfigOptions = ]; } -export const createTenantManagementRoutingConfiguration = ( - options: TenantManagementConfigOptions = {}, -): Routes => [ +export const createRoutes = (options: TenantManagementConfigOptions = {}): Routes => [ { path: '', component: RouterOutletComponent, diff --git a/npm/ng-packs/packages/tenant-management/src/public-api.ts b/npm/ng-packs/packages/tenant-management/src/public-api.ts index 4d53dca426..0ab49e4f64 100644 --- a/npm/ng-packs/packages/tenant-management/src/public-api.ts +++ b/npm/ng-packs/packages/tenant-management/src/public-api.ts @@ -5,4 +5,4 @@ export * from './lib/models'; export * from './lib/tenant-management.module'; export * from './lib/tokens'; export * from './lib/resolvers'; -export * from './lib/tenant-management.config'; +export * from './lib/tenant-management.routes'; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/spinner/spinner.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/spinner/spinner.component.ts index e1d3493261..4847d15652 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/spinner/spinner.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/spinner/spinner.component.ts @@ -2,7 +2,6 @@ import { Component } from '@angular/core'; @Component({ selector: 'abp-spinner', - standalone: true, template: `