Skip to content

Commit 5f8aac5

Browse files
author
Abigail Cabascango
committed
Merge remote-tracking branch 'origin/master' into TTA-115-time-tracker-doesnt-notifies-the-user-when-they-lost-internet-connection-or-have-a-slow-connection
2 parents 470a043 + 53d3f35 commit 5f8aac5

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "time-tracker",
3-
"version": "1.75.19",
3+
"version": "1.75.22",
44
"scripts": {
55
"preinstall": "npx npm-force-resolutions",
66
"ng": "ng",
@@ -117,7 +117,7 @@
117117
"config": {
118118
"commit-message-validator": {
119119
"pattern": "^(fix: TTA-|feat: TTA-|perf: TTA-|build: TTA-|ci: TTA-|docs: TTA-|refactor: TTA-|style: TTA-|test: TTA-|code-smell: TTA-)[0-9].*",
120-
"errorMessage": "Your commit message needs to start with fix: , feat:, or perf: followed by any commit message, e.g. fix: TT-43 any commit message."
120+
"errorMessage": "\nYour commit message must comply with the following pattern:\n ^(fix: TTA-|feat: TTA-|perf: TTA-|build: TTA-|ci: TTA-|docs: TTA-|refactor: TTA-|style: TTA-|test: TTA-|code-smell: TTA-)[0-9].*\n followed by any commit message.\n\n Example:\n fix: TTA-43 any commit message\n"
121121
}
122122
},
123123
"resolutions": {

src/app/modules/time-clock/store/entry.effects.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ export class EntryEffects {
5050
mergeMap(() =>
5151
this.entryService.summary().pipe(
5252
map((response) => {
53+
if (!response){
54+
this.toastrService.warning('Your summary information could not be loaded');
55+
}
5356
return new actions.LoadEntriesSummarySuccess(response);
5457
}),
5558
catchError((error) => {

0 commit comments

Comments
 (0)