Skip to content

fix: TT-310 Reports do not work with groups fixed #720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 17, 2021
Merged

fix: TT-310 Reports do not work with groups fixed #720

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
84fe2c0
fix: TT-310 Reports does not work with groups fixed
jcalarcon98 Aug 12, 2021
38d0201
code-smell: TT-310 Fixed code smells indicated by sonarCloud
jcalarcon98 Aug 12, 2021
c085ab1
refactor: TT-310 Improve role implementation
jcalarcon98 Aug 15, 2021
e6b3504
fix: TT-310 Testing implementation fixed
jcalarcon98 Aug 15, 2021
ef52527
test: TT-310 Add missing tests
jcalarcon98 Aug 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
test: TT-310 Add missing tests
  • Loading branch information
@jcalarcon98
jcalarcon98 committed Aug 17, 2021
commit ef52527783b5f698b72cc2783cff35038bb9b7ee
13 changes: 10 additions & 3 deletions src/app/modules/users/components/users-list/users-list.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<div class="table-responsive">
<table *ngIf="users" class="table table-sm table-bordered table-striped mb-0" datatable [dtTrigger]="dtTrigger"
<table
*ngIf="users"
class="table table-sm table-bordered table-striped mb-0"
datatable
[dtTrigger]="dtTrigger"
[dtOptions]="dtOptions">
<thead class="thead-blue">
<tr class="d-flex flex-wrap">
Expand All @@ -14,11 +18,14 @@
<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"
<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)"
<ui-switch
size="small"
(change)="switchGroup('time-tracker-tester', user)"
[checked]="user.groups.includes('time-tracker-tester')"></ui-switch>
test
</td>
Expand Down
5 changes: 5 additions & 0 deletions src/app/modules/users/components/users-list/users-list.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { UserActionTypes, UserState, LoadUsers, AddUserToGroup, RemoveUserFromGr
import { ActionsSubject } from '@ngrx/store';
import { DataTablesModule } from 'angular-datatables';
import { GrantUserRole, RevokeUserRole } from '../../store/user.actions';
import { ROLES } from '../../../../../environments/environment';

describe('UsersListComponent', () => {
let component: UsersListComponent;
Expand Down Expand Up @@ -224,6 +225,10 @@ describe('UsersListComponent', () => {
});
});

it('When we call ROLES variable should return available roles', () => {
expect(component.ROLES).toEqual(ROLES);
});

afterEach(() => {
component.dtTrigger.unsubscribe();
component.loadUsersSubscription.unsubscribe();
Expand Down