From c466807c014354b2c19dddad0c4c9cdf7a253062 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Tue, 10 Sep 2019 13:50:11 +0300 Subject: [PATCH] refactor: remove all root modules and add module provider functions --- .../account/src/lib/account.module.ts | 15 +++++++++++++- .../account/src/lib/root-account.module.ts | 20 ------------------- .../packages/account/src/public-api.ts | 1 - .../src/lib/root-feature-management.module.ts | 11 ---------- .../feature-management/src/public-api.ts | 1 - .../identity/src/lib/identity.module.ts | 6 +++++- .../identity/src/lib/root-identity.module.ts | 11 ---------- .../packages/identity/src/public-api.ts | 1 - .../lib/root-permission-management.module.ts | 11 ---------- .../permission-management/src/public-api.ts | 1 - .../src/lib/root-setting-management.module.ts | 11 ---------- .../setting-management/src/public-api.ts | 3 +-- .../src/lib/root-tenant-management.module.ts | 11 ---------- .../src/lib/tenant-management.module.ts | 6 +++++- .../tenant-management/src/public-api.ts | 1 - 15 files changed, 25 insertions(+), 85 deletions(-) delete mode 100644 npm/ng-packs/packages/account/src/lib/root-account.module.ts delete mode 100644 npm/ng-packs/packages/feature-management/src/lib/root-feature-management.module.ts delete mode 100644 npm/ng-packs/packages/identity/src/lib/root-identity.module.ts delete mode 100644 npm/ng-packs/packages/permission-management/src/lib/root-permission-management.module.ts delete mode 100644 npm/ng-packs/packages/setting-management/src/lib/root-setting-management.module.ts delete mode 100644 npm/ng-packs/packages/tenant-management/src/lib/root-tenant-management.module.ts diff --git a/npm/ng-packs/packages/account/src/lib/account.module.ts b/npm/ng-packs/packages/account/src/lib/account.module.ts index fbfe6a7226..8a790a21c1 100644 --- a/npm/ng-packs/packages/account/src/lib/account.module.ts +++ b/npm/ng-packs/packages/account/src/lib/account.module.ts @@ -1,6 +1,6 @@ import { CoreModule } from '@abp/ng.core'; import { ThemeSharedModule } from '@abp/ng.theme.shared'; -import { NgModule } from '@angular/core'; +import { NgModule, Provider } from '@angular/core'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { NgxValidateCoreModule } from '@ngx-validate/core'; import { TableModule } from 'primeng/table'; @@ -8,6 +8,8 @@ import { AccountRoutingModule } from './account-routing.module'; import { LoginComponent } from './components/login/login.component'; import { RegisterComponent } from './components/register/register.component'; import { TenantBoxComponent } from './components/tenant-box/tenant-box.component'; +import { Options } from './models/options'; +import { ACCOUNT_OPTIONS, optionsFactory } from './tokens/options.token'; @NgModule({ declarations: [LoginComponent, RegisterComponent, TenantBoxComponent], @@ -15,3 +17,14 @@ import { TenantBoxComponent } from './components/tenant-box/tenant-box.component exports: [], }) export class AccountModule {} + +export function AccountProviders(options = {} as Options): Provider[] { + return [ + { provide: ACCOUNT_OPTIONS, useValue: options }, + { + provide: 'ACCOUNT_OPTIONS', + useFactory: optionsFactory, + deps: [ACCOUNT_OPTIONS], + }, + ]; +} diff --git a/npm/ng-packs/packages/account/src/lib/root-account.module.ts b/npm/ng-packs/packages/account/src/lib/root-account.module.ts deleted file mode 100644 index beca480223..0000000000 --- a/npm/ng-packs/packages/account/src/lib/root-account.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { ModuleWithProviders, NgModule } from '@angular/core'; -import { Options } from './models/options'; -import { ACCOUNT_OPTIONS, optionsFactory } from './tokens/options.token'; - -@NgModule({}) -export class RootAccountModule { - static forRoot(options = {} as Options): ModuleWithProviders { - return { - ngModule: RootAccountModule, - providers: [ - { provide: ACCOUNT_OPTIONS, useValue: options }, - { - provide: 'ACCOUNT_OPTIONS', - useFactory: optionsFactory, - deps: [ACCOUNT_OPTIONS], - }, - ], - }; - } -} diff --git a/npm/ng-packs/packages/account/src/public-api.ts b/npm/ng-packs/packages/account/src/public-api.ts index d75f7155f1..0e845f0768 100644 --- a/npm/ng-packs/packages/account/src/public-api.ts +++ b/npm/ng-packs/packages/account/src/public-api.ts @@ -1,4 +1,3 @@ -export * from './lib/root-account.module'; export * from './lib/account.module'; export * from './lib/components'; export * from './lib/constants/routes'; diff --git a/npm/ng-packs/packages/feature-management/src/lib/root-feature-management.module.ts b/npm/ng-packs/packages/feature-management/src/lib/root-feature-management.module.ts deleted file mode 100644 index cb60351a07..0000000000 --- a/npm/ng-packs/packages/feature-management/src/lib/root-feature-management.module.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { ModuleWithProviders, NgModule } from '@angular/core'; - -@NgModule({}) -export class RootFeatureManagementModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: RootFeatureManagementModule, - providers: [], - }; - } -} diff --git a/npm/ng-packs/packages/feature-management/src/public-api.ts b/npm/ng-packs/packages/feature-management/src/public-api.ts index a13bb6c526..047ac00914 100644 --- a/npm/ng-packs/packages/feature-management/src/public-api.ts +++ b/npm/ng-packs/packages/feature-management/src/public-api.ts @@ -1,3 +1,2 @@ -export * from './lib/root-feature-management.module'; export * from './lib/feature-management.module'; export * from './lib/components'; diff --git a/npm/ng-packs/packages/identity/src/lib/identity.module.ts b/npm/ng-packs/packages/identity/src/lib/identity.module.ts index baac608c6e..e39385e5f5 100644 --- a/npm/ng-packs/packages/identity/src/lib/identity.module.ts +++ b/npm/ng-packs/packages/identity/src/lib/identity.module.ts @@ -1,5 +1,5 @@ import { CoreModule } from '@abp/ng.core'; -import { NgModule } from '@angular/core'; +import { NgModule, Provider } from '@angular/core'; import { NgxsModule } from '@ngxs/store'; import { RolesComponent } from './components/roles/roles.component'; import { IdentityRoutingModule } from './identity-routing.module'; @@ -28,3 +28,7 @@ import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar'; ], }) export class IdentityModule {} + +export function IdentityProviders(): Provider[] { + return []; +} diff --git a/npm/ng-packs/packages/identity/src/lib/root-identity.module.ts b/npm/ng-packs/packages/identity/src/lib/root-identity.module.ts deleted file mode 100644 index c5cc5efaaa..0000000000 --- a/npm/ng-packs/packages/identity/src/lib/root-identity.module.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { ModuleWithProviders, NgModule } from '@angular/core'; - -@NgModule({}) -export class RootIdentityModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: RootIdentityModule, - providers: [], - }; - } -} diff --git a/npm/ng-packs/packages/identity/src/public-api.ts b/npm/ng-packs/packages/identity/src/public-api.ts index e3de2483e4..be547b1c34 100644 --- a/npm/ng-packs/packages/identity/src/public-api.ts +++ b/npm/ng-packs/packages/identity/src/public-api.ts @@ -2,7 +2,6 @@ * Public API Surface of identity */ -export * from './lib/root-identity.module'; export * from './lib/identity.module'; export * from './lib/actions/identity.actions'; export * from './lib/components/roles/roles.component'; diff --git a/npm/ng-packs/packages/permission-management/src/lib/root-permission-management.module.ts b/npm/ng-packs/packages/permission-management/src/lib/root-permission-management.module.ts deleted file mode 100644 index a61fbc6b64..0000000000 --- a/npm/ng-packs/packages/permission-management/src/lib/root-permission-management.module.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { ModuleWithProviders, NgModule } from '@angular/core'; - -@NgModule({}) -export class RootPermissionManagementModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: RootPermissionManagementModule, - providers: [], - }; - } -} diff --git a/npm/ng-packs/packages/permission-management/src/public-api.ts b/npm/ng-packs/packages/permission-management/src/public-api.ts index bf45b06676..3182363f25 100644 --- a/npm/ng-packs/packages/permission-management/src/public-api.ts +++ b/npm/ng-packs/packages/permission-management/src/public-api.ts @@ -2,7 +2,6 @@ * Public API Surface of permission-management */ -export * from './lib/root-permission-management.module'; export * from './lib/permission-management.module'; export * from './lib/actions'; export * from './lib/components'; diff --git a/npm/ng-packs/packages/setting-management/src/lib/root-setting-management.module.ts b/npm/ng-packs/packages/setting-management/src/lib/root-setting-management.module.ts deleted file mode 100644 index 120d9fc444..0000000000 --- a/npm/ng-packs/packages/setting-management/src/lib/root-setting-management.module.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { ModuleWithProviders, NgModule } from '@angular/core'; - -@NgModule({}) -export class RootSettingManagementModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: RootSettingManagementModule, - providers: [], - }; - } -} 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 6ef085fc8e..5343d9e457 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,3 @@ -export * from './lib/root-setting-management.module'; export * from './lib/setting-management.module'; -export * from './lib/components'; export * from './lib/constants'; +export * from './lib/components/setting-layout.component'; diff --git a/npm/ng-packs/packages/tenant-management/src/lib/root-tenant-management.module.ts b/npm/ng-packs/packages/tenant-management/src/lib/root-tenant-management.module.ts deleted file mode 100644 index a147f2a36a..0000000000 --- a/npm/ng-packs/packages/tenant-management/src/lib/root-tenant-management.module.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { ModuleWithProviders, NgModule } from '@angular/core'; - -@NgModule({}) -export class RootTenantManagementModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: RootTenantManagementModule, - providers: [], - }; - } -} diff --git a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts index feb7303167..f8a258da3b 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts @@ -1,6 +1,6 @@ import { CoreModule } from '@abp/ng.core'; import { ThemeSharedModule } from '@abp/ng.theme.shared'; -import { NgModule } from '@angular/core'; +import { NgModule, Provider } from '@angular/core'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { NgxsModule } from '@ngxs/store'; import { TableModule } from 'primeng/table'; @@ -24,3 +24,7 @@ import { NgxValidateCoreModule } from '@ngx-validate/core'; ], }) export class TenantManagementModule {} + +export function TenantManagementProviders(): Provider[] { + return []; +} 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 6b2ae2d388..9bae9a9edb 100644 --- a/npm/ng-packs/packages/tenant-management/src/public-api.ts +++ b/npm/ng-packs/packages/tenant-management/src/public-api.ts @@ -1,4 +1,3 @@ -export * from './lib/root-tenant-management.module'; export * from './lib/tenant-management.module'; export * from './lib/actions'; export * from './lib/components';