From 9f617b2cd20f71e181762eaba5bed98f6da7472c Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Mon, 5 May 2025 16:13:03 +0300 Subject: [PATCH] refactoring --- .../account/src/lib/account.routes.ts | 15 +++--- .../packages/core/src/lib/components/index.ts | 1 - ...le-route-container-standalone.component.ts | 47 ------------------- .../lib/components/router-outlet.component.ts | 7 --- .../src/lib/feature-management.routes.ts | 0 .../identity/src/lib/identity.routes.ts | 10 ++-- .../src/lib/setting-management.routes.ts | 8 ++-- .../src/lib/tenant-management.routes.ts | 8 ++-- 8 files changed, 20 insertions(+), 76 deletions(-) delete mode 100644 npm/ng-packs/packages/core/src/lib/components/replaceable-route-container-standalone.component.ts delete mode 100644 npm/ng-packs/packages/feature-management/src/lib/feature-management.routes.ts diff --git a/npm/ng-packs/packages/account/src/lib/account.routes.ts b/npm/ng-packs/packages/account/src/lib/account.routes.ts index 2d0f72b75e..7b44aee2e5 100644 --- a/npm/ng-packs/packages/account/src/lib/account.routes.ts +++ b/npm/ng-packs/packages/account/src/lib/account.routes.ts @@ -2,8 +2,7 @@ import { authGuard, ReplaceableComponents, ReplaceableRouteContainerComponent, - ReplaceableRouteContainerStandaloneComponent, - RouterOutletStandaloneComponent, + RouterOutletComponent, } from '@abp/ng.core'; import { ForgotPasswordComponent } from './components/forgot-password/forgot-password.component'; @@ -22,13 +21,13 @@ const canActivate = [authenticationFlowGuard]; export const accountRoutes: Routes = [ { path: '', - component: RouterOutletStandaloneComponent, + component: RouterOutletComponent, providers: [...provideAccount()], children: [ { path: '', pathMatch: 'full', redirectTo: 'login' }, { path: 'login', - component: ReplaceableRouteContainerStandaloneComponent, + component: ReplaceableRouteContainerComponent, canActivate, data: { replaceableComponent: { @@ -40,7 +39,7 @@ export const accountRoutes: Routes = [ }, { path: 'register', - component: ReplaceableRouteContainerStandaloneComponent, + component: ReplaceableRouteContainerComponent, canActivate, data: { replaceableComponent: { @@ -52,7 +51,7 @@ export const accountRoutes: Routes = [ }, { path: 'forgot-password', - component: ReplaceableRouteContainerStandaloneComponent, + component: ReplaceableRouteContainerComponent, canActivate, data: { @@ -65,7 +64,7 @@ export const accountRoutes: Routes = [ }, { path: 'reset-password', - component: ReplaceableRouteContainerStandaloneComponent, + component: ReplaceableRouteContainerComponent, canActivate: [], data: { tenantBoxVisible: false, @@ -78,7 +77,7 @@ export const accountRoutes: Routes = [ }, { path: 'manage', - component: ReplaceableRouteContainerStandaloneComponent, + component: ReplaceableRouteContainerComponent, canActivate: [authGuard], resolve: [accountExtensionsResolver], data: { diff --git a/npm/ng-packs/packages/core/src/lib/components/index.ts b/npm/ng-packs/packages/core/src/lib/components/index.ts index 11aed8ffae..da3c72a69f 100644 --- a/npm/ng-packs/packages/core/src/lib/components/index.ts +++ b/npm/ng-packs/packages/core/src/lib/components/index.ts @@ -1,4 +1,3 @@ export * from './dynamic-layout.component'; export * from './replaceable-route-container.component'; export * from './router-outlet.component'; -export * from './replaceable-route-container-standalone.component'; diff --git a/npm/ng-packs/packages/core/src/lib/components/replaceable-route-container-standalone.component.ts b/npm/ng-packs/packages/core/src/lib/components/replaceable-route-container-standalone.component.ts deleted file mode 100644 index c0502ff542..0000000000 --- a/npm/ng-packs/packages/core/src/lib/components/replaceable-route-container-standalone.component.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { Component, OnInit, Type } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { distinctUntilChanged } from 'rxjs/operators'; -import { ReplaceableComponents } from '../models/replaceable-components'; -import { ReplaceableComponentsService } from '../services/replaceable-components.service'; -import { SubscriptionService } from '../services/subscription.service'; -import { CommonModule } from '@angular/common'; - -@Component({ - selector: 'abp-replaceable-route-container', - template: ` - - `, - imports: [CommonModule], - providers: [SubscriptionService], -}) -export class ReplaceableRouteContainerStandaloneComponent implements OnInit { - defaultComponent!: Type; - - componentKey!: string; - - externalComponent?: Type; - - constructor( - private route: ActivatedRoute, - private replaceableComponents: ReplaceableComponentsService, - private subscription: SubscriptionService, - ) {} - - ngOnInit() { - this.defaultComponent = this.route.snapshot.data.replaceableComponent.defaultComponent; - this.componentKey = ( - this.route.snapshot.data.replaceableComponent as ReplaceableComponents.RouteData - ).key; - - const component$ = this.replaceableComponents - .get$(this.componentKey) - .pipe(distinctUntilChanged()); - - this.subscription.addOne( - component$, - (res = {} as ReplaceableComponents.ReplaceableComponent) => { - this.externalComponent = res.component; - }, - ); - } -} diff --git a/npm/ng-packs/packages/core/src/lib/components/router-outlet.component.ts b/npm/ng-packs/packages/core/src/lib/components/router-outlet.component.ts index 4cb785852c..73af8037c2 100644 --- a/npm/ng-packs/packages/core/src/lib/components/router-outlet.component.ts +++ b/npm/ng-packs/packages/core/src/lib/components/router-outlet.component.ts @@ -7,10 +7,3 @@ import { RouterModule } from '@angular/router'; imports: [RouterModule], }) export class RouterOutletComponent {} - -@Component({ - selector: 'abp-router-outlet', - template: ` `, - imports: [RouterModule], -}) -export class RouterOutletStandaloneComponent {} diff --git a/npm/ng-packs/packages/feature-management/src/lib/feature-management.routes.ts b/npm/ng-packs/packages/feature-management/src/lib/feature-management.routes.ts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/npm/ng-packs/packages/identity/src/lib/identity.routes.ts b/npm/ng-packs/packages/identity/src/lib/identity.routes.ts index 2505a10b8c..b14b9bf09f 100644 --- a/npm/ng-packs/packages/identity/src/lib/identity.routes.ts +++ b/npm/ng-packs/packages/identity/src/lib/identity.routes.ts @@ -3,8 +3,8 @@ import { authGuard, permissionGuard, ReplaceableComponents, - ReplaceableRouteContainerStandaloneComponent, - RouterOutletStandaloneComponent, + ReplaceableRouteContainerComponent, + RouterOutletComponent, } from '@abp/ng.core'; import { RolesComponent, UsersComponent } from './components'; import { identityExtensionsResolver } from './resolvers'; @@ -14,7 +14,7 @@ import { provideIdentity } from './identity'; export const identityRoutes: Routes = [ { path: '', - component: RouterOutletStandaloneComponent, + component: RouterOutletComponent, canActivate: [authGuard, permissionGuard], resolve: [identityExtensionsResolver], providers: provideIdentity({}), @@ -22,7 +22,7 @@ export const identityRoutes: Routes = [ { path: '', redirectTo: 'roles', pathMatch: 'full' }, { path: 'roles', - component: ReplaceableRouteContainerStandaloneComponent, + component: ReplaceableRouteContainerComponent, data: { requiredPolicy: 'AbpIdentity.Roles', replaceableComponent: { @@ -34,7 +34,7 @@ export const identityRoutes: Routes = [ }, { path: 'users', - component: ReplaceableRouteContainerStandaloneComponent, + component: ReplaceableRouteContainerComponent, data: { requiredPolicy: 'AbpIdentity.Users', replaceableComponent: { diff --git a/npm/ng-packs/packages/setting-management/src/lib/setting-management.routes.ts b/npm/ng-packs/packages/setting-management/src/lib/setting-management.routes.ts index 37ef197fa9..944d360030 100644 --- a/npm/ng-packs/packages/setting-management/src/lib/setting-management.routes.ts +++ b/npm/ng-packs/packages/setting-management/src/lib/setting-management.routes.ts @@ -2,8 +2,8 @@ import { Routes } from '@angular/router'; import { authGuard, ReplaceableComponents, - ReplaceableRouteContainerStandaloneComponent, - RouterOutletStandaloneComponent, + ReplaceableRouteContainerComponent, + RouterOutletComponent, } from '@abp/ng.core'; import { SettingManagementComponent } from './components/setting-management.component'; import { eSettingManagementComponents } from './enums/components'; @@ -12,13 +12,13 @@ import { provideSettingManagement } from './setting-management'; export const settingManagementRoutes: Routes = [ { path: '', - component: RouterOutletStandaloneComponent, + component: RouterOutletComponent, canActivate: [authGuard], providers: [...provideSettingManagement()], children: [ { path: '', - component: ReplaceableRouteContainerStandaloneComponent, + component: ReplaceableRouteContainerComponent, data: { requiredPolicy: 'AbpAccount.SettingManagement', replaceableComponent: { diff --git a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.routes.ts b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.routes.ts index 88b5f4cc4a..906b8b31c2 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.routes.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.routes.ts @@ -4,8 +4,8 @@ import { authGuard, permissionGuard, ReplaceableComponents, - ReplaceableRouteContainerStandaloneComponent, - RouterOutletStandaloneComponent, + ReplaceableRouteContainerComponent, + RouterOutletComponent, } from '@abp/ng.core'; import { TenantsComponent } from './components/tenants/tenants.component'; @@ -16,7 +16,7 @@ import { provideTenantManagement } from './tenant-management'; export const tenantManagementRoutes: Routes = [ { path: '', - component: RouterOutletStandaloneComponent, + component: RouterOutletComponent, canActivate: [authGuard, permissionGuard], resolve: [tenantManagementExtensionsResolver], providers: [...provideTenantManagement()], @@ -24,7 +24,7 @@ export const tenantManagementRoutes: Routes = [ { path: '', redirectTo: 'tenants', pathMatch: 'full' }, { path: 'tenants', - component: ReplaceableRouteContainerStandaloneComponent, + component: ReplaceableRouteContainerComponent, data: { requiredPolicy: 'AbpTenantManagement.Tenants', replaceableComponent: {