From 6433e211a8bdcd1c0ad3769fa192eb4ed446b6ac Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Fri, 19 Jun 2020 13:59:21 +0200
Subject: [PATCH] Feedback processed: - change so state change
 behaviourSubjects back in NgZone.run

---
 src/app/community-list-page/community-list-datasource.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/community-list-page/community-list-datasource.ts b/src/app/community-list-page/community-list-datasource.ts
index 8cd0c6b0af..4ffb16759d 100644
--- a/src/app/community-list-page/community-list-datasource.ts
+++ b/src/app/community-list-page/community-list-datasource.ts
@@ -25,14 +25,13 @@ export class CommunityListDatasource implements DataSource<FlatNode> {
   }
 
   loadCommunities(findOptions: FindListOptions, expandedNodes: FlatNode[]) {
-    this.loading$.next(true);
-
     this.zone.runOutsideAngular(() => {
+      this.loading$.next(true);
       this.communityListService.loadCommunities(findOptions, expandedNodes).pipe(
         take(1),
-        finalize(() => this.loading$.next(false)),
+        finalize(() => this.zone.run(() => this.loading$.next(false))),
       ).subscribe((flatNodes: FlatNode[]) => {
-        this.communityList$.next(flatNodes);
+        this.zone.run(() => this.communityList$.next(flatNodes));
       });
     });
   }