refactoring

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: {

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';

npm/ng-packs/packages/core/src/lib/components/replaceable-route-container-standalone.component.ts

@@ -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: `
-    <ng-container *ngComponentOutlet="externalComponent || defaultComponent"></ng-container>
-  `,
-  imports: [CommonModule],
-  providers: [SubscriptionService],
-})
-export class ReplaceableRouteContainerStandaloneComponent implements OnInit {
-  defaultComponent!: Type<any>;
-
-  componentKey!: string;
-
-  externalComponent?: Type<any>;
-
-  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;
-      },
-    );
-  }
-}

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: ` <router-outlet></router-outlet> `,
-  imports: [RouterModule],
-})
-export class RouterOutletStandaloneComponent {}

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: {

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: {

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: {