Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eliminated Config Packages & Removed Routes From Config State #4377

Merged
merged 60 commits into from
Jun 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
e5634fc
feat: add LazyModuleFactory
armanozak Jun 15, 2020
117b47b
feat: add pushValueTo array util to core
armanozak Jun 16, 2020
ed41a88
feat: add tree utils to core
armanozak Jun 16, 2020
66111b9
feat: improve tree util types
armanozak Jun 16, 2020
c72bcf4
feat: add circular reference to parents of nodes
armanozak Jun 17, 2020
6478f57
feat: add node, nav, and tab types
armanozak Jun 17, 2020
41f1f27
feat: add utility function for getting a route path
armanozak Jun 17, 2020
19a405f
feat: add a service for routes and setting tabs
armanozak Jun 17, 2020
82188a0
feat: use RoutesService in DynamicLayoutComponent
armanozak Jun 17, 2020
9c0fe4c
refactor: use ABP.Route type instead of ABP.FullRoute
armanozak Jun 17, 2020
962e636
feat: use RoutesService in RoutesComponent
armanozak Jun 17, 2020
8cd85a4
feat: use RoutesService in BreadcrumbComponent
armanozak Jun 17, 2020
50d513d
feat: add BreadcrumbComponent to ApplicationLayoutComponent
armanozak Jun 17, 2020
dc3924f
feat: remove setting management in theme shared
armanozak Jun 17, 2020
56636da
feat: add route names to theme shared
armanozak Jun 17, 2020
b8dd287
feat: add route providers to theme shared
armanozak Jun 17, 2020
b2ed2aa
feat: use route providers and make them public
armanozak Jun 17, 2020
4ed2c5b
feat: add config sub-packages
armanozak Jun 17, 2020
a8906ba
feat: add route names to account config
armanozak Jun 17, 2020
bc83b67
feat: add route provider to account config
armanozak Jun 17, 2020
c6ad4da
feat: use route provider and make all config public
armanozak Jun 17, 2020
6938753
feat: delete legacy account config
armanozak Jun 17, 2020
920e2bc
feat: add accountOptionsFactory util
armanozak Jun 17, 2020
0d7f7f2
feat: remove optionsFactory from options token file
armanozak Jun 17, 2020
293eaf8
feat: add forChild and forLazy static methods
armanozak Jun 17, 2020
ef5625e
feat: remove route names from account package
armanozak Jun 17, 2020
afefd55
build: remove @abp/ng.account.config from deps
armanozak Jun 17, 2020
6cc07e9
feat: add route names to identity config
armanozak Jun 17, 2020
164895f
feat: add route provider to identity config
armanozak Jun 17, 2020
e0a3764
feat: use route provider and make all config public
armanozak Jun 17, 2020
f2c0580
feat: delete legacy identity config
armanozak Jun 17, 2020
ccc0eeb
feat: add forChild and forLazy static methods
armanozak Jun 17, 2020
73e5074
feat: remove route names from identity package
armanozak Jun 17, 2020
a1ee05e
build: remove @abp/ng.identity.config from deps
armanozak Jun 17, 2020
0993e4a
feat: add route names to tenant management config
armanozak Jun 17, 2020
035643d
feat: add route provider to tenant management config
armanozak Jun 17, 2020
dff718b
feat: use route provider and make all config public
armanozak Jun 17, 2020
ef9e911
feat: delete legacy tenant management config
armanozak Jun 17, 2020
03d71d7
feat: add forChild and forLazy static methods
armanozak Jun 17, 2020
41d1f07
feat: remove route names from tenant management package
armanozak Jun 17, 2020
aedeaa0
build: remove @abp/ng.tenant-management.config from deps
armanozak Jun 17, 2020
5c49e00
feat: add route names to setting management config
armanozak Jun 17, 2020
21e3d9a
feat: add route provider to setting management config
armanozak Jun 17, 2020
aec2181
feat: use route provider and make all config public
armanozak Jun 17, 2020
0f48f6c
feat: delete legacy setting management config
armanozak Jun 17, 2020
41872d8
feat: add forChild and forLazy static methods
armanozak Jun 17, 2020
74f476e
build: remove @abp/ng.setting-management.config from deps
armanozak Jun 17, 2020
0fb0eba
feat: use SettingTabsService in setting management
armanozak Jun 17, 2020
04ab7e5
feat: remove routes from config state
armanozak Jun 17, 2020
893806a
build: update paths according to new config packages
armanozak Jun 17, 2020
09110c9
build: remove legacy packages from scripts
armanozak Jun 17, 2020
dec2e88
docs: remove legacy packages from contribution template
armanozak Jun 17, 2020
4972d6d
build: remove legacy config libraries from project
armanozak Jun 17, 2020
27bec5c
build: remove legacy config packages from deps
armanozak Jun 17, 2020
2af9019
feat: use new config modules in dev-app
armanozak Jun 17, 2020
3c87550
feat: use forLazy static method of lazy modules
armanozak Jun 17, 2020
43db18b
feat: remove unused wrapper modules from dev-app
armanozak Jun 17, 2020
5f36ceb
test: change spectator type
armanozak Jun 17, 2020
2e8e995
test: update breadcrumb specs according to RoutesService
armanozak Jun 17, 2020
c5ff7ab
revert: remove breadcrumb from application layout
armanozak Jun 18, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions npm/ng-packs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,6 @@ The following is the list of supported scopes:
- **feature-management**
- **permission-management**
- **setting-management**
- **account-config**
- **identity-config**
- **setting-management-config**
- **tenant-management-config**

