From a0413680195b73208f7e26dee55c7cab9c400c2c Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Wed, 20 Apr 2022 13:21:37 +0200
Subject: [PATCH] 90252: Fix invalidateByHref not emitting

---
 src/app/core/data/data.service.ts | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/app/core/data/data.service.ts b/src/app/core/data/data.service.ts
index 909bc8d14b..0759cb61ea 100644
--- a/src/app/core/data/data.service.ts
+++ b/src/app/core/data/data.service.ts
@@ -600,16 +600,13 @@ export abstract class DataService<T extends CacheableObject> implements UpdateDa
     const done$ = new AsyncSubject<boolean>();
 
     this.objectCache.getByHref(href).pipe(
-      switchMap((oce: ObjectCacheEntry) => observableFrom(oce.requestUUIDs)),
-      mergeMap((requestUUID: string) => this.requestService.setStaleByUUID(requestUUID)),
-      toArray(),
-      map((areRequestsStale: boolean[]) => areRequestsStale.every(Boolean)),
-      distinctUntilChanged(),
-    ).subscribe((done: boolean) => {
-      if (done) {
-        done$.next(true);
-        done$.complete();
-      }
+      switchMap((oce: ObjectCacheEntry) => observableFrom(oce.requestUUIDs).pipe(
+        mergeMap((requestUUID: string) => this.requestService.setStaleByUUID(requestUUID)),
+        toArray(),
+      )),
+    ).subscribe(() => {
+      done$.next(true);
+      done$.complete();
     });
 
     return done$;
@@ -667,11 +664,9 @@ export abstract class DataService<T extends CacheableObject> implements UpdateDa
           return [true];
         }
       })
-    ).subscribe((invalidated: boolean) => {
-      if (invalidated) {
-        invalidated$.next(true);
-        invalidated$.complete();
-      }
+    ).subscribe(() => {
+      invalidated$.next(true);
+      invalidated$.complete();
     });
 
     return combineLatest([response$, invalidated$]).pipe(