Skip to content

Commit ecb20bb

Browse files
108915: Fixed Proxy Timout error when retrieving a non-existing process
1 parent 252b367 commit ecb20bb

3 files changed

Lines changed: 19 additions & 12 deletions

File tree

src/app/core/data/processes/process-data.service.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,14 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
175175
)
176176
).subscribe((processRD: RemoteData<Process>) => {
177177
this.clearCurrentTimeout(processId);
178-
const nextTimeout = this.timer(() => {
179-
this.activelyBeingPolled.delete(processId);
180-
this.invalidateByHref(processRD.payload._links.self.href);
181-
}, pollingIntervalInMs);
182-
183-
this.activelyBeingPolled.set(processId, nextTimeout);
178+
if (processRD.hasSucceeded) {
179+
const nextTimeout = this.timer(() => {
180+
this.activelyBeingPolled.delete(processId);
181+
this.invalidateByHref(processRD.payload._links.self.href);
182+
}, pollingIntervalInMs);
183+
184+
this.activelyBeingPolled.set(processId, nextTimeout);
185+
}
184186
});
185187

186188
// When the process completes create a one off subscription (the `find` completes the

src/app/process-page/process-breadcrumb.resolver.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ import { Process } from './processes/process.model';
66
import { followLink } from '../shared/utils/follow-link-config.model';
77
import { ProcessDataService } from '../core/data/processes/process-data.service';
88
import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model';
9-
import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../core/shared/operators';
9+
import { getFirstCompletedRemoteData } from '../core/shared/operators';
1010
import { ProcessBreadcrumbsService } from './process-breadcrumbs.service';
11+
import { RemoteData } from '../core/data/remote-data';
1112

1213
/**
1314
* 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
2829
const id = route.params.id;
2930

3031
return this.processService.findById(route.params.id, true, false, followLink('script')).pipe(
31-
getFirstSucceededRemoteData(),
32-
getRemoteDataPayload(),
33-
map((object: Process) => {
32+
getFirstCompletedRemoteData(),
33+
map((object: RemoteData<Process>) => {
3434
const fullPath = state.url;
3535
const url = fullPath.substr(0, fullPath.indexOf(id)) + id;
36-
return { provider: this.breadcrumbService, key: object, url: url };
36+
return { provider: this.breadcrumbService, key: object.payload, url: url };
3737
})
3838
);
3939
}

src/app/process-page/process-breadcrumbs.service.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { Injectable } from '@angular/core';
33
import { BreadcrumbsProviderService } from '../core/breadcrumbs/breadcrumbsProviderService';
44
import { Breadcrumb } from '../breadcrumbs/breadcrumb/breadcrumb.model';
55
import { Process } from './processes/process.model';
6+
import { hasValue } from '../shared/empty.util';
67

78
/**
89
* Service to calculate process breadcrumbs for a single part of the route
@@ -16,6 +17,10 @@ export class ProcessBreadcrumbsService implements BreadcrumbsProviderService<Pro
1617
* @param url The url to use as a link for this breadcrumb
1718
*/
1819
getBreadcrumbs(key: Process, url: string): Observable<Breadcrumb[]> {
19-
return observableOf([new Breadcrumb(key.processId + ' - ' + key.scriptName, url)]);
20+
if (hasValue(key)) {
21+
return observableOf([new Breadcrumb(key.processId + ' - ' + key.scriptName, url)]);
22+
} else {
23+
return observableOf([]);
24+
}
2025
}
2126
}

0 commit comments

Comments
 (0)