From ecb20bbcbfa8c35bc2d60fb62bd93546a1ef60a9 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Thu, 8 Feb 2024 16:16:06 +0100
Subject: [PATCH] 108915: Fixed Proxy Timout error when retrieving a
 non-existing process

---
 .../core/data/processes/process-data.service.ts    | 14 ++++++++------
 .../process-page/process-breadcrumb.resolver.ts    | 10 +++++-----
 .../process-page/process-breadcrumbs.service.ts    |  7 ++++++-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/app/core/data/processes/process-data.service.ts b/src/app/core/data/processes/process-data.service.ts
index f11367f6ecf..ac459068b1b 100644
--- a/src/app/core/data/processes/process-data.service.ts
+++ b/src/app/core/data/processes/process-data.service.ts
@@ -175,12 +175,14 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
       )
     ).subscribe((processRD: RemoteData<Process>) => {
       this.clearCurrentTimeout(processId);
-      const nextTimeout = this.timer(() => {
-        this.activelyBeingPolled.delete(processId);
-        this.invalidateByHref(processRD.payload._links.self.href);
-      }, pollingIntervalInMs);
-
-      this.activelyBeingPolled.set(processId, nextTimeout);
+      if (processRD.hasSucceeded) {
+        const nextTimeout = this.timer(() => {
+          this.activelyBeingPolled.delete(processId);
+          this.invalidateByHref(processRD.payload._links.self.href);
+        }, pollingIntervalInMs);
+
+        this.activelyBeingPolled.set(processId, nextTimeout);
+      }
     });
 
     // When the process completes create a one off subscription (the `find` completes the
diff --git a/src/app/process-page/process-breadcrumb.resolver.ts b/src/app/process-page/process-breadcrumb.resolver.ts
index 23e3dca0a8a..fd0c1ad735a 100644
--- a/src/app/process-page/process-breadcrumb.resolver.ts
+++ b/src/app/process-page/process-breadcrumb.resolver.ts
@@ -6,8 +6,9 @@ import { Process } from './processes/process.model';
 import { followLink } from '../shared/utils/follow-link-config.model';
 import { ProcessDataService } from '../core/data/processes/process-data.service';
 import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../core/shared/operators';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
 import { ProcessBreadcrumbsService } from './process-breadcrumbs.service';
+import { RemoteData } from '../core/data/remote-data';
 
 /**
  * This class represents a resolver that requests a specific process before the route is activated
@@ -28,12 +29,11 @@ export class ProcessBreadcrumbResolver implements Resolve<BreadcrumbConfig<Proce
     const id = route.params.id;
 
     return this.processService.findById(route.params.id, true, false, followLink('script')).pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-      map((object: Process) => {
+      getFirstCompletedRemoteData(),
+      map((object: RemoteData<Process>) => {
         const fullPath = state.url;
         const url = fullPath.substr(0, fullPath.indexOf(id)) + id;
-        return { provider: this.breadcrumbService, key: object, url: url };
+        return { provider: this.breadcrumbService, key: object.payload, url: url };
       })
     );
   }
diff --git a/src/app/process-page/process-breadcrumbs.service.ts b/src/app/process-page/process-breadcrumbs.service.ts
index 26b0787a536..ac490138b8f 100644
--- a/src/app/process-page/process-breadcrumbs.service.ts
+++ b/src/app/process-page/process-breadcrumbs.service.ts
@@ -3,6 +3,7 @@ import { Injectable } from '@angular/core';
 import { BreadcrumbsProviderService } from '../core/breadcrumbs/breadcrumbsProviderService';
 import { Breadcrumb } from '../breadcrumbs/breadcrumb/breadcrumb.model';
 import { Process } from './processes/process.model';
+import { hasValue } from '../shared/empty.util';
 
 /**
  * Service to calculate process breadcrumbs for a single part of the route
@@ -16,6 +17,10 @@ export class ProcessBreadcrumbsService implements BreadcrumbsProviderService<Pro
    * @param url The url to use as a link for this breadcrumb
    */
   getBreadcrumbs(key: Process, url: string): Observable<Breadcrumb[]> {
-    return observableOf([new Breadcrumb(key.processId + ' - ' + key.scriptName, url)]);
+    if (hasValue(key)) {
+      return observableOf([new Breadcrumb(key.processId + ' - ' + key.scriptName, url)]);
+    } else {
+      return observableOf([]);
+    }
   }
 }