From 7a4edd1567eb731b7827180526e66cf074fea14a Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Mon, 13 May 2019 10:39:01 +0200
Subject: [PATCH] 62180: fixed non-uuid paths

---
 .../collection-page.component.html            | 114 +++++++++---------
 .../collection-page.component.ts              |  34 +++---
 2 files changed, 78 insertions(+), 70 deletions(-)

diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html
index 6265b223d8..91239de17c 100644
--- a/src/app/+collection-page/collection-page.component.html
+++ b/src/app/+collection-page/collection-page.component.html
@@ -1,58 +1,62 @@
 <div class="container">
-  <div class="collection-page"
-       *ngVar="(collectionRD$ | async) as collectionRD">
-    <div *ngIf="collectionRD?.hasSucceeded" @fadeInOut>
-      <div *ngIf="collectionRD?.payload as collection">
-        <!-- Collection Name -->
-        <ds-comcol-page-header
-          [name]="collection.name">
-        </ds-comcol-page-header>
-        <!-- Browse-By Links -->
-        <ds-comcol-page-browse-by [id]="collection.id"></ds-comcol-page-browse-by>
-        <!-- Collection logo -->
-        <ds-comcol-page-logo *ngIf="logoRD$"
-                             [logo]="(logoRD$ | async)?.payload"
-                             [alternateText]="'Collection Logo'">
-        </ds-comcol-page-logo>
-        <!-- Introductionary text -->
-        <ds-comcol-page-content
-          [content]="collection.introductoryText"
-          [hasInnerHtml]="true">
-        </ds-comcol-page-content>
-        <!-- News -->
-        <ds-comcol-page-content
-          [content]="collection.sidebarText"
-          [hasInnerHtml]="true"
-          [title]="'community.page.news'">
-        </ds-comcol-page-content>
-        <!-- Copyright -->
-        <ds-comcol-page-content
-          [content]="collection.copyrightText"
-          [hasInnerHtml]="true">
-        </ds-comcol-page-content>
-        <!-- Licence -->
-        <ds-comcol-page-content
-          [content]="collection.dcLicense"
-          [title]="'collection.page.license'">
-        </ds-comcol-page-content>
-      </div>
+    <div class="collection-page"
+         *ngVar="(collectionRD$ | async) as collectionRD">
+        <div *ngIf="collectionRD?.hasSucceeded" @fadeInOut>
+            <div *ngIf="collectionRD?.payload as collection">
+                <!-- Collection Name -->
+                <ds-comcol-page-header
+                        [name]="collection.name">
+                </ds-comcol-page-header>
+                <!-- Browse-By Links -->
+                <ds-comcol-page-browse-by [id]="collection.id"></ds-comcol-page-browse-by>
+                <!-- Collection logo -->
+                <ds-comcol-page-logo *ngIf="logoRD$"
+                                     [logo]="(logoRD$ | async)?.payload"
+                                     [alternateText]="'Collection Logo'">
+                </ds-comcol-page-logo>
+                <!-- Introductionary text -->
+                <ds-comcol-page-content
+                        [content]="collection.introductoryText"
+                        [hasInnerHtml]="true">
+                </ds-comcol-page-content>
+                <!-- News -->
+                <ds-comcol-page-content
+                        [content]="collection.sidebarText"
+                        [hasInnerHtml]="true"
+                        [title]="'community.page.news'">
+                </ds-comcol-page-content>
+                <!-- Copyright -->
+                <ds-comcol-page-content
+                        [content]="collection.copyrightText"
+                        [hasInnerHtml]="true">
+                </ds-comcol-page-content>
+                <!-- Licence -->
+                <ds-comcol-page-content
+                        [content]="collection.dcLicense"
+                        [title]="'collection.page.license'">
+                </ds-comcol-page-content>
+            </div>
+            <br>
+            <ng-container *ngVar="(itemRD$ | async) as itemRD">
+                <div *ngIf="itemRD?.hasSucceeded" @fadeIn>
+                    <h2>{{'collection.page.browse.recent.head' | translate}}</h2>
+                    <ds-viewable-collection
+                            [config]="paginationConfig"
+                            [sortConfig]="sortConfig"
+                            [objects]="itemRD"
+                            [hideGear]="true"
+                            (paginationChange)="onPaginationChange($event)">
+                    </ds-viewable-collection>
+                </div>
+                <ds-error *ngIf="itemRD?.hasFailed"
+                          message="{{'error.recent-submissions' | translate}}"></ds-error>
+                <ds-loading *ngIf="!itemRD || itemRD.isLoading"
+                            message="{{'loading.recent-submissions' | translate}}"></ds-loading>
+            </ng-container>
+        </div>
+        <ds-error *ngIf="collectionRD?.hasFailed"
+                  message="{{'error.collection' | translate}}"></ds-error>
+        <ds-loading *ngIf="collectionRD?.isLoading"
+                    message="{{'loading.collection' | translate}}"></ds-loading>
     </div>
