From aaa20a7a7fe518c92ca987b8de1637b0663ae207 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 22 Apr 2018 17:27:45 +0200 Subject: [PATCH] Changes reverted. --- .../event-consumers-page.component.ts | 6 +++--- .../state/event-consumers.state.spec.ts | 10 +++++----- .../administration/state/event-consumers.state.ts | 14 +------------- 3 files changed, 9 insertions(+), 21 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 2a751f8a8..9cf2a8ceb 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 @@ -34,16 +34,16 @@ export class EventConsumersPageComponent implements OnDestroy, OnInit { } public ngOnInit() { - this.eventConsumersState.load().onErrorResumeNext().subscribe(); + this.eventConsumersState.load(false, true).onErrorResumeNext().subscribe(); this.timerSubscription = Observable.timer(2000, 2000) - .switchMap(x => this.eventConsumersState.reloadSilently().onErrorResumeNext()) + .switchMap(x => this.eventConsumersState.load().onErrorResumeNext()) .subscribe(); } public reload() { - this.eventConsumersState.reload().onErrorResumeNext().subscribe(); + this.eventConsumersState.load(true, true).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 3b3c233dc..b159f8a20 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 @@ -42,17 +42,17 @@ describe('EventConsumersState', () => { dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.never()); }); - it('should show notification on reload', () => { - eventConsumersState.reload().subscribe(); + it('should show notification on load when flag is true', () => { + eventConsumersState.load(true, true).subscribe(); dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.once()); }); - it('should show notification on load error', () => { + it('should show notification on load error when flag is true', () => { eventConsumersService.setup(x => x.getEventConsumers()) .returns(() => Observable.throw({})); - eventConsumersState.load().onErrorResumeNext().subscribe(); + eventConsumersState.load(true, true).onErrorResumeNext().subscribe(); dialogs.verify(x => x.notifyError(It.isAny()), Times.once()); }); @@ -61,7 +61,7 @@ describe('EventConsumersState', () => { eventConsumersService.setup(x => x.getEventConsumers()) .returns(() => Observable.throw({})); - eventConsumersState.reloadSilently().onErrorResumeNext().subscribe(); + eventConsumersState.load().onErrorResumeNext().subscribe(); dialogs.verify(x => x.notifyError(It.isAny()), Times.never()); }); 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 401c6cb77..134fd0d8b 100644 --- a/src/Squidex/app/features/administration/state/event-consumers.state.ts +++ b/src/Squidex/app/features/administration/state/event-consumers.state.ts @@ -41,19 +41,7 @@ export class EventConsumersState extends State { super({ eventConsumers: ImmutableArray.empty() }); } - public load() { - return this.loadInternal(true); - } - - public reload() { - return this.loadInternal(true, true); - } - - public reloadSilently() { - return this.loadInternal(false, false); - } - - public loadInternal(notifyLoad = false, notifyError = false): Observable { + public load(notifyLoad = false, notifyError = false): Observable { return this.eventConsumersService.getEventConsumers() .do(dtos => { if (notifyLoad) {