From c6494d3de3110c4790ffe25ba919a4021168832a Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@atmire.com>
Date: Fri, 16 Jun 2017 10:44:49 +0200
Subject: [PATCH] fixed an issue where incomplete mock data caused an error on
 collection homepages

---
 .../collection-page.component.ts              | 16 +++--
 src/backend/items.ts                          | 70 ++++++++++++++++++-
 2 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/src/app/collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts
index 42afe78881..a7148cbc74 100644
--- a/src/app/collection-page/collection-page.component.ts
+++ b/src/app/collection-page/collection-page.component.ts
@@ -1,19 +1,21 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute, Params } from '@angular/router';
 
 import { Collection } from "../core/shared/collection.model";
 import { Bitstream } from "../core/shared/bitstream.model";
 import { RemoteData } from "../core/data/remote-data";
 import { CollectionDataService } from "../core/data/collection-data.service";
+import { Subscription } from "rxjs/Subscription";
 
 @Component({
   selector: 'ds-collection-page',
   styleUrls: ['./collection-page.component.css'],
   templateUrl: './collection-page.component.html',
 })
-export class CollectionPageComponent implements OnInit {
+export class CollectionPageComponent implements OnInit, OnDestroy {
   collectionData: RemoteData<Collection>;
   logoData: RemoteData<Bitstream>;
+  private subs: Subscription[] = [];
 
   constructor(
     private collectionDataService: CollectionDataService,
@@ -24,12 +26,16 @@ export class CollectionPageComponent implements OnInit {
 
   ngOnInit(): void {
     this.route.params.subscribe((params: Params) => {
-      this.collectionData = this.collectionDataService.findById(params['id'])
-      this.collectionData.payload
-        .subscribe(collection => this.logoData = collection.logo);
+      this.collectionData = this.collectionDataService.findById(params['id']);
+      this.subs.push(this.collectionData.payload
+        .subscribe(collection => this.logoData = collection.logo));
     });
   }
 
+  ngOnDestroy(): void {
+    this.subs.forEach(sub => sub.unsubscribe());
+  }
+
   universalInit() {
   }
 }
diff --git a/src/backend/items.ts b/src/backend/items.ts
index 5460cafa81..45d71fa092 100644
--- a/src/backend/items.ts
+++ b/src/backend/items.ts
@@ -94,7 +94,6 @@ export const ITEMS = {
       ],
       "_embedded": {
         "parents": [
-
           {
             "_links": {
               "self": { "href": "/collections/6547" },
@@ -108,6 +107,28 @@ export const ITEMS = {
             "type": "collection",
             "name": "Another Test Collection",
             "handle": "123456789/6547",
+            "metadata": [
+              {
+                "key": "dc.rights",
+                "value": "<p>© 2005-2016 JOHN DOE SOME RIGHTS RESERVED</p>",
+                "language": null
+              },
+              {
+                "key": "dc.description",
+                "value": "<p class='lead'>Another introductory text dolor sit amet, consectetur adipiscing elit. Duis laoreet lorem erat, eget auctor est ultrices quis. Nullam ac tincidunt quam. In nec nisl odio. In egestas aliquam tincidunt.</p>\r\n<p>Integer vitae diam id dolor pharetra dignissim in sed enim. Vivamus pulvinar tristique sem a iaculis. Aenean ultricies dui vel facilisis laoreet. Integer porta erat eu ultrices rhoncus. Sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum.</p>",
+                "language": null
+              },
+              {
+                "key": "dc.description.abstract",
+                "value": "Another collection for testing purposes",
+                "language": null
+              },
+              {
+                "key": "dc.description.tableofcontents",
+                "value": "<p>Some more news sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum. Donec sed ultricies erat, nec sollicitudin mauris. Duis varius nulla quis quam vulputate, at hendrerit turpis rutrum. Integer nec facilisis sapien. Fusce fringilla malesuada lectus id pulvinar. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae</p>",
+                "language": null
+              }
+            ]
           }
         ],
         "bundles": [
@@ -239,13 +260,36 @@ export const ITEMS = {
               "items": [
                 { "href": "/items/8871" },
                 { "href": "/items/9978" }
-              ]
+              ],
+              "logo": { "href": "/bitstreams/4688" }
             },
             "id": "5179",
             "uuid": "9e32a2e2-6b91-4236-a361-995ccdc14c60",
             "type": "collection",
             "name": "A Test Collection",
             "handle": "123456789/5179",
+            "metadata": [
+              {
+                "key": "dc.rights",
+                "value": "<p>© 2005-2016 JOHN DOE SOME RIGHTS RESERVED</p>",
+                "language": null
+              },
+              {
+                "key": "dc.description",
+                "value": "<p class='lead'>An introductory text dolor sit amet, consectetur adipiscing elit. Duis laoreet lorem erat, eget auctor est ultrices quis. Nullam ac tincidunt quam. In nec nisl odio. In egestas aliquam tincidunt.</p>\r\n<p>Integer vitae diam id dolor pharetra dignissim in sed enim. Vivamus pulvinar tristique sem a iaculis. Aenean ultricies dui vel facilisis laoreet. Integer porta erat eu ultrices rhoncus. Sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum.</p>",
+                "language": null
+              },
+              {
+                "key": "dc.description.abstract",
+                "value": "A collection for testing purposes",
+                "language": null
+              },
+              {
+                "key": "dc.description.tableofcontents",
+                "value": "<p>Some news sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum. Donec sed ultricies erat, nec sollicitudin mauris. Duis varius nulla quis quam vulputate, at hendrerit turpis rutrum. Integer nec facilisis sapien. Fusce fringilla malesuada lectus id pulvinar. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae</p>",
+                "language": null
+              }
+            ]
           },
           {
             "_links": {
@@ -260,6 +304,28 @@ export const ITEMS = {
             "type": "collection",
             "name": "Another Test Collection",
             "handle": "123456789/6547",
+            "metadata": [
+              {
+                "key": "dc.rights",
+                "value": "<p>© 2005-2016 JOHN DOE SOME RIGHTS RESERVED</p>",
+                "language": null
+              },
+              {
+                "key": "dc.description",
+                "value": "<p class='lead'>Another introductory text dolor sit amet, consectetur adipiscing elit. Duis laoreet lorem erat, eget auctor est ultrices quis. Nullam ac tincidunt quam. In nec nisl odio. In egestas aliquam tincidunt.</p>\r\n<p>Integer vitae diam id dolor pharetra dignissim in sed enim. Vivamus pulvinar tristique sem a iaculis. Aenean ultricies dui vel facilisis laoreet. Integer porta erat eu ultrices rhoncus. Sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum.</p>",
+                "language": null
+              },
+              {
+                "key": "dc.description.abstract",
+                "value": "Another collection for testing purposes",
+                "language": null
+              },
+              {
+                "key": "dc.description.tableofcontents",
+                "value": "<p>Some more news sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum. Donec sed ultricies erat, nec sollicitudin mauris. Duis varius nulla quis quam vulputate, at hendrerit turpis rutrum. Integer nec facilisis sapien. Fusce fringilla malesuada lectus id pulvinar. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae</p>",
+                "language": null
+              }
+            ]
           }
         ]
       }