Merge branch 'master' into TT-362-Pagination-is-not-displayed

Author: Rodrigo Farinango

src/app/modules/activities-management/store/activity-management.actions.ts

@@ -20,6 +20,7 @@ export enum ActivityManagementActionTypes {
   UNARCHIVE_ACTIVITY_FAIL = '[ActivityManagement] UNARCHIVE_ACTIVITY_FAIL',
   SET_ACTIVITY_ID_TO_EDIT = '[ActivityManagement] SET_ACTIVITY_ID_TO_EDIT',
   RESET_ACTIVITY_ID_TO_EDIT = '[ActivityManagement] RESET_ACTIVITY_ID_TO_EDIT',
+  DEFAULT_ACTIVITY = '[ActivityManagement] DEFAULT_ACTIVITY',
 }
 
 export class LoadActivities implements Action {
@@ -118,6 +119,10 @@ export class ResetActivityToEdit implements Action {
   public readonly type = ActivityManagementActionTypes.RESET_ACTIVITY_ID_TO_EDIT;
 }
 
+export class DefaultActivities implements Action {
+  public readonly type = ActivityManagementActionTypes.DEFAULT_ACTIVITY;
+}
+
 export type ActivityManagementActions =
   | LoadActivities
   | LoadActivitiesSuccess
@@ -135,4 +140,5 @@ export type ActivityManagementActions =
   | UnarchiveActivitySuccess
   | UnarchiveActivityFail
   | SetActivityToEdit
-  | ResetActivityToEdit;
+  | ResetActivityToEdit
+  | DefaultActivities;

src/app/modules/activities-management/store/activity-management.reducers.spec.ts

@@ -142,4 +142,25 @@ describe('activityManagementReducer', () => {
     expect(state.message).toEqual('Something went wrong unarchiving activities!');
     expect(state.isLoading).toBeFalse();
   });
+
+  it('on SetActivityidToEdit, message equal to \"Set activityIdToEdit property\"', () => {
+    const action = new actions.SetActivityToEdit('1');
+    const state = activityManagementReducer(initialState, action);
+    expect(state.message).toEqual('Set activityIdToEdit property');
+    expect(state.isLoading).toBeFalse();
+  });
+
+  it('on ResetActivityIdToEdit, message equal to \"Reset activityIdToEdit property\"', () => {
+    const action = new actions.ResetActivityToEdit();
+    const state = activityManagementReducer(initialState, action);
+    expect(state.message).toEqual('Reset activityIdToEdit property');
+    expect(state.isLoading).toBeFalse();
+  });
+
+  it('on DefaultAction, state equal to initial state', () => {
+    const action = new actions.DefaultActivities();
+    const state = activityManagementReducer(initialState, action);
+    expect(state.data).toEqual(initialState.data);
+  });
+
 });

src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.spec.ts

@@ -3,6 +3,7 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ManagementCustomerProjectsComponent } from './management-customer-projects.component';
 import { MockStore, provideMockStore } from '@ngrx/store/testing';
 import { CustomerState } from '../../store';
