From 6df1ee64f27a844aa4a80118d8fb6000fb298406 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Mon, 2 Aug 2021 09:18:21 +0200
Subject: [PATCH] [DSC-184] Fix issue with mydpsace page that hangs forever on
 error response

---
 src/app/my-dspace-page/my-dspace-page.component.html |  4 ++--
 src/app/my-dspace-page/my-dspace-page.component.ts   | 11 +++++------
 src/app/shared/error/error.component.html            |  6 +++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/app/my-dspace-page/my-dspace-page.component.html b/src/app/my-dspace-page/my-dspace-page.component.html
index 4aadb16255..5a15abcc08 100644
--- a/src/app/my-dspace-page/my-dspace-page.component.html
+++ b/src/app/my-dspace-page/my-dspace-page.component.html
@@ -4,7 +4,7 @@
       <ds-search-sidebar *ngIf="!(isXsOrSm$ | async)" class="col-3 sidebar-md-sticky"
                          id="search-sidebar"
                          [configurationList]="(configurationList$ | async)"
-                         [resultCount]="(resultsRD$ | async)?.payload.totalElements"
+                         [resultCount]="(resultsRD$ | async)?.payload?.totalElements"
                          [viewModeList]="viewModeList"
                          [searchOptions]="(searchOptions$ | async)"
                          [sortOptions]="(sortOptions$ | async)"
@@ -27,7 +27,7 @@
                   <ds-search-sidebar *ngIf="(isXsOrSm$ | async)" class="col-12"
                                      id="search-sidebar-sm"
                                      [configurationList]="(configurationList$ | async)"
-                                     [resultCount]="(resultsRD$ | async)?.payload.totalElements"
+                                     [resultCount]="(resultsRD$ | async)?.payload?.totalElements"
                                      (toggleSidebar)="closeSidebar()"
                                      [ngClass]="{'active': !(isSidebarCollapsed() | async)}"
                                      [searchOptions]="(searchOptions$ | async)"
diff --git a/src/app/my-dspace-page/my-dspace-page.component.ts b/src/app/my-dspace-page/my-dspace-page.component.ts
index 90163abc5e..89a4023be8 100644
--- a/src/app/my-dspace-page/my-dspace-page.component.ts
+++ b/src/app/my-dspace-page/my-dspace-page.component.ts
@@ -19,7 +19,7 @@ import { PaginatedSearchOptions } from '../shared/search/paginated-search-option
 import { SearchService } from '../core/shared/search/search.service';
 import { SidebarService } from '../shared/sidebar/sidebar.service';
 import { hasValue } from '../shared/empty.util';
-import { getFirstSucceededRemoteData } from '../core/shared/operators';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
 import { MyDSpaceResponseParsingService } from '../core/data/mydspace-response-parsing.service';
 import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
 import { RoleType } from '../core/roles/role-types';
@@ -30,7 +30,7 @@ import { MyDSpaceRequest } from '../core/data/request.models';
 import { SearchResult } from '../shared/search/search-result.model';
 import { Context } from '../core/shared/context.model';
 import { SortOptions } from '../core/cache/models/sort-options.model';
-import { RouteService } from '../core/services/route.service';
+import { SearchObjects } from '../shared/search/search-objects.model';
 
 export const MYDSPACE_ROUTE = '/mydspace';
 export const SEARCH_CONFIG_SERVICE: InjectionToken<SearchConfigurationService> = new InjectionToken<SearchConfigurationService>('searchConfigurationService');
@@ -111,8 +111,7 @@ export class MyDSpacePageComponent implements OnInit {
   constructor(private service: SearchService,
               private sidebarService: SidebarService,
               private windowService: HostWindowService,
-              @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: MyDSpaceConfigurationService,
-              private routeService: RouteService) {
+              @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: MyDSpaceConfigurationService) {
     this.isXsOrSm$ = this.windowService.isXsOrSm();
     this.service.setServiceOptions(MyDSpaceResponseParsingService, MyDSpaceRequest);
   }
@@ -134,8 +133,8 @@ export class MyDSpacePageComponent implements OnInit {
     this.searchOptions$ = this.searchConfigService.paginatedSearchOptions;
     this.sub = this.searchOptions$.pipe(
       tap(() => this.resultsRD$.next(null)),
-      switchMap((options: PaginatedSearchOptions) => this.service.search(options).pipe(getFirstSucceededRemoteData())))
-      .subscribe((results) => {
+      switchMap((options: PaginatedSearchOptions) => this.service.search(options).pipe(getFirstCompletedRemoteData())))
+      .subscribe((results: RemoteData<SearchObjects<DSpaceObject>>) => {
         this.resultsRD$.next(results);
       });
 
diff --git a/src/app/shared/error/error.component.html b/src/app/shared/error/error.component.html
index d41760e258..dd75cb4b1b 100644
--- a/src/app/shared/error/error.component.html
+++ b/src/app/shared/error/error.component.html
@@ -1,3 +1,3 @@
-<div>
-  <label>{{ message }}</label>
-</div>
+<ds-alert [type]="'alert-danger'" [dismissible]="false">
+  {{ message }}
+</ds-alert>