From c22c3ef63032d728ea055ac125da2bacea7b30fb Mon Sep 17 00:00:00 2001
From: thediaval <thediavall@gmail.com>
Date: Tue, 5 Nov 2019 10:59:46 +0300
Subject: [PATCH] refactor(identity): remove redundant getById dispatch in
 update actions

---
 .../src/lib/components/roles/roles.component.ts    |  2 +-
 .../src/lib/components/users/users.component.ts    |  1 +
 .../identity/src/lib/states/identity.state.ts      | 14 ++++++--------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts
index aea1e45d5f..41b9313e2e 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts
+++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts
@@ -87,7 +87,7 @@ export class RolesComponent implements OnInit {
     this.store
       .dispatch(
         this.selected.id
-          ? new UpdateRole({ ...this.form.value, id: this.selected.id })
+          ? new UpdateRole({ ...this.selected, ...this.form.value, id: this.selected.id })
           : new CreateRole(this.form.value),
       )
       .subscribe(() => {
diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
index 4574aee2df..cbb7c4c76a 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
+++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
@@ -176,6 +176,7 @@ export class UsersComponent implements OnInit {
       .dispatch(
         this.selected.id
           ? new UpdateUser({
+              ...this.selected,
               ...this.form.value,
               id: this.selected.id,
               roleNames: mappedRoleNames,
diff --git a/npm/ng-packs/packages/identity/src/lib/states/identity.state.ts b/npm/ng-packs/packages/identity/src/lib/states/identity.state.ts
index 2d99f11c98..c12eac8013 100644
--- a/npm/ng-packs/packages/identity/src/lib/states/identity.state.ts
+++ b/npm/ng-packs/packages/identity/src/lib/states/identity.state.ts
@@ -77,10 +77,9 @@ export class IdentityState {
 
   @Action(UpdateRole)
   updateRole({ getState, dispatch }: StateContext<Identity.State>, { payload }: UpdateRole) {
-    return dispatch(new GetRoleById(payload.id)).pipe(
-      switchMap(() => this.identityService.updateRole({ ...getState().selectedRole, ...payload })),
-      switchMap(() => dispatch(new GetRoles())),
-    );
+    return this.identityService
+      .updateRole({ ...getState().selectedRole, ...payload })
+      .pipe(switchMap(() => dispatch(new GetRoles())));
   }
 
   @Action(GetUsers)
@@ -117,10 +116,9 @@ export class IdentityState {
 
   @Action(UpdateUser)
   updateUser({ getState, dispatch }: StateContext<Identity.State>, { payload }: UpdateUser) {
-    return dispatch(new GetUserById(payload.id)).pipe(
-      switchMap(() => this.identityService.updateUser({ ...getState().selectedUser, ...payload })),
-      switchMap(() => dispatch(new GetUsers())),
-    );
+    return this.identityService
+      .updateUser({ ...getState().selectedUser, ...payload })
+      .pipe(switchMap(() => dispatch(new GetUsers())));
   }
 
   @Action(GetUserRoles)