Merge pull request #2085 from abpframework/refactor/update-actions

refactor(identity): remove redundant getById dispatch in update actions

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(() => {

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,

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(
+    return this.identityService
-      switchMap(() => this.identityService.updateRole({ ...getState().selectedRole, ...payload })),
+      .updateRole({ ...getState().selectedRole, ...payload })
-      switchMap(() => dispatch(new GetRoles())),
+      .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(
+    return this.identityService
-      switchMap(() => this.identityService.updateUser({ ...getState().selectedUser, ...payload })),
+      .updateUser({ ...getState().selectedUser, ...payload })
-      switchMap(() => dispatch(new GetUsers())),
+      .pipe(switchMap(() => dispatch(new GetUsers())));
-    );
   }
 
   @Action(GetUserRoles)