Skip to content

242 remove message on entry updated #245

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 3 commits into from
May 15, 2020
Merged

242 remove message on entry updated #245

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18f8c91
fix: #242 remove update notification from time-clock
enriquezrene May 15, 2020
a0bf902
fix: #242 remove update notification from time-clock
enriquezrene May 15, 2020
a637d55
fix: #243 creating a place where messages are hold
enriquezrene May 15, 2020
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
Next Next commit
fix: #242 remove update notification from time-clock
  • Loading branch information
@enriquezrene
enriquezrene committed May 15, 2020
commit 18f8c91d26a0eb73656ed687bbe9deaa1eab10a9
25 changes: 19 additions & 6 deletions src/app/modules/time-clock/store/entry.effects.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { INFO_SAVED_SUCCESSFULLY, INFO_DELETE_SUCCESSFULLY, UNEXPECTED_ERROR } from './../../shared/messages';
import { Entry } from './../../shared/models/entry.model';
import { Injectable } from '@angular/core';
import { ofType, Actions, Effect } from '@ngrx/effects';
import { Action } from '@ngrx/store';
Expand Down Expand Up @@ -55,11 +57,14 @@ export class EntryEffects {
mergeMap((entry) =>
this.entryService.createEntry(entry).pipe(
map((entryData) => {
this.toastrService.success('Entry was saved successfully');
if (entryData.end_date !== null) {
this.toastrService.success(INFO_SAVED_SUCCESSFULLY);
}
return new actions.CreateEntrySuccess(entryData);
}),
catchError((error) => {
this.toastrService.error(error.error.message);
console.error(error);
this.toastrService.success(UNEXPECTED_ERROR);
return of(new actions.CreateEntryFail(error.error.message));
})
)
Expand All @@ -72,8 +77,15 @@ export class EntryEffects {
map((action: actions.DeleteEntry) => action.entryId),
mergeMap((entryId) =>
this.entryService.deleteEntry(entryId).pipe(
map(() => new actions.DeleteEntrySuccess(entryId)),
catchError((error) => of(new actions.DeleteEntryFail(error)))
map(() => {
this.toastrService.success(INFO_DELETE_SUCCESSFULLY);
return new actions.DeleteEntrySuccess(entryId);
}),
catchError((error) => {
console.log(error);
this.toastrService.success(UNEXPECTED_ERROR);
return of(new actions.DeleteEntryFail(error));
})
)
)
);
Expand All @@ -85,11 +97,11 @@ export class EntryEffects {
mergeMap((project) =>
this.entryService.updateActiveEntry(project).pipe(
map((projectData) => {
this.toastrService.success('Entry was updated successfully');
return new actions.UpdateActiveEntrySuccess(projectData);
}),
catchError((error) => {
this.toastrService.error(error.error.message);
console.log(error);
this.toastrService.success(UNEXPECTED_ERROR);
return of(new actions.UpdateActiveEntryFail(error));
})
)
Expand All @@ -103,6 +115,7 @@ export class EntryEffects {
mergeMap((timeEntryId) =>
this.entryService.stopEntryRunning(timeEntryId).pipe(
map(() => {
this.toastrService.success('You clocked-out successfully');
return new actions.StopTimeEntryRunningSuccess(timeEntryId);
}),
catchError((error) => of(new actions.StopTimeEntryRunningFail(error.error.message)))
Expand Down