refactoring

npm/ng-packs/apps/dev-app/src/app/app-routing.module.ts

@@ -9,11 +9,12 @@ const routes: Routes = [
   },
   {
     path: 'account',
-    loadChildren: () => import('@abp/ng.account').then(m => m.accountRoutes),
+    loadChildren: () => import('@abp/ng.account').then(m => m.createAccountRoutingConfiguration()),
   },
   {
     path: 'identity',
-    loadChildren: () => import('@abp/ng.identity').then(m => m.identityRoutes),
+    loadChildren: () =>
+      import('@abp/ng.identity').then(m => m.createIdentityRoutingConfiguration()),
   },
   {
     path: 'tenant-management',

npm/ng-packs/packages/account/src/lib/account.routes.ts → npm/ng-packs/packages/account/src/lib/account.config.ts

@@ -1,3 +1,24 @@
+import { Routes } from '@angular/router';
+import { importProvidersFrom } from '@angular/core';
+import {
+  ForgotPasswordComponent,
+  LoginComponent,
+  RegisterComponent,
+  ResetPasswordComponent,
+  ManageProfileComponent,
+} from './components';
+import { eAccountComponents } from './enums';
+import { authenticationFlowGuard } from './guards';
+import { accountExtensionsResolver } from './resolvers';
+import {
+  RE_LOGIN_CONFIRMATION_TOKEN,
+  ACCOUNT_CONFIG_OPTIONS,
+  ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS,
+} from './tokens';
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+import { NgxValidateCoreModule } from '@ngx-validate/core';
+import { AccountConfigOptions } from './models';
+import { accountConfigOptionsFactory } from './utils';
 import {
   authGuard,
   ReplaceableComponents,
@@ -5,24 +26,33 @@ import {
   RouterOutletComponent,
 } from '@abp/ng.core';
 
-import { ForgotPasswordComponent } from './components/forgot-password/forgot-password.component';
+export function provideAccount(options: AccountConfigOptions = {}) {
-import { LoginComponent } from './components/login/login.component';
+  return [
-import { ManageProfileComponent } from './components/manage-profile/manage-profile.component';
+    importProvidersFrom(NgbDropdownModule, NgxValidateCoreModule),
-import { RegisterComponent } from './components/register/register.component';
+    { provide: ACCOUNT_CONFIG_OPTIONS, useValue: options },
-import { ResetPasswordComponent } from './components/reset-password/reset-password.component';
+    {
-import { eAccountComponents } from './enums/components';
+      provide: 'ACCOUNT_OPTIONS',
-import { authenticationFlowGuard } from './guards';
+      useFactory: accountConfigOptionsFactory,
-import { accountExtensionsResolver } from './resolvers';
+      deps: [ACCOUNT_CONFIG_OPTIONS],
-import { Routes } from '@angular/router';
+    },
-import { provideAccount } from './account';
+    {
+      provide: RE_LOGIN_CONFIRMATION_TOKEN,
+      useValue: options.isPersonalSettingsChangedConfirmationActive ?? true,
+    },
+    {
+      provide: ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS,
+      useValue: options.editFormPropContributors,
+    },
+  ];
+}
 
 const canActivate = [authenticationFlowGuard];
 
-export const accountRoutes: Routes = [
+export const createAccountRoutingConfiguration = (options: AccountConfigOptions = {}): Routes => [
   {
     path: '',
     component: RouterOutletComponent,
-    providers: [...provideAccount()],
+    providers: [...provideAccount(options)],
     children: [
       { path: '', pathMatch: 'full', redirectTo: 'login' },
       {

npm/ng-packs/packages/account/src/lib/account.ts

@@ -1,28 +0,0 @@
-import { importProvidersFrom } from '@angular/core';
-import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
-import { NgxValidateCoreModule } from '@ngx-validate/core';
-import { AccountConfigOptions } from './models/config-options';
-import { ACCOUNT_CONFIG_OPTIONS } from './tokens/config-options.token';
-import { accountConfigOptionsFactory } from './utils/factory-utils';
-import { RE_LOGIN_CONFIRMATION_TOKEN } from './tokens';
-import { ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS } from './tokens/extensions.token';
-
-export function provideAccount(options: AccountConfigOptions = {}) {
-  return [
-    importProvidersFrom(NgbDropdownModule, NgxValidateCoreModule),
-    { provide: ACCOUNT_CONFIG_OPTIONS, useValue: options },
-    {
-      provide: 'ACCOUNT_OPTIONS',
-      useFactory: accountConfigOptionsFactory,
-      deps: [ACCOUNT_CONFIG_OPTIONS],
-    },
-    {
-      provide: RE_LOGIN_CONFIRMATION_TOKEN,
-      useValue: options.isPersonalSettingsChangedConfirmationActive ?? true,
-    },
-    {
-      provide: ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS,
-      useValue: options.editFormPropContributors,
-    },
-  ];
-}

npm/ng-packs/packages/account/src/public-api.ts

@@ -7,5 +7,4 @@ export * from './lib/services';
 export * from './lib/tokens';
 export * from './lib/utils';
 export * from './lib/resolvers';
-export * from './lib/account.routes';
+export * from './lib/account.config';
-export * from './lib/account';

npm/ng-packs/packages/identity/src/lib/identity.routes.ts → npm/ng-packs/packages/identity/src/lib/identity.config.ts

@@ -1,4 +1,13 @@
+import { Provider } from '@angular/core';
 import { Routes } from '@angular/router';
+import {
+  IDENTITY_CREATE_FORM_PROP_CONTRIBUTORS,
+  IDENTITY_EDIT_FORM_PROP_CONTRIBUTORS,
+  IDENTITY_ENTITY_ACTION_CONTRIBUTORS,
+  IDENTITY_ENTITY_PROP_CONTRIBUTORS,
+  IDENTITY_TOOLBAR_ACTION_CONTRIBUTORS,
+} from './tokens';
+import { IdentityConfigOptions } from './models';
 import {
   authGuard,
   permissionGuard,
@@ -9,15 +18,39 @@ import {
 import { RolesComponent, UsersComponent } from './components';
 import { identityExtensionsResolver } from './resolvers';
 import { eIdentityComponents } from './enums';
-import { provideIdentity } from './identity';
 
-export const identityRoutes: Routes = [
+export function provideIdentity(options: IdentityConfigOptions = {}): Provider[] {
+  return [
+    {
+      provide: IDENTITY_ENTITY_ACTION_CONTRIBUTORS,
+      useValue: options.entityActionContributors,
+    },
+    {
+      provide: IDENTITY_TOOLBAR_ACTION_CONTRIBUTORS,
+      useValue: options.toolbarActionContributors,
+    },
+    {
+      provide: IDENTITY_ENTITY_PROP_CONTRIBUTORS,
+      useValue: options.entityPropContributors,
+    },
+    {
+      provide: IDENTITY_CREATE_FORM_PROP_CONTRIBUTORS,
+      useValue: options.createFormPropContributors,
+    },
+    {
+      provide: IDENTITY_EDIT_FORM_PROP_CONTRIBUTORS,
+      useValue: options.editFormPropContributors,
+    },
+  ];
+}
+
+export const createIdentityRoutingConfiguration = (options: IdentityConfigOptions = {}): Routes => [
   {
     path: '',
     component: RouterOutletComponent,
     canActivate: [authGuard, permissionGuard],
     resolve: [identityExtensionsResolver],
-    providers: provideIdentity({}),
+    providers: provideIdentity(options),
     children: [
       { path: '', redirectTo: 'roles', pathMatch: 'full' },
       {

npm/ng-packs/packages/identity/src/lib/identity.ts

@@ -1,34 +0,0 @@
-import {
-  IDENTITY_CREATE_FORM_PROP_CONTRIBUTORS,
-  IDENTITY_EDIT_FORM_PROP_CONTRIBUTORS,
-  IDENTITY_ENTITY_ACTION_CONTRIBUTORS,
-  IDENTITY_ENTITY_PROP_CONTRIBUTORS,
-  IDENTITY_TOOLBAR_ACTION_CONTRIBUTORS,
-} from './tokens';
-import { IdentityConfigOptions } from './models';
-import { Provider } from '@angular/core';
-
-export function provideIdentity(options: IdentityConfigOptions = {}): Provider[] {
-  return [
-    {
-      provide: IDENTITY_ENTITY_ACTION_CONTRIBUTORS,
-      useValue: options.entityActionContributors,
-    },
-    {
-      provide: IDENTITY_TOOLBAR_ACTION_CONTRIBUTORS,
-      useValue: options.toolbarActionContributors,
-    },
-    {
-      provide: IDENTITY_ENTITY_PROP_CONTRIBUTORS,
-      useValue: options.entityPropContributors,
-    },
-    {
-      provide: IDENTITY_CREATE_FORM_PROP_CONTRIBUTORS,
-      useValue: options.createFormPropContributors,
-    },
-    {
-      provide: IDENTITY_EDIT_FORM_PROP_CONTRIBUTORS,
-      useValue: options.editFormPropContributors,
-    },
-  ];
-}

npm/ng-packs/packages/identity/src/public-api.ts

@@ -5,5 +5,4 @@ export * from './lib/identity.module';
 export * from './lib/models';
 export * from './lib/tokens';
 export * from './lib/resolvers';
-export * from './lib/identity.routes';
+export * from './lib/identity.config';
-export * from './lib/identity';