Merge pull request #465 from ioet/441-activity-required-on-switch

fix: #441 make activity required before switching

Author: enriquezrene

src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.spec.ts

@@ -1,3 +1,4 @@
+import { ToastrService, IndividualConfig } from 'ngx-toastr';
 import { SwitchTimeEntry } from './../../store/entry.actions';
 import { FormBuilder } from '@angular/forms';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
@@ -17,6 +18,9 @@ describe('ProjectListHoverComponent', () => {
   let fixture: ComponentFixture<ProjectListHoverComponent>;
   let store: MockStore<ProjectState>;
   let mockProjectsSelector;
+  const toastrServiceStub = {
+    error: (message?: string, title?: string, override?: Partial<IndividualConfig>) => { }
+  };
 
   const state = {
     projects: {
@@ -41,7 +45,8 @@ describe('ProjectListHoverComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ProjectListHoverComponent, FilterProjectPipe],
-      providers: [FormBuilder, provideMockStore({ initialState: state })],
+      providers: [FormBuilder, provideMockStore({ initialState: state }),
+        { provide: ToastrService, useValue: toastrServiceStub }],
       imports: [HttpClientTestingModule, AutocompleteLibModule],
     }).compileComponents();
     store = TestBed.inject(MockStore);
@@ -76,6 +81,15 @@ describe('ProjectListHoverComponent', () => {
     expect(store.dispatch).toHaveBeenCalledWith(new UpdateEntryRunning({ id: component.activeEntry.id, project_id: 1 }));
   });
 
+  it('displays a message when the activity_id is null', () => {
+    spyOn(toastrServiceStub, 'error');
+    component.activeEntry = { activity_id: null };
+
+    component.switch(1, 'customer', 'project');
+
+    expect(toastrServiceStub.error).toHaveBeenCalled();
+  });
+
   it('dispatch a SwitchTimeEntry action', () => {
     spyOn(store, 'dispatch');
     component.activeEntry = { id: '123' };

src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.ts

@@ -1,3 +1,4 @@
+import { ToastrService } from 'ngx-toastr';
 import { EntryActionTypes } from './../../store/entry.actions';
 import { filter } from 'rxjs/operators';
 import { FormGroup, FormBuilder } from '@angular/forms';
@@ -26,7 +27,8 @@ export class ProjectListHoverComponent implements OnInit, OnDestroy {
   showClockIn: boolean;
   updateEntrySubscription: Subscription;
 
-  constructor(private formBuilder: FormBuilder, private store: Store<ProjectState>, private actionsSubject$: ActionsSubject) {
+  constructor(private formBuilder: FormBuilder, private store: Store<ProjectState>,
+              private actionsSubject$: ActionsSubject, private toastrService: ToastrService) {
     this.projectsForm = this.formBuilder.group({ project_id: null, });
   }
 
@@ -88,8 +90,12 @@ export class ProjectListHoverComponent implements OnInit, OnDestroy {
   }
 
   switch(selectedProject, customerName, name) {
-    this.store.dispatch(new entryActions.SwitchTimeEntry(this.activeEntry.id, selectedProject));
-    this.projectsForm.setValue( { project_id: `${customerName} - ${name}`, } );
+    if (this.activeEntry.activity_id === null) {
+      this.toastrService.error('Before switching, please select an activity');
+    } else {
+      this.store.dispatch(new entryActions.SwitchTimeEntry(this.activeEntry.id, selectedProject));
+      this.projectsForm.setValue( { project_id: `${customerName} - ${name}`, } );
+    }
   }
 
   ngOnDestroy(): void {