From 4300a80e3cc6a4f1f755cf57c0289c72f354b300 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 4 Jun 2021 10:44:55 +0800 Subject: [PATCH 1/5] Update Dependency-Injection.md Resolve #9232 Related: https://github.com/abpframework/abp/issues/364 https://github.com/abpframework/abp/commit/4c04931b63667497e536d965e49f890c91fd4c8f --- docs/en/Dependency-Injection.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/en/Dependency-Injection.md b/docs/en/Dependency-Injection.md index f94901ad84..ee739a0880 100644 --- a/docs/en/Dependency-Injection.md +++ b/docs/en/Dependency-Injection.md @@ -59,8 +59,7 @@ Some specific types are registered to dependency injection by default. Examples: * MVC controllers (inherit ``Controller`` or ``AbpController``) are registered as transient. * MVC page models (inherit ``PageModel`` or ``AbpPageModel``) are registered as transient. * MVC view components (inherit ``ViewComponent`` or ``AbpViewComponent``) are registered as transient. -* Application services (implement ``IApplicationService`` interface or inherit ``ApplicationService`` class) are registered as transient. -* Repositories (implement ``IRepository`` interface) are registered as transient. +* Application services (inherit ``ApplicationService`` class) are registered as transient. * Domain services (implement ``IDomainService`` interface) are registered as transient. Example: From 1597ba44291b6417eb038fe239a0ab05284fe74b Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 4 Jun 2021 10:47:12 +0800 Subject: [PATCH 2/5] Update Dependency-Injection.md --- docs/en/Dependency-Injection.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/en/Dependency-Injection.md b/docs/en/Dependency-Injection.md index ee739a0880..35bb19f5cc 100644 --- a/docs/en/Dependency-Injection.md +++ b/docs/en/Dependency-Injection.md @@ -60,6 +60,7 @@ Some specific types are registered to dependency injection by default. Examples: * MVC page models (inherit ``PageModel`` or ``AbpPageModel``) are registered as transient. * MVC view components (inherit ``ViewComponent`` or ``AbpViewComponent``) are registered as transient. * Application services (inherit ``ApplicationService`` class) are registered as transient. +* Repositories (implement ``BasicRepositoryBase`` class or its subclasses) are registered as transient. * Domain services (implement ``IDomainService`` interface) are registered as transient. Example: From f13340a1c6ada8464c8615fb93eec783902d1c7b Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 4 Jun 2021 10:48:03 +0800 Subject: [PATCH 3/5] Update Dependency-Injection.md --- docs/en/Dependency-Injection.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/Dependency-Injection.md b/docs/en/Dependency-Injection.md index 35bb19f5cc..e5ad10aa93 100644 --- a/docs/en/Dependency-Injection.md +++ b/docs/en/Dependency-Injection.md @@ -59,7 +59,7 @@ Some specific types are registered to dependency injection by default. Examples: * MVC controllers (inherit ``Controller`` or ``AbpController``) are registered as transient. * MVC page models (inherit ``PageModel`` or ``AbpPageModel``) are registered as transient. * MVC view components (inherit ``ViewComponent`` or ``AbpViewComponent``) are registered as transient. -* Application services (inherit ``ApplicationService`` class) are registered as transient. +* Application services (inherit ``ApplicationService`` class or its subclasses) are registered as transient. * Repositories (implement ``BasicRepositoryBase`` class or its subclasses) are registered as transient. * Domain services (implement ``IDomainService`` interface) are registered as transient. From 713953a2a85a10c21696a232184336817afbf320 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 4 Jun 2021 13:40:07 +0800 Subject: [PATCH 4/5] Update Dependency-Injection.md --- docs/en/Dependency-Injection.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/Dependency-Injection.md b/docs/en/Dependency-Injection.md index e5ad10aa93..f4398488e5 100644 --- a/docs/en/Dependency-Injection.md +++ b/docs/en/Dependency-Injection.md @@ -61,7 +61,7 @@ Some specific types are registered to dependency injection by default. Examples: * MVC view components (inherit ``ViewComponent`` or ``AbpViewComponent``) are registered as transient. * Application services (inherit ``ApplicationService`` class or its subclasses) are registered as transient. * Repositories (implement ``BasicRepositoryBase`` class or its subclasses) are registered as transient. -* Domain services (implement ``IDomainService`` interface) are registered as transient. +* Domain services (implement ``IDomainService`` interface or inherit ``DomainService`` class) are registered as transient. Example: From 7c4d4bae65a70789fa11746e3552b0ceaac12769 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 11 Jun 2021 09:39:34 +0300 Subject: [PATCH 5/5] hide routes which have not path #9289 --- npm/ng-packs/apps/dev-app/src/app/app.module.ts | 2 +- .../apps/dev-app/src/app/route.provider.ts | 2 +- .../account/config/src/providers/route.provider.ts | 2 +- .../core/src/lib/services/routes.service.ts | 3 ++- .../config/src/providers/route.provider.ts | 2 +- .../config/src/providers/route.provider.ts | 2 +- .../lib/components/routes/routes.component.html | 14 ++++++++------ 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/npm/ng-packs/apps/dev-app/src/app/app.module.ts b/npm/ng-packs/apps/dev-app/src/app/app.module.ts index dd3a9636db..94ebbb5cc0 100644 --- a/npm/ng-packs/apps/dev-app/src/app/app.module.ts +++ b/npm/ng-packs/apps/dev-app/src/app/app.module.ts @@ -1,3 +1,4 @@ +import { AccountConfigModule } from '@abp/ng.account/config'; import { CoreModule } from '@abp/ng.core'; import { registerLocale } from '@abp/ng.core/locale'; import { IdentityConfigModule } from '@abp/ng.identity/config'; @@ -11,7 +12,6 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { InspectorModule } from '@ngneat/inspector'; import { NgxsLoggerPluginModule } from '@ngxs/logger-plugin'; import { NgxsModule } from '@ngxs/store'; -import { AccountConfigModule } from '@abp/ng.account/config'; import { environment } from '../environments/environment'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; diff --git a/npm/ng-packs/apps/dev-app/src/app/route.provider.ts b/npm/ng-packs/apps/dev-app/src/app/route.provider.ts index 73865dfd0a..a03945ada0 100644 --- a/npm/ng-packs/apps/dev-app/src/app/route.provider.ts +++ b/npm/ng-packs/apps/dev-app/src/app/route.provider.ts @@ -1,4 +1,4 @@ -import { RoutesService, eLayoutType } from '@abp/ng.core'; +import { eLayoutType, RoutesService } from '@abp/ng.core'; import { APP_INITIALIZER } from '@angular/core'; export const APP_ROUTE_PROVIDER = [ diff --git a/npm/ng-packs/packages/account/config/src/providers/route.provider.ts b/npm/ng-packs/packages/account/config/src/providers/route.provider.ts index c230d21ad8..9cc8f6fe82 100644 --- a/npm/ng-packs/packages/account/config/src/providers/route.provider.ts +++ b/npm/ng-packs/packages/account/config/src/providers/route.provider.ts @@ -10,7 +10,7 @@ export function configureRoutes(routes: RoutesService) { return () => { routes.add([ { - path: '/account', + path: undefined, name: eAccountRouteNames.Account, invisible: true, layout: eLayoutType.application, diff --git a/npm/ng-packs/packages/core/src/lib/services/routes.service.ts b/npm/ng-packs/packages/core/src/lib/services/routes.service.ts index c4a35c27c1..02c88b4901 100644 --- a/npm/ng-packs/packages/core/src/lib/services/routes.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/routes.service.ts @@ -135,7 +135,8 @@ export abstract class AbstractTreeService { @Injectable() export abstract class AbstractNavTreeService extends AbstractTreeService - implements OnDestroy { + implements OnDestroy +{ private subscription: Subscription; private permissionService: PermissionService; readonly id = 'name'; 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 f5c2bc2327..26326138e6 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 @@ -12,7 +12,7 @@ export function configureRoutes(routesService: RoutesService) { return () => { routesService.add([ { - path: '/identity', + path: undefined, name: eIdentityRouteNames.IdentityManagement, parentName: eThemeSharedRouteNames.Administration, requiredPolicy: eIdentityPolicyNames.IdentityManagement, 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 b191b46ce3..5b3d9c88fd 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 @@ -12,7 +12,7 @@ export function configureRoutes(routes: RoutesService) { return () => { routes.add([ { - path: '/tenant-management', + path: undefined, name: eTenantManagementRouteNames.TenantManagement, parentName: eThemeSharedRouteNames.Administration, requiredPolicy: eTenantManagementPolicyNames.TenantManagement, diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html index 0e2f67156c..aae02df783 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html @@ -62,12 +62,14 @@ -
- - - {{ child.name | abpLocalization }} -
+ +
+ + + {{ child.name | abpLocalization }} +
+