Merge branch 'feature-process_polling-7.6' into feature-process_polling

atmire · Jan 8, 2024 · 86d3883 · 86d3883
2 parents d37cd18 + c91b99f
commit 86d3883
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/app/core/cache/builders/remote-data-build.service.ts b/src/app/core/cache/builders/remote-data-build.service.ts
@@ -272,12 +272,13 @@ export class RemoteDataBuildService {
           return isStale(r2.state) ? r1 : r2;
         }
       }),
-      distinctUntilKeyChanged('lastUpdated')
     );
 
     const payload$ = this.buildPayload<T>(requestEntry$, href$, ...linksToFollow);
 
-    return this.toRemoteDataObservable<T>(requestEntry$, payload$);
+    return this.toRemoteDataObservable<T>(requestEntry$, payload$).pipe(
+      distinctUntilKeyChanged('lastUpdated'),
+    );
   }
 
   /**

diff --git a/src/app/core/data/processes/process-data.service.ts b/src/app/core/data/processes/process-data.service.ts
@@ -196,7 +196,7 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
 
     return process$.pipe(
       distinctUntilChanged((previous: RemoteData<Process>, current: RemoteData<Process>) =>
-        previous.payload.processStatus === current.payload.processStatus
+        previous.payload?.processStatus === current.payload?.processStatus,
       )
     );
   }