Browse Source

refactoring

pull/22848/head
erdemcaygor 1 year ago
parent
commit
b00fe6c618
  1. 4
      npm/ng-packs/packages/identity/src/lib/identity.module.ts
  2. 6
      npm/ng-packs/packages/identity/src/lib/identity.routes.ts
  3. 3
      npm/ng-packs/packages/identity/src/lib/identity.ts
  4. 1
      npm/ng-packs/packages/identity/src/public-api.ts
  5. 8
      npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
  6. 6
      npm/ng-packs/packages/permission-management/src/lib/permission-management.module.ts

4
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<IdentityModule> {

6
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' },
{

3
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,

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

8
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

6
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 {}

Loading…
Cancel
Save