+import { of } from 'rxjs';
 
 describe('ManagmentCustomerProjectsComponent', () => {
   let component: ManagementCustomerProjectsComponent;
@@ -38,6 +39,18 @@ describe('ManagmentCustomerProjectsComponent', () => {
     expect(component).toBeTruthy();
   });
 
+  it('set customerName on ngOnInit', () => {
+    spyOn(store, 'dispatch');
+    spyOn(store, 'pipe').and.returnValue(of({
+      id: 1,
+      name: 'project 4',
+      description: 'project 1 to test methos projectss',
+      status: 'inactive'
+    }));
+    component.ngOnInit();
+    expect(component.customerName).toEqual('project 4');
+  });
+
   it('should be enable tabs', () => {
     component.areTabsActive = false;
     component.activeTabs(true);

src/app/modules/customer-management/components/projects-type/components/project-type-list/project-type-list.component.spec.ts

@@ -5,6 +5,7 @@ import { NgxPaginationModule } from 'ngx-pagination';
 import { DeleteProjectType, SetProjectTypeToEdit } from './../../store/project-type.actions';
 import { allProjectTypes, ProjectTypeState } from '../../store';
 import { ProjectTypeListComponent } from './project-type-list.component';
+import { ProjectType } from 'src/app/modules/shared/models';
 
 describe('ProjectTypeTableListComponent', () => {
   let component: ProjectTypeListComponent;
@@ -68,4 +69,16 @@ describe('ProjectTypeTableListComponent', () => {
     expect(store.dispatch).toHaveBeenCalledWith(new SetProjectTypeToEdit('id'));
   });
 
+  it('open the modal with the correct parameters', () => {
+    const item: ProjectType = {
+      id: `1`,
+      name: `Project 1`,
+      description: `Description project 1`
+    };
+    component.openModal(item);
+    expect(component.idToDelete).toEqual(item.id);
+    expect(component.message).toEqual(`Are you sure you want to delete ${item.name}?`);
+    expect(component.showModal).toBe(true);
+  });
+
 });

src/app/modules/customer-management/components/projects-type/store/project-type.reducers.spec.ts

@@ -6,7 +6,7 @@ describe('projectTypeReducer', () => {
   const initialState: ProjectTypeState = { data: [], isLoading: false, message: '', projectTypeIdToEdit: '' };
   const projectType: ProjectType = { id: '1', name: 'Training', description: 'It is good for learning' };
 
-  it('on Default, ', () => {
+  it('on DefaultAction, state equal to initial state', () => {
     const action = new actions.DefaultProjectTypes();
     const state = projectTypeReducer(initialState, action);
     expect(state.data).toEqual(initialState.data);

src/app/modules/customer-management/components/projects/components/services/project.service.spec.ts

@@ -48,6 +48,16 @@ describe('ProjectService', () => {
     }
   ));
 
+  it('all projects are read using GET from url', () => {
+    const projectsFoundSize = projectsList.length;
+    service.getAllProjects().subscribe((projectsInResponse) => {
+      expect(projectsInResponse.length).toBe(projectsFoundSize);
+    });
+    const getProjectsRequest = httpMock.expectOne(service.url);
+    expect(getProjectsRequest.request.method).toBe('GET');
+    getProjectsRequest.flush(projectsList);
+  });
+
   it('projects are read using GET from url', () => {
     const projectsFoundSize = projectsList.length;
     service.url = '/projects';

src/app/modules/customer-management/components/projects/components/store/project.actions.ts

@@ -25,6 +25,7 @@ export enum ProjectActionTypes {
   UNARCHIVE_PROJECT = '[Projects] UNARCHIVE_PROJECT',
   UNARCHIVE_PROJECT_SUCCESS = '[Projects] UNARCHIVE_PROJECT_SUCCESS',
   UNARCHIVE_PROJECT_FAIL = '[Projects] UNARCHIVE_PROJECT_FAIL',
+  DEFAULT_PROJECT = '[Projects] DEFAULT_PROJECTS',
 }
 
 export class CleanCustomerProjects implements Action {
@@ -154,6 +155,10 @@ export class UnarchiveProjectFail implements Action {
   constructor(public error: string) {}
 }
 
+export class DefaultProjects implements Action {
+  public readonly type = ProjectActionTypes.DEFAULT_PROJECT;
+}
+
 export type ProjectActions =
   | CleanCustomerProjects
   | LoadProjects
@@ -177,4 +182,5 @@ export type ProjectActions =
   | DeleteProjectFail
   | UnarchiveProject
   | UnarchiveProjectSuccess
-  | UnarchiveProjectFail;
+  | UnarchiveProjectFail
+  | DefaultProjects;

src/app/modules/customer-management/components/projects/components/store/project.reducer.spec.ts

@@ -22,6 +22,26 @@ describe('projectReducer', () => {
   });
 
   it('on LoadProjects, isLoading is true', () => {
+    const action = new actions.LoadProjects();
+    const state = projectReducer(initialState, action);
+    expect(state.isLoading).toEqual(true);
+  });
+
+  it('on LoadProjectsSucces, projectsFound are saved in the store', () => {
+    const projectsFound: Project[] = [project];
+    const action = new actions.LoadProjectsSuccess(projectsFound);
+    const state = projectReducer(initialState, action);
+    expect(action.payload).toEqual([project]);
+    expect(state.isLoading).toEqual(false);
+  });
+
+  it('on LoadProjectsFail, loadProject equal []', () => {
+    const action = new actions.LoadProjectsFail('error');
+    const state = projectReducer(initialState, action);
+    expect(state.isLoading).toEqual(false);
+  });
+
+  it('on LoadCustomerProjects, isLoading is true', () => {
     const action = new actions.LoadCustomerProjects('1');
     const state = projectReducer(initialState, action);
     expect(state.isLoading).toEqual(true);
@@ -201,4 +221,11 @@ describe('projectReducer', () => {
     expect(state.message).toEqual('Something went wrong unarchiving projects!');
     expect(state.isLoading).toEqual(false);
   });
+
+  it('on DefaultAction, state equal to initial state', () => {
+    const action = new actions.DefaultProjects();
+    const state = projectReducer(initialState, action);
+    expect(state).toEqual(initialState);
+  });
+
 });

src/app/modules/customer-management/store/customer-management.actions.ts

@@ -19,6 +19,7 @@ export enum CustomerManagementActionTypes {
   UNARCHIVE_CUSTOMER = '[CustomerManagement] UNARCHIVE_CUSTOMER',
   UNARCHIVE_CUSTOMER_SUCCESS = '[CustomerManagement] UNARCHIVE_CUSTOMER_SUCCESS',
   UNARCHIVE_CUSTOMER_FAIL = '[CustomerManagement] UNARCHIVE_CUSTOMER_FAIL',
+  DEFAULT_CUSTOMER = '[CustomerManagement] DEFAULT_CUSTOMER',
 }
 
 export class LoadCustomers implements Action {
@@ -118,6 +119,10 @@ export class UnarchiveCustomerFail implements Action {
   constructor(public error: string) {}
 }
 
+export class DefaultCustomer implements Action {
+  public readonly type = CustomerManagementActionTypes.DEFAULT_CUSTOMER;
+}
+
 export type CustomerManagementActions =
   | CreateCustomer
   | CreateCustomerSuccess
@@ -135,4 +140,5 @@ export type CustomerManagementActions =
   | ResetCustomerToEdit
   | UnarchiveCustomer
   | UnarchiveCustomerSuccess
-  | UnarchiveCustomerFail;
+  | UnarchiveCustomerFail
+  | DefaultCustomer;

src/app/modules/customer-management/store/customer-management.reducers.spec.ts

@@ -166,4 +166,10 @@ describe('customerManagementReducer', () => {
     expect(state.message).toEqual('Something went wrong unarchiving customer!');
     expect(state.isLoading).toEqual(false);
   });
+
+  it('on DefaultAction, state equal to initial state', () => {
+    const action = new actions.DefaultCustomer();
+    const state = customerManagementReducer(initialState, action);
+    expect(state.data).toEqual(initialState.data);
+  });
 });