refactor: TT-310 Improve role implementation

src/app/modules/users/components/users-list/users-list.component.html

@@ -14,7 +14,8 @@
         <td class="col-4 text-break">{{ user.email }}</td>
         <td class="col-5 text-break">{{ user.name }}</td>
         <td class="col-3 text-center">
-          <ui-switch size="small" (change)="switchGroup('time-tracker-admin', user); updateRole(ROLES.admin, user);"
+          <ui-switch size="small"
+            (change)="switchGroup('time-tracker-admin', user); updateRole(ROLES.admin, user, $event);"
             [checked]="user.groups.includes('time-tracker-admin')"></ui-switch>
           admin
           <ui-switch size="small" (change)="switchGroup('time-tracker-tester', user)"
@@ -24,4 +25,4 @@
       </tr>
     </tbody>
   </table>
-</div>
+</div>

src/app/modules/users/components/users-list/users-list.component.spec.ts

@@ -168,7 +168,7 @@ describe('UsersListComponent', () => {
     expect(component.dtElement.dtInstance.then).toHaveBeenCalled();
   });
 
-  it('When the user does not have the role, this role must be added', () => {
+  it('When the toggle is enabled, the role must be added to the user ', () => {
     const availableRoles = [
       {
         name: 'admin',
@@ -190,12 +190,13 @@ describe('UsersListComponent', () => {
     };
 
     availableRoles.forEach((role) => {
-      component.updateRole(role, user);
+      const isToggleEnabled = true;
+      component.updateRole(role, user, isToggleEnabled);
       expect(store.dispatch).toHaveBeenCalledWith(new GrantUserRole(user.id, role.name));
     });
   });
 
-  it('When the user has the role, this role must be removed', () => {
+  it('When the toggle is disabled, the role must be removed from the user', () => {
     const availableRoles = [
       {
         name: 'admin',
@@ -217,7 +218,8 @@ describe('UsersListComponent', () => {
     };
 
     availableRoles.forEach((role) => {
-      component.updateRole(role, user);
+      const isToggleEnabled = false;
+      component.updateRole(role, user, isToggleEnabled);
       expect(store.dispatch).toHaveBeenCalledWith(new RevokeUserRole(user.id, role.name));
     });
   });

src/app/modules/users/components/users-list/users-list.component.ts

@@ -75,10 +75,8 @@ export class UsersListComponent implements OnInit, OnDestroy, AfterViewInit {
     );
   }
 
-  updateRole(role: { name: string; value: string }, user: User) {
-    const userHasRole = user.roles.includes(role.value);
-    const action = userHasRole ? new RevokeUserRole(user.id, role.name) : new GrantUserRole(user.id, role.name);
-
+  updateRole(role: { name: string; value: string }, user: User, isToggleEnabled: boolean) {
+    const action = isToggleEnabled ? new GrantUserRole(user.id, role.name) : new RevokeUserRole(user.id, role.name);
     this.store.dispatch(action);
   }