From 19fc0b6c1f3ba3cff15cfc6552c6a4351d43e815 Mon Sep 17 00:00:00 2001 From: TheDiaval Date: Fri, 9 Aug 2019 15:04:52 +0300 Subject: [PATCH] refactor(permission-management): rename actions --- .../lib/actions/permission-management.actions.ts | 4 ++-- .../permission-management.component.ts | 11 +++-------- .../lib/states/permission-management.state.ts | 16 +++++----------- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/npm/ng-packs/packages/permission-management/src/lib/actions/permission-management.actions.ts b/npm/ng-packs/packages/permission-management/src/lib/actions/permission-management.actions.ts index 139f4d50eb..c242d614dd 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/actions/permission-management.actions.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/actions/permission-management.actions.ts @@ -1,11 +1,11 @@ import { PermissionManagement } from '../models/permission-management'; -export class PermissionManagementGetPermissions { +export class GetPermissions { static readonly type = '[PermissionManagement] Get Permissions'; constructor(public payload: PermissionManagement.GrantedProvider) {} } -export class PermissionManagementUpdatePermissions { +export class UpdatePermissions { static readonly type = '[PermissionManagement] Update Permissions'; constructor(public payload: PermissionManagement.GrantedProvider & PermissionManagement.UpdateRequest) {} } 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 a6e4ace105..9cba172a5d 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 @@ -12,10 +12,7 @@ import { import { Select, Store } from '@ngxs/store'; import { from, Observable } from 'rxjs'; import { map, pluck, take } from 'rxjs/operators'; -import { - PermissionManagementGetPermissions, - PermissionManagementUpdatePermissions, -} from '../actions/permission-management.actions'; +import { GetPermissions, UpdatePermissions } from '../actions/permission-management.actions'; import { PermissionManagement } from '../models/permission-management'; import { PermissionManagementState } from '../states/permission-management.state'; @@ -189,7 +186,7 @@ export class PermissionManagementComponent implements OnInit, OnChanges { if (changedPermissions.length) { this.store .dispatch( - new PermissionManagementUpdatePermissions({ + new UpdatePermissions({ providerKey: this.providerKey, providerName: this.providerName, permissions: changedPermissions, @@ -209,9 +206,7 @@ export class PermissionManagementComponent implements OnInit, OnChanges { } this.store - .dispatch( - new PermissionManagementGetPermissions({ providerKey: this.providerKey, providerName: this.providerName }), - ) + .dispatch(new GetPermissions({ providerKey: this.providerKey, providerName: this.providerName })) .pipe(pluck('PermissionManagementState', 'permissionRes')) .subscribe((permissionRes: PermissionManagement.Response) => { this.selectedGroup = permissionRes.groups[0]; diff --git a/npm/ng-packs/packages/permission-management/src/lib/states/permission-management.state.ts b/npm/ng-packs/packages/permission-management/src/lib/states/permission-management.state.ts index 842795ca16..2da786b063 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/states/permission-management.state.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/states/permission-management.state.ts @@ -1,8 +1,5 @@ import { State, Action, StateContext, Selector } from '@ngxs/store'; -import { - PermissionManagementGetPermissions, - PermissionManagementUpdatePermissions, -} from '../actions/permission-management.actions'; +import { GetPermissions, UpdatePermissions } from '../actions/permission-management.actions'; import { PermissionManagement } from '../models/permission-management'; import { PermissionManagementService } from '../services/permission-management.service'; import { tap } from 'rxjs/operators'; @@ -24,11 +21,8 @@ export class PermissionManagementState { constructor(private permissionManagementService: PermissionManagementService) {} - @Action(PermissionManagementGetPermissions) - permissionManagementGet( - { patchState }: StateContext, - { payload }: PermissionManagementGetPermissions, - ) { + @Action(GetPermissions) + permissionManagementGet({ patchState }: StateContext, { payload }: GetPermissions) { return this.permissionManagementService.getPermissions(payload).pipe( tap(permissionResponse => patchState({ @@ -38,8 +32,8 @@ export class PermissionManagementState { ); } - @Action(PermissionManagementUpdatePermissions) - permissionManagementUpdate(_, { payload }: PermissionManagementUpdatePermissions) { + @Action(UpdatePermissions) + permissionManagementUpdate(_, { payload }: UpdatePermissions) { return this.permissionManagementService.updatePermissions(payload); } }