-    <ds-error *ngIf="collectionRD?.hasFailed" message="{{'error.collection' | translate}}"></ds-error>
-    <ds-loading *ngIf="collectionRD?.isLoading" message="{{'loading.collection' | translate}}"></ds-loading>
-    <br>
-    <ng-container *ngVar="(itemRD$ | async) as itemRD">
-      <div *ngIf="itemRD?.hasSucceeded" @fadeIn>
-        <h2>{{'collection.page.browse.recent.head' | translate}}</h2>
-        <ds-viewable-collection
-          [config]="paginationConfig"
-          [sortConfig]="sortConfig"
-          [objects]="itemRD"
-          [hideGear]="true"
-          (paginationChange)="onPaginationChange($event)">
-        </ds-viewable-collection>
-      </div>
-      <ds-error *ngIf="itemRD?.hasFailed" message="{{'error.recent-submissions' | translate}}"></ds-error>
-      <ds-loading *ngIf="!itemRD || itemRD.isLoading" message="{{'loading.recent-submissions' | translate}}"></ds-loading>
-    </ng-container>
-  </div>
 </div>
diff --git a/src/app/+collection-page/collection-page.component.ts b/src/app/+collection-page/collection-page.component.ts
index 164208566d..5fafa52594 100644
--- a/src/app/+collection-page/collection-page.component.ts
+++ b/src/app/+collection-page/collection-page.component.ts
@@ -16,8 +16,9 @@ import { Item } from '../core/shared/item.model';
 import { fadeIn, fadeInOut } from '../shared/animations/fade';
 import { hasValue, isNotEmpty } from '../shared/empty.util';
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
-import { filter, first, flatMap, map } from 'rxjs/operators';
-import { redirectToPageNotFoundOn404 } from '../core/shared/operators';
+import { filter, first, flatMap, map, switchMap } from 'rxjs/operators';
+import { PaginatedSearchOptions } from '../+search-page/paginated-search-options.model';
+import { getSucceededRemoteData, redirectToPageNotFoundOn404 } from '../core/shared/operators';
 
 @Component({
   selector: 'ds-collection-page',
@@ -36,7 +37,6 @@ export class CollectionPageComponent implements OnInit, OnDestroy {
   paginationConfig: PaginationComponentOptions;
   sortConfig: SortOptions;
   private subs: Subscription[] = [];
-  private collectionId: string;
 
   constructor(
     private collectionDataService: CollectionDataService,
@@ -77,24 +77,28 @@ export class CollectionPageComponent implements OnInit, OnDestroy {
           this.sortConfig,
           { direction: sortDirection, field: this.sortConfig.field }
         );
-        this.collectionRD$.subscribe((rd: RemoteData<Collection>) => {
-          this.collectionId = rd.payload.id;
-          this.updatePage({
-            pagination: pagination,
-            sort: sort
-          });
+        this.updatePage({
+          pagination: pagination,
+          sort: sort
         });
       })
     );
   }
 
   updatePage(searchOptions) {
-    this.itemRD$ = this.itemDataService.findAll({
-      scopeID: this.collectionId,
-      currentPage: searchOptions.pagination.currentPage,
-      elementsPerPage: searchOptions.pagination.pageSize,
-      sort: searchOptions.sort
-    });
+    this.itemRD$ = this.collectionRD$.pipe(
+      getSucceededRemoteData(),
+      map((rd) => rd.payload.id),
+      switchMap((id: string) => {
+        return this.itemDataService.findAll(
+          new PaginatedSearchOptions({
+            scope: id,
+            currentPage: searchOptions.pagination.currentPage,
+            elementsPerPage: searchOptions.pagination.pageSize,
+            sort: searchOptions.sort
+          }));
+      })
+    )
   }
 
   ngOnDestroy(): void {