fix: #569 create user options

* feat: #569 create users and users-list components

* feat: #569 create a user store and consume the service of users

* feat: #569 add test for user effects and selectors

* fix: #569 fix PR comments

* fix: #569 fix PR comments by Rene

* fix: #569 remove column switch to admin

* fix: #569 remove container from table

Author: PaulRC-ioet

src/app/app-routing.module.ts

@@ -10,6 +10,7 @@ import { ActivitiesManagementComponent } from './modules/activities-management/p
 import { HomeComponent } from './modules/home/home.component';
 import { LoginComponent } from './modules/login/login.component';
 import { CustomerComponent } from './modules/customer-management/pages/customer.component';
+import { UsersComponent } from './modules/users/pages/users.component';
 
 const routes: Routes = [
   {
@@ -22,6 +23,7 @@ const routes: Routes = [
       { path: 'time-entries', component: TimeEntriesComponent },
       { path: 'activities-management', component: ActivitiesManagementComponent },
       { path: 'customers-management', canActivate: [AdminGuard], component: CustomerComponent },
+      { path: 'users', canActivate: [AdminGuard], component: UsersComponent },
       { path: '', pathMatch: 'full', redirectTo: 'time-clock' },
     ],
   },

src/app/app.module.ts

@@ -55,6 +55,7 @@ import { ProjectTypeListComponent } from './modules/customer-management/componen
 // tslint:disable-next-line: max-line-length
 import { CreateProjectTypeComponent } from './modules/customer-management/components/projects-type/components/create-project-type/create-project-type.component';
 import { CustomerEffects } from './modules/customer-management/store/customer-management.effects';
+import { UserEffects } from './modules/users/store/user.effects';
 import { EntryEffects } from './modules/time-clock/store/entry.effects';
 import { InjectTokenInterceptor } from './modules/shared/interceptors/inject.token.interceptor';
 import { SubstractDatePipe } from './modules/shared/pipes/substract-date/substract-date.pipe';
@@ -68,6 +69,8 @@ import { TimeRangeFormComponent } from './modules/reports/components/time-range-
 import { TimeEntriesTableComponent } from './modules/reports/components/time-entries-table/time-entries-table.component';
 import { DialogComponent } from './modules/shared/components/dialog/dialog.component';
 import { LoadingBarComponent } from './modules/shared/components/loading-bar/loading-bar.component';
+import { UsersComponent } from './modules/users/pages/users.component';
+import { UsersListComponent } from './modules/users/components/users-list/users-list.component';
 
 const maskConfig: Partial<IConfig> = {
   validation: false,
@@ -115,7 +118,9 @@ const maskConfig: Partial<IConfig> = {
     TimeRangeFormComponent,
     TimeEntriesTableComponent,
     DialogComponent,
-    LoadingBarComponent
+    LoadingBarComponent,
+    UsersComponent,
+    UsersListComponent
   ],
   imports: [
     NgxMaskModule.forRoot(maskConfig),
@@ -144,6 +149,7 @@ const maskConfig: Partial<IConfig> = {
       TechnologyEffects,
       ProjectTypeEffects,
       EntryEffects,
+      UserEffects,
     ]),
     ToastrModule.forRoot()
   ],

src/app/modules/shared/components/sidebar/sidebar.component.spec.ts

@@ -56,7 +56,7 @@ describe('SidebarComponent', () => {
     component.getSidebarItems();
     const menuItems = component.itemsSidebar;
 
-    expect(menuItems.length).toBe(5);
+    expect(menuItems.length).toBe(6);
   });
 
   it('non admin users have two menu items', () => {

src/app/modules/shared/components/sidebar/sidebar.component.ts

@@ -45,6 +45,7 @@ export class SidebarComponent implements OnInit {
         {route: '/reports', icon: 'fas fa-chart-pie', text: 'Reports', active: false},
         {route: '/activities-management', icon: 'fas fa-file-alt', text: 'Activities', active: false},
         {route: '/customers-management', icon: 'fas fa-user', text: 'Customers', active: false},
+        {route: '/users', icon: 'fas fa-user', text: 'Users', active: false},
       ];
     } else {
       this.itemsSidebar = [

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

@@ -0,0 +1,15 @@
+<table *ngIf="users" class="table table-sm table-bordered table-striped mb-0" datatable [dtTrigger]="dtTrigger">
+  <thead class="thead-blue">
+    <tr class="d-flex">
+      <th class="col-6">User Email</th>
+      <th class="col-6">Names</th>
+    </tr>
+  </thead>
+  <app-loading-bar *ngIf="isLoading$ | async"></app-loading-bar>
+  <tbody *ngIf="(isLoading$ | async) === false">
+    <tr class="d-flex" *ngFor="let user of users">
+      <td class="col-sm-6">{{ user.email }}</td>
+      <td class="col-sm-6">{{ user.name }}</td>
+    </tr>
+  </tbody>
+</table>

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

@@ -0,0 +1,80 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { MockStore, provideMockStore } from '@ngrx/store/testing';
+
+import { NgxPaginationModule } from 'ngx-pagination';
+import { UsersListComponent } from './users-list.component';
+import { UserActionTypes, UserState, LoadUsers } from '../../store';
+import { ActionsSubject } from '@ngrx/store';
+import { DataTablesModule } from 'angular-datatables';
+
+describe('UsersListComponent', () => {
+  let component: UsersListComponent;
+  let fixture: ComponentFixture<UsersListComponent>;
+  let store: MockStore<UserState>;
+  const actionSub: ActionsSubject = new ActionsSubject();
+
+  const state: UserState = {
+    data: [{ name: 'name', email: 'email', role: 'role', id: 'id', tenant_id: 'tenant id', deleted: 'delete' }],
+    isLoading: false,
+    message: '',
+  };
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [NgxPaginationModule, DataTablesModule],
+      declarations: [UsersListComponent],
+      providers: [provideMockStore({ initialState: state }), { provide: ActionsSubject, useValue: actionSub }],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UsersListComponent);
+    component = fixture.componentInstance;
+    store = TestBed.inject(MockStore);
+    store.setState(state);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('when the component is initialized the load User action is triggered', () => {
+    spyOn(store, 'dispatch');
+
+    component.ngOnInit();
+
+    expect(store.dispatch).toHaveBeenCalledWith(new LoadUsers());
+  });
+
+  it('on success load users, the user list should be populated', () => {
+    const actionSubject = TestBed.inject(ActionsSubject) as ActionsSubject;
+    const action = {
+      type: UserActionTypes.LOAD_USERS_SUCCESS,
+      payload: state.data,
+    };
+
+    actionSubject.next(action);
+
+    expect(component.users).toEqual(state.data);
+  });
+
+  it('on success load users, the datatable should be reloaded', async () => {
+    const actionSubject = TestBed.inject(ActionsSubject);
+    const action = {
+      type: UserActionTypes.LOAD_USERS_SUCCESS,
+      payload: state.data,
+    };
+    spyOn(component.dtElement.dtInstance, 'then');
+
+    actionSubject.next(action);
+
+    expect(component.dtElement.dtInstance.then).toHaveBeenCalled();
+  });
+
+  afterEach(() => {
+    component.dtTrigger.unsubscribe();
+    component.loadUsersSubscription.unsubscribe();
+    fixture.destroy();
+  });
+});

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

@@ -0,0 +1,55 @@
+import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { ActionsSubject, select, Store } from '@ngrx/store';
+import { DataTableDirective } from 'angular-datatables';
+import { Observable, Subject, Subscription } from 'rxjs';
+import { delay, filter } from 'rxjs/operators';
+import { User } from '../../models/users';
+import { LoadUsers, UserActionTypes } from '../../store/user.actions';
+import { getIsLoading } from '../../store/user.selectors';
+@Component({
+  selector: 'app-users-list',
+  templateUrl: './users-list.component.html',
+  styleUrls: ['./users-list.component.css'],
+})
+export class UsersListComponent implements OnInit, OnDestroy, AfterViewInit {
+  users: User[] = [];
+  isLoading$: Observable<boolean>;
+  loadUsersSubscription: Subscription;
+  dtTrigger: Subject<any> = new Subject();
+  @ViewChild(DataTableDirective, { static: false })
+  dtElement: DataTableDirective;
+
+  constructor(private store: Store<User>, private actionsSubject$: ActionsSubject) {
+    this.isLoading$ = store.pipe(delay(0), select(getIsLoading));
+  }
+
+  ngOnInit(): void {
+    this.loadUsersSubscription = this.actionsSubject$
+      .pipe(filter((action: any) => action.type === UserActionTypes.LOAD_USERS_SUCCESS))
+      .subscribe((action) => {
+        this.users = action.payload;
+        this.rerenderDataTable();
+      });
+    this.store.dispatch(new LoadUsers());
+  }
+
+  ngAfterViewInit(): void {
+    this.rerenderDataTable();
+  }
+
+  ngOnDestroy() {
+    this.loadUsersSubscription.unsubscribe();
+    this.dtTrigger.unsubscribe();
+  }
+
+  private rerenderDataTable(): void {
+    if (this.dtElement && this.dtElement.dtInstance) {
+      this.dtElement.dtInstance.then((dtInstances: DataTables.Api) => {
+        dtInstances.destroy();
+        this.dtTrigger.next();
+      });
+    } else {
+      this.dtTrigger.next();
+    }
+  }
+}

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

@@ -0,0 +1,8 @@
+export interface User {
+  name: string;
+  email: string;
+  role?: string;
+  id: string;
+  tenant_id?: string;
+  deleted?: string;
+}