From 24fdbaf0bd1cb5914b9a62607b8f4b759feb793f Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Thu, 23 May 2019 16:15:40 +0200
Subject: [PATCH] 62530: fixed loading issue

---
 src/app/+search-page/filtered-search-page.component.ts    | 6 +-----
 src/app/+search-page/search-page.component.html           | 2 +-
 src/app/+search-page/search-page.component.ts             | 7 +++----
 .../search-results/search-results.component.html          | 2 +-
 .../search-results/search-results.component.ts            | 4 +++-
 .../search-service/search-configuration.service.ts        | 1 -
 src/app/shared/services/route.service.ts                  | 8 +++-----
 7 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/app/+search-page/filtered-search-page.component.ts b/src/app/+search-page/filtered-search-page.component.ts
index 5e02b37215..66c619b823 100644
--- a/src/app/+search-page/filtered-search-page.component.ts
+++ b/src/app/+search-page/filtered-search-page.component.ts
@@ -9,9 +9,7 @@ import { SearchConfigurationService } from './search-service/search-configuratio
 import { Observable } from 'rxjs';
 import { PaginatedSearchOptions } from './paginated-search-options.model';
 import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component';
-import { map, switchMap } from 'rxjs/operators';
-import { getSucceededRemoteData } from '../core/shared/operators';
-import { isNotEmpty } from '../shared/empty.util';
+import { map } from 'rxjs/operators';
 
 /**
  * This component renders a simple item page.
@@ -33,7 +31,6 @@ import { isNotEmpty } from '../shared/empty.util';
 })
 
 export class FilteredSearchPageComponent extends SearchPageComponent implements OnInit {
-
   /**
    * The actual query for the fixed filter.
    * If empty, the query will be determined by the route parameter called 'filter'
@@ -59,7 +56,6 @@ export class FilteredSearchPageComponent extends SearchPageComponent implements
     super.ngOnInit();
   }
 
-
   /**
    * Get the current paginated search options after updating the fixed filter using the fixedFilterQuery input
    * This is to make sure the fixed filter is included in the paginated search options, as it is not part of any
diff --git a/src/app/+search-page/search-page.component.html b/src/app/+search-page/search-page.component.html
index c11e863429..b4d8c70f11 100644
--- a/src/app/+search-page/search-page.component.html
+++ b/src/app/+search-page/search-page.component.html
@@ -2,7 +2,7 @@
     <div class="search-page row">
         <ds-search-sidebar *ngIf="!(isXsOrSm$ | async)" class="col-{{sideBarWidth}} sidebar-md-sticky"
                            id="search-sidebar"
-                           [resultCount]="(resultsRD$ | async)?.payload.totalElements" [inPlaceSearch]="inPlaceSearch"></ds-search-sidebar>
+                           [resultCount]="(resultsRD$ | async)?.payload?.totalElements" [inPlaceSearch]="inPlaceSearch"></ds-search-sidebar>
         <div class="col-12 col-md-{{12 - sideBarWidth}}">
             <ds-search-form *ngIf="searchEnabled" id="search-form"
                             [query]="(searchOptions$ | async)?.query"
diff --git a/src/app/+search-page/search-page.component.ts b/src/app/+search-page/search-page.component.ts
index 2b343ac584..f23bff96f3 100644
--- a/src/app/+search-page/search-page.component.ts
+++ b/src/app/+search-page/search-page.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, Inject, Input, OnInit } from '@angular/core';
-import { Observable ,  Subscription ,  BehaviorSubject } from 'rxjs';
-import { switchMap, } from 'rxjs/operators';
+import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
+import { startWith, switchMap, } from 'rxjs/operators';
 import { PaginatedList } from '../core/data/paginated-list';
 import { RemoteData } from '../core/data/remote-data';
 import { DSpaceObject } from '../core/shared/dspace-object.model';
@@ -43,7 +43,6 @@ export const SEARCH_ROUTE = '/search';
  * It renders search results depending on the current search options
  */
 export class SearchPageComponent implements OnInit {
-
   /**
    * The current search results
    */
@@ -110,7 +109,7 @@ export class SearchPageComponent implements OnInit {
   ngOnInit(): void {
     this.searchOptions$ = this.getSearchOptions();
     this.sub = this.searchOptions$.pipe(
-      switchMap((options) => this.service.search(options).pipe(getSucceededRemoteData())))
+      switchMap((options) => this.service.search(options).pipe(getSucceededRemoteData(), startWith(observableOf(undefined)))))
       .subscribe((results) => {
         this.resultsRD$.next(results);
       });
diff --git a/src/app/+search-page/search-results/search-results.component.html b/src/app/+search-page/search-results/search-results.component.html
index d7ecb0357e..824d531155 100644
--- a/src/app/+search-page/search-results/search-results.component.html
+++ b/src/app/+search-page/search-results/search-results.component.html
@@ -6,7 +6,7 @@
   [objects]="searchResults"
   [hideGear]="true">
 </ds-viewable-collection></div>
-<ds-loading *ngIf="!searchResults || searchResults?.isLoading" message="{{'loading.search-results' | translate}}"></ds-loading>
+<ds-loading *ngIf="hasNoValue(searchResults) || hasNoValue(searchResults.payload) || searchResults.isLoading" message="{{'loading.search-results' | translate}}"></ds-loading>
 <ds-error *ngIf="searchResults?.hasFailed && (!searchResults?.error || searchResults?.error?.statusCode != 400)" message="{{'error.search-results' | translate}}"></ds-error>
 <div *ngIf="searchResults?.payload?.page.length == 0 || searchResults?.error?.statusCode == 400">
     {{ 'search.results.no-results' | translate }}
diff --git a/src/app/+search-page/search-results/search-results.component.ts b/src/app/+search-page/search-results/search-results.component.ts
index 9656ba9574..3ee2ed3e32 100644
--- a/src/app/+search-page/search-results/search-results.component.ts
+++ b/src/app/+search-page/search-results/search-results.component.ts
@@ -6,7 +6,7 @@ import { SetViewMode } from '../../shared/view-mode';
 import { SearchOptions } from '../search-options.model';
 import { SearchResult } from '../search-result.model';
 import { PaginatedList } from '../../core/data/paginated-list';
-import { isNotEmpty } from '../../shared/empty.util';
+import { hasNoValue, isNotEmpty } from '../../shared/empty.util';
 import { SortOptions } from '../../core/cache/models/sort-options.model';
 
 @Component({
@@ -22,6 +22,8 @@ import { SortOptions } from '../../core/cache/models/sort-options.model';
  * Component that represents all results from a search
  */
 export class SearchResultsComponent {
+  hasNoValue = hasNoValue;
+
   /**
    * The actual search result objects
    */
diff --git a/src/app/+search-page/search-service/search-configuration.service.ts b/src/app/+search-page/search-service/search-configuration.service.ts
index 41bcea66d6..b63dc4850d 100644
--- a/src/app/+search-page/search-service/search-configuration.service.ts
+++ b/src/app/+search-page/search-service/search-configuration.service.ts
@@ -229,7 +229,6 @@ export class SearchConfigurationService implements OnDestroy {
       this.getFiltersPart(),
       this.getFixedFilterPart()
     ).subscribe((update) => {
-      console.log(update);
       const currentValue: SearchOptions = this.searchOptions.getValue();
       const updatedValue: SearchOptions = Object.assign(currentValue, update);
       this.searchOptions.next(updatedValue);
diff --git a/src/app/shared/services/route.service.ts b/src/app/shared/services/route.service.ts
index 00d3e80c07..785c14b84c 100644
--- a/src/app/shared/services/route.service.ts
+++ b/src/app/shared/services/route.service.ts
@@ -21,11 +21,11 @@ import { coreSelector } from '../../core/core.selectors';
 
 export const routeParametersSelector = createSelector(
   coreSelector,
-  (state: CoreState) => state['route'].params
+  (state: CoreState) => state.route.params
 );
 export const queryParametersSelector = createSelector(
   coreSelector,
-  (state: CoreState) => state['route'].queryParams
+  (state: CoreState) => state.route.queryParams
 );
 
 export const routeParameterSelector = (key: string) => parameterSelector(key, routeParametersSelector);
@@ -96,9 +96,7 @@ export class RouteService {
   }
 
   getRouteParameterValue(paramName: string): Observable<string> {
-    const test = this.store.pipe(select(routeParameterSelector(paramName)));
-    test.subscribe((t) => {console.log('test', t)});
-    return test;
+    return this.store.pipe(select(routeParameterSelector(paramName)));
   }
 
   getRouteDataValue(datafield: string): Observable<any> {