fix: TT-117 two entries in progress bug

Author: scastillo-jp

src/app/modules/time-entries/pages/time-entries.component.spec.ts

@@ -247,7 +247,7 @@ describe('TimeEntriesComponent', () => {
         uri: 'abc',
       }, shouldRestartEntry: true
     };
-    component.entryId = 'new-entry';
+    component.entryId = 'entry_1';
     spyOn(injectedToastrService, 'error');
 
     component.saveEntry(newEntry);
@@ -257,6 +257,7 @@ describe('TimeEntriesComponent', () => {
 
   it('displays an error when end date of entry is greater than active entry start date', async () => {
     component.activeTimeEntry = entry;
+
     const newEntry = {
       entry: {
         project_id: 'p-id',
@@ -267,7 +268,7 @@ describe('TimeEntriesComponent', () => {
         uri: 'abc',
       }, shouldRestartEntry: true
     };
-    component.entryId = 'new-entry';
+    component.entryId = 'entry_1';
     spyOn(injectedToastrService, 'error');
 
     component.saveEntry(newEntry);
@@ -349,8 +350,9 @@ describe('TimeEntriesComponent', () => {
     expect(component.doSave).toHaveBeenCalledWith(entryToSave);
   }));
 
-  it('when event contains should restart as true, then a restart Entry action should be triggered', () => {
+  it('when event contains should update as true, then a restart Entry action should be triggered', () => {
     component.entry = { start_date: new Date(), id: '1234', technologies: [], project_name: 'time-tracker' };
+
     const entryToSave = {
       entry: {
         id: '123',
@@ -363,12 +365,13 @@ describe('TimeEntriesComponent', () => {
 
       }, shouldRestartEntry: false
     };
+
     component.entryId = '123';
     spyOn(store, 'dispatch');
 
     component.doSave(entryToSave);
 
-    expect(store.dispatch).toHaveBeenCalledWith(new entryActions.RestartEntry(entryToSave.entry));
+    expect(store.dispatch).toHaveBeenCalledWith(new entryActions.UpdateEntry(entryToSave.entry));
   });
 
   it('should preload data of last entry when a project is selected while creating new entry ', waitForAsync(() => {

src/app/modules/time-entries/pages/time-entries.component.ts

@@ -146,9 +146,6 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {
     if (this.entryId) {
       event.entry.id = this.entryId;
       this.store.dispatch(new entryActions.UpdateEntry(event.entry));
-      if (event.shouldRestartEntry && this.entryId === this.activeTimeEntry.id) {
-        this.store.dispatch(new entryActions.RestartEntry(event.entry));
-      }
     } else {
       this.store.dispatch(new entryActions.CreateEntry(event.entry));
     }