diff --git a/npm/ng-packs/packages/identity/src/lib/identity.module.ts b/npm/ng-packs/packages/identity/src/lib/identity.module.ts index f834456e85..b8b6221404 100644 --- a/npm/ng-packs/packages/identity/src/lib/identity.module.ts +++ b/npm/ng-packs/packages/identity/src/lib/identity.module.ts @@ -9,11 +9,13 @@ import { IDENTITY_ENTITY_PROP_CONTRIBUTORS, IDENTITY_TOOLBAR_ACTION_CONTRIBUTORS, } from './tokens/extensions.token'; +import { IdentityRoutingModule } from './identity-routing.module'; +import { RolesComponent, UsersComponent } from './components'; @NgModule({ declarations: [], exports: [], - imports: [], + imports: [IdentityRoutingModule, RolesComponent, UsersComponent], }) export class IdentityModule { static forChild(options: IdentityConfigOptions = {}): ModuleWithProviders { 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 9c66ec66e0..2505a10b8c 100644 --- a/npm/ng-packs/packages/identity/src/lib/identity.routes.ts +++ b/npm/ng-packs/packages/identity/src/lib/identity.routes.ts @@ -3,15 +3,13 @@ import { authGuard, permissionGuard, ReplaceableComponents, - ReplaceableRouteContainerComponent, ReplaceableRouteContainerStandaloneComponent, - RouterOutletComponent, RouterOutletStandaloneComponent, } from '@abp/ng.core'; import { RolesComponent, UsersComponent } from './components'; import { identityExtensionsResolver } from './resolvers'; -import { provideIdentity } from './identity'; import { eIdentityComponents } from './enums'; +import { provideIdentity } from './identity'; export const identityRoutes: Routes = [ { @@ -19,7 +17,7 @@ export const identityRoutes: Routes = [ component: RouterOutletStandaloneComponent, canActivate: [authGuard, permissionGuard], resolve: [identityExtensionsResolver], - providers: [...provideIdentity()], + providers: provideIdentity({}), children: [ { path: '', redirectTo: 'roles', pathMatch: 'full' }, { diff --git a/npm/ng-packs/packages/identity/src/lib/identity.ts b/npm/ng-packs/packages/identity/src/lib/identity.ts index e16d9c9316..ebee1c063a 100644 --- a/npm/ng-packs/packages/identity/src/lib/identity.ts +++ b/npm/ng-packs/packages/identity/src/lib/identity.ts @@ -6,8 +6,9 @@ import { IDENTITY_TOOLBAR_ACTION_CONTRIBUTORS, } from './tokens'; import { IdentityConfigOptions } from './models'; +import { Provider } from '@angular/core'; -export function provideIdentity(options: IdentityConfigOptions = {}) { +export function provideIdentity(options: IdentityConfigOptions = {}): Provider[] { return [ { provide: IDENTITY_ENTITY_ACTION_CONTRIBUTORS, diff --git a/npm/ng-packs/packages/identity/src/public-api.ts b/npm/ng-packs/packages/identity/src/public-api.ts index 74cd5cce35..511f1bac6b 100644 --- a/npm/ng-packs/packages/identity/src/public-api.ts +++ b/npm/ng-packs/packages/identity/src/public-api.ts @@ -6,3 +6,4 @@ export * from './lib/models'; export * from './lib/tokens'; export * from './lib/resolvers'; export * from './lib/identity.routes'; +export * from './lib/identity'; diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts index c68c9afc85..4c6efbdfbf 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts @@ -1,5 +1,5 @@ -import { ConfigStateService, CurrentUserDto } from '@abp/ng.core'; -import { LocaleDirection, ToasterService } from '@abp/ng.theme.shared'; +import { ConfigStateService, CoreModule, CurrentUserDto } from '@abp/ng.core'; +import { LocaleDirection, ThemeSharedModule, ToasterService } from '@abp/ng.theme.shared'; import { GetPermissionListResultDto, PermissionGrantInfoDto, @@ -24,6 +24,8 @@ import { import { concat, of } from 'rxjs'; import { finalize, switchMap, take, tap } from 'rxjs/operators'; import { PermissionManagement } from '../models/permission-management'; +import { CommonModule } from '@angular/common'; +import { PageModule } from '@abp/ng.components/page'; type PermissionWithStyle = PermissionGrantInfoDto & { style: string; @@ -34,7 +36,6 @@ type PermissionWithGroupName = PermissionGrantInfoDto & { }; @Component({ - standalone: false, selector: 'abp-permission-management', templateUrl: './permission-management.component.html', exportAs: 'abpPermissionManagement', @@ -85,6 +86,7 @@ type PermissionWithGroupName = PermissionGrantInfoDto & { } `, ], + imports: [CommonModule, CoreModule, ThemeSharedModule], }) export class PermissionManagementComponent implements diff --git a/npm/ng-packs/packages/permission-management/src/lib/permission-management.module.ts b/npm/ng-packs/packages/permission-management/src/lib/permission-management.module.ts index b187994cf0..500d7770f3 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/permission-management.module.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/permission-management.module.ts @@ -1,11 +1,11 @@ import { CoreModule } from '@abp/ng.core'; import { ThemeSharedModule } from '@abp/ng.theme.shared'; import { NgModule } from '@angular/core'; -import { PermissionManagementComponent } from './components/permission-management.component'; +import { PermissionManagementComponent } from './components'; @NgModule({ - declarations: [PermissionManagementComponent], - imports: [CoreModule, ThemeSharedModule], + declarations: [], + imports: [CoreModule, ThemeSharedModule, PermissionManagementComponent], exports: [PermissionManagementComponent], }) export class PermissionManagementModule {}