From 78de4d5b18ee9897ac99c42903c60c31f7b3b033 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Fri, 18 May 2018 11:07:33 +0200
Subject: [PATCH] Notifications fixed.

---
 .../pages/event-consumers/event-consumers-page.component.ts   | 4 ++--
 .../administration/state/event-consumers.state.spec.ts        | 2 +-
 .../features/administration/state/event-consumers.state.ts    | 2 +-
 .../features/settings/pages/backups/backups-page.component.ts | 4 ++--
 src/Squidex/app/shared/state/backups.state.spec.ts            | 2 +-
 src/Squidex/app/shared/state/backups.state.ts                 | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts
index 9cf2a8ceb..0c0464b1e 100644
--- a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts
+++ b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts
@@ -38,12 +38,12 @@ export class EventConsumersPageComponent implements OnDestroy, OnInit {
 
         this.timerSubscription =
             Observable.timer(2000, 2000)
-                .switchMap(x => this.eventConsumersState.load().onErrorResumeNext())
+                .switchMap(x => this.eventConsumersState.load(true, true).onErrorResumeNext())
                 .subscribe();
     }
 
     public reload() {
-        this.eventConsumersState.load(true, true).onErrorResumeNext().subscribe();
+        this.eventConsumersState.load(true, false).onErrorResumeNext().subscribe();
     }
 
     public start(es: EventConsumerDto) {
diff --git a/src/Squidex/app/features/administration/state/event-consumers.state.spec.ts b/src/Squidex/app/features/administration/state/event-consumers.state.spec.ts
index ccd674b28..514ca72d7 100644
--- a/src/Squidex/app/features/administration/state/event-consumers.state.spec.ts
+++ b/src/Squidex/app/features/administration/state/event-consumers.state.spec.ts
@@ -43,7 +43,7 @@ describe('EventConsumersState', () => {
     });
 
     it('should show notification on load when reload is true', () => {
-        eventConsumersState.load(true, true).subscribe();
+        eventConsumersState.load(true).subscribe();
 
         dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.once());
     });
diff --git a/src/Squidex/app/features/administration/state/event-consumers.state.ts b/src/Squidex/app/features/administration/state/event-consumers.state.ts
index e8864aacf..bb43f806c 100644
--- a/src/Squidex/app/features/administration/state/event-consumers.state.ts
+++ b/src/Squidex/app/features/administration/state/event-consumers.state.ts
@@ -48,7 +48,7 @@ export class EventConsumersState extends State<Snapshot> {
 
         return this.eventConsumersService.getEventConsumers()
             .do(dtos => {
-                if (isReload) {
+                if (isReload && !silent) {
                     this.dialogs.notifyInfo('Event Consumers reloaded.');
                 }
 
diff --git a/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts b/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts
index 0268e050f..8be6e612e 100644
--- a/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts
+++ b/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts
@@ -37,12 +37,12 @@ export class BackupsPageComponent implements OnInit, OnDestroy {
 
         this.timerSubscription =
             Observable.timer(3000, 3000)
-                .switchMap(t => this.backupsState.load().onErrorResumeNext())
+                .switchMap(t => this.backupsState.load(true, true).onErrorResumeNext())
                 .subscribe();
     }
 
     public reload() {
-        this.backupsState.load(true, true).onErrorResumeNext().subscribe();
+        this.backupsState.load(true, false).onErrorResumeNext().subscribe();
     }
 
     public start() {
diff --git a/src/Squidex/app/shared/state/backups.state.spec.ts b/src/Squidex/app/shared/state/backups.state.spec.ts
index b05e511e7..c3c884e6b 100644
--- a/src/Squidex/app/shared/state/backups.state.spec.ts
+++ b/src/Squidex/app/shared/state/backups.state.spec.ts
@@ -55,7 +55,7 @@ describe('BackupsState', () => {
     });
 
     it('should show notification on load when reload is true', () => {
-        backupsState.load(true, true).subscribe();
+        backupsState.load(true, false).subscribe();
 
         dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.once());
     });
diff --git a/src/Squidex/app/shared/state/backups.state.ts b/src/Squidex/app/shared/state/backups.state.ts
index 992f26122..834acdf9c 100644
--- a/src/Squidex/app/shared/state/backups.state.ts
+++ b/src/Squidex/app/shared/state/backups.state.ts
@@ -55,7 +55,7 @@ export class BackupsState extends State<Snapshot> {
 
         return this.backupsService.getBackups(this.appName)
             .do(dtos => {
-                if (isReload) {
+                if (isReload && !silent) {
                     this.dialogs.notifyInfo('Backups reloaded.');
                 }