From 653ceca5128f2709c23edc685219374e70d28bbf Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Fri, 6 Nov 2020 15:46:52 +0100
Subject: [PATCH 1/2] 74354: Handle redirects don't work

---
 src/app/core/data/dso-redirect-data.service.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/core/data/dso-redirect-data.service.ts b/src/app/core/data/dso-redirect-data.service.ts
index 87259a4279..774f1d404f 100644
--- a/src/app/core/data/dso-redirect-data.service.ts
+++ b/src/app/core/data/dso-redirect-data.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { take, tap } from 'rxjs/operators';
+import { filter, take, tap } from 'rxjs/operators';
 import { hasValue } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
@@ -56,7 +56,7 @@ export class DsoRedirectDataService extends DataService<any> {
   findByIdAndIDType(id: string, identifierType = IdentifierType.UUID): Observable<RemoteData<FindByIDRequest>> {
     this.setLinkPath(identifierType);
     return this.findById(id).pipe(
-      getFinishedRemoteData(),
+      filter((response) => hasValue(response.error) || hasValue(response.payload)),
       take(1),
       tap((response) => {
         if (response.hasSucceeded) {

From 0e05184d20d129de13f69546cc71161724e1cf96 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Thu, 12 Nov 2020 09:39:16 +0100
Subject: [PATCH 2/2] remove unused import

---
 src/app/core/data/dso-redirect-data.service.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/core/data/dso-redirect-data.service.ts b/src/app/core/data/dso-redirect-data.service.ts
index 774f1d404f..8ae7873c55 100644
--- a/src/app/core/data/dso-redirect-data.service.ts
+++ b/src/app/core/data/dso-redirect-data.service.ts
@@ -11,7 +11,6 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { CoreState } from '../core.reducers';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { getFinishedRemoteData } from '../shared/operators';
 import { DataService } from './data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
 import { RemoteData } from './remote-data';