Skip to content

Commit 5cae37f

Browse files
wobravoLEON12699
authored andcommitted
fix: TT-190 use add remove groups
1 parent c3a1047 commit 5cae37f

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<div *ngIf="isUserGroupsToggleOn">
2323
<ui-switch
2424
size="small"
25+
<<<<<<< HEAD
2526
(change)="switchGroup(user.id, user.groups, 'time-tracker-admin')"
2627
[checked]="user.groups.includes('time-tracker-admin')"
2728
></ui-switch>
@@ -39,12 +40,21 @@
3940
size="small"
4041
(change)="switchRole(user.id, user.roles, 'admin','time-tracker-admin')"
4142
[checked]="user.roles.includes('time-tracker-admin')"
43+
=======
44+
(change)="switchGroups(user.id, user.groups, 'admin', 'time-tracker-admin')"
45+
[checked]="user.groups.includes('time-tracker-admin')"
46+
>>>>>>> fix: TT-190 use add remove groups
4247
></ui-switch>
4348
admin
4449
<ui-switch
4550
size="small"
51+
<<<<<<< HEAD
4652
(change)="switchRole(user.id, user.roles,'tester','time-tracker-tester')"
4753
[checked]="user.roles.includes('time-tracker-tester')"
54+
=======
55+
(change)="switchGroups(user.id, user.groups, 'test', 'time-tracker-tester')"
56+
[checked]="user.groups.includes('time-tracker-tester')"
57+
>>>>>>> fix: TT-190 use add remove groups
4858
></ui-switch>
4959
test
5060
</div>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
22
import { ActionsSubject, select, Store } from '@ngrx/store';
33
import { DataTableDirective } from 'angular-datatables';
4+
<<<<<<< HEAD
45
import { Observable, Subject, Subscription } from 'rxjs';
56
import { delay, filter, map } from 'rxjs/operators';
67
import { FeatureManagerService } from 'src/app/modules/shared/feature-toggles/feature-toggle-manager.service';
@@ -13,6 +14,13 @@ import {
1314
AddUserToGroup,
1415
RemoveUserFromGroup,
1516
} from '../../store/user.actions';
17+
=======
18+
import { Observable, Subject, Subscription} from 'rxjs';
19+
import { delay, filter, map } from 'rxjs/operators';
20+
import { FeatureManagerService } from 'src/app/modules/shared/feature-toggles/feature-toggle-manager.service';
21+
import { User } from '../../models/users';
22+
import { GrantRoleUser, LoadUsers, RevokeRoleUser, UserActionTypes, AddUserToGroup, RemoveUserToGroup} from '../../store/user.actions';
23+
>>>>>>> fix: TT-190 use add remove groups
1624
import { getIsLoading } from '../../store/user.selectors';
1725

1826
@Component({
@@ -120,4 +128,10 @@ export class UsersListComponent implements OnInit, OnDestroy, AfterViewInit {
120128
})
121129
);
122130
}
131+
132+
switchGroups(userId: string, userGroups: string[], groupname: string, groupValue: string) {
133+
userGroups.includes(groupValue)
134+
? this.store.dispatch(new RemoveUserFromGroup(userId, groupname))
135+
: this.store.dispatch(new AddUserToGroup(userId, groupname));
136+
}
123137
}

0 commit comments

Comments
 (0)