There are currently a few exceptions to the "use package name" rule:

Expand Down
148 changes: 1 addition & 147 deletions npm/ng-packs/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -329,152 +329,6 @@
}
}
},
"setting-management-config": {
"projectType": "library",
"root": "packages/setting-management-config",
"sourceRoot": "packages/setting-management-config/src",
"prefix": "abp",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"tsConfig": "packages/setting-management-config/tsconfig.lib.json",
"project": "packages/setting-management-config/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "packages/setting-management-config/tsconfig.lib.prod.json"
}
}
},
"test": {
"builder": "@angular-builders/jest:run",
"options": {
"coverage": true,
"passWithNoTests": true
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"packages/setting-management-config/tsconfig.lib.json",
"packages/setting-management-config/tsconfig.spec.json"
]
}
}
}
},
"identity-config": {
"projectType": "library",
"root": "packages/identity-config",
"sourceRoot": "packages/identity-config/src",
"prefix": "abp",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"tsConfig": "packages/identity-config/tsconfig.lib.json",
"project": "packages/identity-config/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "packages/identity-config/tsconfig.lib.prod.json"
}
}
},
"test": {
"builder": "@angular-builders/jest:run",
"options": {
"coverage": true,
"passWithNoTests": true
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"packages/identity-config/tsconfig.lib.json",
"packages/identity-config/tsconfig.spec.json"
],
"exclude": ["**/node_modules/**"]
}
}
}
},
"account-config": {
"projectType": "library",
"root": "packages/account-config",
"sourceRoot": "packages/account-config/src",
"prefix": "abp",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"tsConfig": "packages/account-config/tsconfig.lib.json",
"project": "packages/account-config/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "packages/account-config/tsconfig.lib.prod.json"
}
}
},
"test": {
"builder": "@angular-builders/jest:run",
"options": {
"coverage": true,
"passWithNoTests": true
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"packages/account-config/tsconfig.lib.json",
"packages/account-config/tsconfig.spec.json"
],
"exclude": ["**/node_modules/**"]
}
}
}
},
"tenant-management-config": {
"projectType": "library",
"root": "packages/tenant-management-config",
"sourceRoot": "packages/tenant-management-config/src",
"prefix": "abp",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"tsConfig": "packages/tenant-management-config/tsconfig.lib.json",
"project": "packages/tenant-management-config/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "packages/tenant-management-config/tsconfig.lib.prod.json"
}
}
},
"test": {
"builder": "@angular-builders/jest:run",
"options": {
"coverage": true,
"passWithNoTests": true
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"packages/tenant-management-config/tsconfig.lib.json",
"packages/tenant-management-config/tsconfig.spec.json"
]
}
}
}
},
"dev-app": {
"projectType": "application",
"schematics": {
Expand Down Expand Up @@ -557,7 +411,7 @@
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumWarning": "1mb",
"maximumError": "5mb"
},
{
Expand Down
9 changes: 5 additions & 4 deletions npm/ng-packs/apps/dev-app/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,22 @@ const routes: Routes = [
},
{
path: 'account',
loadChildren: () => import('./lazy-libs/account-wrapper.module').then(m => m.AccountWrapperModule),
loadChildren: () =>
import('@abp/ng.account').then(m => m.AccountModule.forLazy({ redirectUrl: '/' })),
},
{
path: 'identity',
loadChildren: () => import('./lazy-libs/identity-wrapper.module').then(m => m.IdentityWrapperModule),
loadChildren: () => import('@abp/ng.identity').then(m => m.IdentityModule.forLazy()),
},
{
path: 'tenant-management',
loadChildren: () =>
import('./lazy-libs/tenant-management-wrapper.module').then(m => m.TenantManagementWrapperModule),
import('@abp/ng.tenant-management').then(m => m.TenantManagementModule.forLazy()),
},
{
path: 'setting-management',
loadChildren: () =>
import('./lazy-libs/setting-management-wrapper.module').then(m => m.SettingManagementWrapperModule),
import('@abp/ng.setting-management').then(m => m.SettingManagementModule.forLazy()),
},
];

Expand Down
18 changes: 9 additions & 9 deletions npm/ng-packs/apps/dev-app/src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import { AccountConfigModule } from '@abp/ng.account/config';
import { CoreModule } from '@abp/ng.core';
import { IdentityConfigModule } from '@abp/ng.identity/config';
import { SettingManagementConfigModule } from '@abp/ng.setting-management/config';
import { TenantManagementConfigModule } from '@abp/ng.tenant-management/config';
import { ThemeSharedModule } from '@abp/ng.theme.shared';
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
Expand All @@ -8,11 +13,6 @@ import { environment } from '../environments/environment';
import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
import { SharedModule } from './shared/shared.module';
import { ThemeSharedModule } from '@abp/ng.theme.shared';
import { AccountConfigModule } from '@abp/ng.account.config';
import { IdentityConfigModule } from '@abp/ng.identity.config';
import { TenantManagementConfigModule } from '@abp/ng.tenant-management.config';
import { SettingManagementConfigModule } from '@abp/ng.setting-management.config';

const LOGGERS = [NgxsLoggerPluginModule.forRoot({ disabled: false })];

Expand All @@ -27,10 +27,10 @@ const LOGGERS = [NgxsLoggerPluginModule.forRoot({ disabled: false })];
skipGetAppConfiguration: false,
}),
ThemeSharedModule.forRoot(),
AccountConfigModule.forRoot({ redirectUrl: '/' }),
IdentityConfigModule,
TenantManagementConfigModule,
SettingManagementConfigModule,
AccountConfigModule.forRoot(),
IdentityConfigModule.forRoot(),
TenantManagementConfigModule.forRoot(),
SettingManagementConfigModule.forRoot(),
NgxsModule.forRoot(),
SharedModule,
...(environment.production ? [] : LOGGERS),
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions npm/ng-packs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,12 @@
},
"devDependencies": {
"@abp/ng.account": "~2.9.0",
"@abp/ng.account.config": "~2.9.0",
"@abp/ng.core": "~2.9.0",
"@abp/ng.feature-management": "~2.9.0",
"@abp/ng.identity": "~2.9.0",
"@abp/ng.identity.config": "~2.9.0",
"@abp/ng.permission-management": "~2.9.0",
"@abp/ng.setting-management": "~2.9.0",
"@abp/ng.setting-management.config": "~2.9.0",
"@abp/ng.tenant-management": "~2.9.0",
"@abp/ng.tenant-management.config": "~2.9.0",
"@abp/ng.theme.basic": "~2.9.0",
"@abp/ng.theme.shared": "~2.9.0",
"@abp/utils": "^2.9.0",
Expand Down
3 changes: 0 additions & 3 deletions npm/ng-packs/packages/account-config/README.md

This file was deleted.

6 changes: 0 additions & 6 deletions npm/ng-packs/packages/account-config/jest.config.js

This file was deleted.

7 changes: 0 additions & 7 deletions npm/ng-packs/packages/account-config/ng-package.json

This file was deleted.

12 changes: 0 additions & 12 deletions npm/ng-packs/packages/account-config/package.json

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions npm/ng-packs/packages/account-config/src/public-api.ts

This file was deleted.

Loading