feat: TT-190 Use add/remove groups endpoints in users section in UI

Author: LEON12699

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

@@ -19,6 +19,7 @@
         <td class="col-4 text-break">{{ user.email }}</td>
         <td class="col-5 text-break">{{ user.name }}</td>
         <td class="col-3 text-center">
+<<<<<<< HEAD
           <div *ngIf="isUserGroupsToggleOn">
             <ui-switch
               size="small"
@@ -42,22 +43,49 @@
               [checked]="user.roles.includes('time-tracker-admin')"
 =======
               (change)="switchGroups(user.id, user.groups, 'admin', 'time-tracker-admin')"
+=======
+          <div *ngIf="flakyToggle; else elseBlock">
+            <ui-switch
+              size="small"
+              (change)="switchGroup(user.id, user.groups, 'time-tracker-admin')"
+>>>>>>> feat: TT-190 Use add/remove groups endpoints in users section in UI
               [checked]="user.groups.includes('time-tracker-admin')"
 >>>>>>> fix: TT-190 use add remove groups
             ></ui-switch>
             admin
             <ui-switch
               size="small"
+<<<<<<< HEAD
 <<<<<<< HEAD
               (change)="switchRole(user.id, user.roles,'tester','time-tracker-tester')"
               [checked]="user.roles.includes('time-tracker-tester')"
 =======
               (change)="switchGroups(user.id, user.groups, 'test', 'time-tracker-tester')"
+=======
+              (change)="switchGroup(user.id, user.groups, 'time-tracker-tester')"
+>>>>>>> feat: TT-190 Use add/remove groups endpoints in users section in UI
               [checked]="user.groups.includes('time-tracker-tester')"
 >>>>>>> fix: TT-190 use add remove groups
             ></ui-switch>
             test
           </div>
+          <ng-template #elseBlock>
+            <div>
+              <ui-switch
+                size="small"
+                (change)="switchRole(user.id, user.roles, 'admin','time-tracker-admin')"
+                [checked]="user.roles.includes('time-tracker-admin')"
+              ></ui-switch>
+              admin
+              <ui-switch
+                size="small"
+                (change)="switchRole(user.id, user.roles,'tester','time-tracker-tester')"
+                [checked]="user.roles.includes('time-tracker-tester')"
+              ></ui-switch>
+              test
+            </div>
+          </ng-template>
+
         </td>
       </tr>
     </tbody>

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

@@ -2,6 +2,7 @@ import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular
 import { ActionsSubject, select, Store } from '@ngrx/store';
 import { DataTableDirective } from 'angular-datatables';
 <<<<<<< HEAD
+<<<<<<< HEAD
 import { Observable, Subject, Subscription } from 'rxjs';
 import { delay, filter, map } from 'rxjs/operators';
 import { FeatureManagerService } from 'src/app/modules/shared/feature-toggles/feature-toggle-manager.service';
@@ -21,6 +22,20 @@ import { FeatureManagerService } from 'src/app/modules/shared/feature-toggles/fe
 import { User } from '../../models/users';
 import { GrantRoleUser, LoadUsers, RevokeRoleUser, UserActionTypes, AddUserToGroup, RemoveUserToGroup} from '../../store/user.actions';
 >>>>>>> fix: TT-190 use add remove groups
+=======
+import { Observable, Subject, Subscription } from 'rxjs';
+import { delay, filter, map } from 'rxjs/operators';
+import { FeatureManagerService } from 'src/app/modules/shared/feature-toggles/feature-toggle-manager.service';
+import { User } from '../../models/users';
+import {
+  GrantRoleUser,
+  LoadUsers,
+  RevokeRoleUser,
+  UserActionTypes,
+  AddUserToGroup,
+  RemoveUserToGroup,
+} from '../../store/user.actions';
+>>>>>>> feat: TT-190 Use add/remove groups endpoints in users section in UI
 import { getIsLoading } from '../../store/user.selectors';
 
 @Component({
@@ -39,12 +54,17 @@ export class UsersListComponent implements OnInit, OnDestroy, AfterViewInit {
   dtOptions: any = {};
   switchGroupsSubscription: Subscription;
   isEnableToggleSubscription: Subscription;
+<<<<<<< HEAD
   isUserGroupsToggleOn: boolean;
+=======
+  isUserGroupsToggleOn;
+  flakyToggle: boolean = false; // borrar para implementar feature toggle
+>>>>>>> feat: TT-190 Use add/remove groups endpoints in users section in UI
 
   constructor(
     private store: Store<User>,
     private actionsSubject$: ActionsSubject,
-    private featureManagerService: FeatureManagerService
+    //private featureManagerService: FeatureManagerService
   ) {
     this.isLoading$ = store.pipe(delay(0), select(getIsLoading));
   }
@@ -58,9 +78,16 @@ export class UsersListComponent implements OnInit, OnDestroy, AfterViewInit {
         this.rerenderDataTable();
       });
 
+<<<<<<< HEAD
     this.isEnableToggleSubscription = this.isFeatureToggleActivated().subscribe((flag) => {
       this.isUserGroupsToggleOn = flag;
     });
+=======
+  /*  this.isEnableToggleSubscription = this.isFeatureToggleActivated().subscribe((flag) => {
+      this.isUserGroupsToggleOn = flag;
+      console.log('in subscription', this.isUserGroupsToggleOn);
+    });*/
+>>>>>>> feat: TT-190 Use add/remove groups endpoints in users section in UI
 
     this.switchGroupsSubscription = this.actionsSubject$
       .pipe(
@@ -121,17 +148,32 @@ export class UsersListComponent implements OnInit, OnDestroy, AfterViewInit {
       : this.store.dispatch(new AddUserToGroup(userId, groupName));
   }
 
+<<<<<<< HEAD
   isFeatureToggleActivated() {
     return this.featureManagerService.isToggleEnabledForUser('switch-group').pipe(
+=======
+  switchGroup(userId: string, userGroups: string[], groupName: string) {
+    userGroups.includes(groupName)
+      ? this.store.dispatch(new RemoveUserToGroup(userId, groupName))
+      : this.store.dispatch(new AddUserToGroup(userId, groupName));
+  }
+
+ /* isFeatureToggleActivated() {
+    return this.featureManagerService.isToggleEnabledForUser('ui-list-technologies').pipe(
+>>>>>>> feat: TT-190 Use add/remove groups endpoints in users section in UI
       map((enabled) => {
         return enabled === true ? true : false;
       })
     );
+<<<<<<< HEAD
   }
 
   switchGroups(userId: string, userGroups: string[], groupname: string, groupValue: string) {
     userGroups.includes(groupValue)
       ? this.store.dispatch(new RemoveUserFromGroup(userId, groupname))
       : this.store.dispatch(new AddUserToGroup(userId, groupname));
   }
+=======
+  }*/
+>>>>>>> feat: TT-190 Use add/remove groups endpoints in users section in UI
 }