feat: TT-190create feature toggle in azure

Author: scastillo-jp

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
 <<<<<<< HEAD
           <div *ngIf="isUserGroupsToggleOn">
             <ui-switch
@@ -45,14 +46,17 @@
               (change)="switchGroups(user.id, user.groups, 'admin', 'time-tracker-admin')"
 =======
           <div *ngIf="flakyToggle; else elseBlock">
+=======
+          <div *ngIf="isUserGroupsToggleOn">
+>>>>>>> feat: TT-190create feature toggle in azure
             <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
+            group admin
             <ui-switch
               size="small"
 <<<<<<< HEAD
@@ -67,25 +71,23 @@
               [checked]="user.groups.includes('time-tracker-tester')"
 >>>>>>> fix: TT-190 use add remove groups
             ></ui-switch>
-            test
+            group 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>
 
+          <div *ngIf="!isUserGroupsToggleOn">
+            <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>
         </td>
       </tr>
     </tbody>

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

@@ -54,6 +54,7 @@ export class UsersListComponent implements OnInit, OnDestroy, AfterViewInit {
   dtOptions: any = {};
   switchGroupsSubscription: Subscription;
   isEnableToggleSubscription: Subscription;
+<<<<<<< HEAD
 <<<<<<< HEAD
   isUserGroupsToggleOn: boolean;
 =======
@@ -64,6 +65,9 @@ export class UsersListComponent implements OnInit, OnDestroy, AfterViewInit {
 =======
   flakyToggle = true; // borrar para implementar feature toggle
 >>>>>>> feat: TT-190 Use add/remove groups endpoints in users section in UI
+=======
+  isUserGroupsToggleOn: boolean;
+>>>>>>> feat: TT-190create feature toggle in azure
 
   constructor(
     private store: Store<User>,