40416: normalized collection bug

resources/i18n/en.json

@@ -16,7 +16,8 @@
       "author": "Author",
       "abstract": "Abstract",
       "date": "Date",
-      "uri": "URI"
+      "uri": "URI",
+      "files": "Files"
     }
   },
 

src/app/core/cache/models/normalized-bitstream.model.ts

@@ -10,6 +10,7 @@ export class NormalizedBitstream extends NormalizedDSpaceObject {
     /**
      * The size of this bitstream in bytes(?)
      */
+    @autoserialize
     size: number;
 
     /**

src/app/core/cache/models/normalized-dspace-object.model.ts

@@ -42,6 +42,7 @@ export abstract class NormalizedDSpaceObject implements CacheableObject {
   /**
    * An array of DSpaceObjects that are direct parents of this DSpaceObject
    */
+  @autoserialize
   parents: Array<string>;
 
   /**

src/app/core/cache/models/normalized-item.model.ts

@@ -3,6 +3,7 @@ import { NormalizedDSpaceObject } from "./normalized-dspace-object.model";
 import { Item } from "../../shared/item.model";
 import { mapsTo, relationship } from "../builders/build-decorators";
 import { NormalizedBundle } from "./normalized-bundle.model";
+import { NormalizedCollection } from "./normalized-collection.model";
 
 @mapsTo(Item)
 @inheritSerialization(NormalizedDSpaceObject)
@@ -32,6 +33,8 @@ export class NormalizedItem extends NormalizedDSpaceObject {
   /**
    * An array of Collections that are direct parents of this Item
    */
+  @autoserialize
+  @relationship(NormalizedCollection)
   parents: Array<string>;
 
   /**

src/app/core/shared/bitstream.model.ts

@@ -1,5 +1,6 @@
 import { DSpaceObject } from "./dspace-object.model";
 import { Bundle } from "./bundle.model";
+import { RemoteData } from "../data/remote-data";
 
 export class Bitstream extends DSpaceObject {
 
@@ -26,7 +27,7 @@ export class Bitstream extends DSpaceObject {
     /**
      * An array of Bundles that are direct parents of this Bitstream
      */
-    parents: Array<Bundle>;
+    parents: Array<RemoteData<Bundle>>;
 
     /**
      * The Bundle that owns this Bitstream

src/app/core/shared/bundle.model.ts

@@ -14,7 +14,7 @@ export class Bundle extends DSpaceObject {
   /**
    * An array of Items that are direct parents of this Bundle
    */
-  parents: Array<Item>;
+  parents: Array<RemoteData<Item>>;
 
   /**
    * The Item that owns this Bundle

src/app/core/shared/collection.model.ts

@@ -58,7 +58,7 @@ export class Collection extends DSpaceObject {
   /**
    * An array of Collections that are direct parents of this Collection
    */
-  parents: Array<Collection>;
+  parents: Array<RemoteData<Collection>>;
 
   /**
    * The Collection that owns this Collection

src/app/core/shared/dspace-object.model.ts

@@ -2,6 +2,7 @@ import { autoserialize, autoserializeAs } from "cerialize";
 import { Metadatum } from "./metadatum.model"
 import { isEmpty, isNotEmpty } from "../../shared/empty.util";
 import { CacheableObject } from "../cache/object-cache.reducer";
+import { RemoteData } from "../data/remote-data";
 
 /**
  * An abstract model class for a DSpaceObject.
@@ -43,7 +44,7 @@ export abstract class DSpaceObject implements CacheableObject {
     /**
      * An array of DSpaceObjects that are direct parents of this DSpaceObject
      */
-    parents: Array<DSpaceObject>;
+    parents: Array<RemoteData<DSpaceObject>>;
 
     /**
      * The DSpaceObject that owns this DSpaceObject

src/app/core/shared/item.model.ts

@@ -33,8 +33,7 @@ export class Item extends DSpaceObject {
     /**
      * An array of Collections that are direct parents of this Item
      */
-    @autoserializeAs(Collection)
-    parents: Array<Collection>;
+    parents: Array<RemoteData<Collection>>;
 
     /**
      * The Collection that owns this Item
@@ -50,14 +49,8 @@ export class Item extends DSpaceObject {
         );
     }
 
-    getFiles(): Array<Observable<Bitstream>> {
-        return this.getBundle("ORIGINAL").map(bundle => bundle.bitstreams.map(bitstream => bitstream.payload.flatMap(b => b))).;
-        // const bundle: Observable<Bundle> = this.getBundle("ORIGINAL");
-        // return bundle.map(
-        //     bundle => bundle.bitstreams.flatMap(
-        //         bitstream => bitstream.payload
-        //     )
-        // );
+    getFiles(): Observable<Array<Observable<Bitstream>>> {
+        return this.getBundle("ORIGINAL").map(bundle => bundle.bitstreams.map(bitstream => bitstream.payload));
     }
 
     getBundle(name: String): Observable<Bundle> {
@@ -71,4 +64,8 @@ export class Item extends DSpaceObject {
             });
     }
 
+    getCollections(): Array<Observable<Collection>> {
+        return this.parents.map(c => c.payload.map(p => p));
+    }
+
 }

src/app/item-page/collections/collections.component.html

@@ -0,0 +1,7 @@
+<ds-metadata-field-wrapper [label]="label | translate">
+    <div class="collections">
+        <a *ngFor="let collection of collections" [href]="(collection)?.self">
+            <span>{{(collection)?.name}}</span>
+        </a>
+    </div>
+</ds-metadata-field-wrapper>

src/app/item-page/collections/collections.component.ts

@@ -0,0 +1,31 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { Collection } from "../../core/shared/collection.model";
+import { Observable } from "rxjs";
+import { Item } from "../../core/shared/item.model";
+
+@Component({
+    selector: 'ds-item-page-collections',
+    templateUrl: './collections.component.html'
+})
+export class CollectionsComponent implements OnInit {
+
+    @Input() item: Item;
+    label : string = "item.page.collections";
+    collections: Array<Observable<Collection>>;
+
+    constructor() {
+        this.universalInit();
+
+    }
+
+    universalInit() {
+    }
+
+    ngOnInit(): void {
+        this.collections = this.item.getCollections();
+        this.collections[0].subscribe(d => console.log("TEST TEST LOREM IPSUM LALALALAL"));
+    }
+
+
+
+}

src/app/item-page/file-section/file-section.component.html

@@ -1,4 +1,8 @@
-<div class="item-page-specific-field">
-    <ds-metadata-uri-values [values]="item.getBundle("ORIGINAL")" [separator]="separator" [label]="label"></ds-metadata-uri-values>
-</div>
-
+<ds-metadata-field-wrapper [label]="label | translate">
+    <div class="file-section">
+        <a *ngFor="let file of (files | async)" [href]="(file | async)?.retrieve">
+            <span>{{(file | async)?.name}}</span>
+            <span>({{((file | async)?.size) | dsFileSize }})</span>
+        </a>
+    </div>
+</ds-metadata-field-wrapper>

src/app/item-page/file-section/file-section.component.ts

@@ -1,16 +1,17 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { Bitstream } from "../../core/shared/bitstream.model";
 import { Item } from "../../core/shared/item.model";
+import { Observable } from "rxjs";
 
 @Component({
-  selector: 'ds-metadata-field-wrapper',
-  styleUrls: ['./metadata-field-wrapper.component.css'],
-  templateUrl: './metadata-field-wrapper.component.html'
+  selector: 'ds-item-page-file-section',
+  templateUrl: './file-section.component.html'
 })
-export class MetadataFieldWrapperComponent {
+export class FileSectionComponent implements OnInit {
 
   @Input() item: Item;
-  files: Array<Bitstream>;
+  label : string = "item.page.files";
+  files: Observable<Array<Observable<Bitstream>>>;
 
   constructor() {
     this.universalInit();
@@ -18,7 +19,11 @@ export class MetadataFieldWrapperComponent {
   }
 
   universalInit() {
-    this.files = this.item.getBundle("ORIGINAL").map(bundle => bundle.bitstreams.map(bitstream => bitstream.payload));
   }
 
+  ngOnInit(): void {
+    this.files = this.item.getFiles();
+  }
+
+
 }

src/app/item-page/item-page.component.html

@@ -1,10 +1,17 @@
 <div class="item-page" *ngIf="item.hasSucceeded | async">
-  Item page component
-  <ds-thumbnail [thumbnail]="thumbnail | async"></ds-thumbnail>
     <ds-item-page-title-field [item]="item.payload | async"></ds-item-page-title-field>
+    <div class="row">
+        <div class="col-xs-12 col-md-4">
+            <ds-thumbnail [thumbnail]="thumbnail | async"></ds-thumbnail>
+            <ds-item-page-file-section [item]="item.payload | async"></ds-item-page-file-section>
             <ds-item-page-date-field [item]="item.payload | async"></ds-item-page-date-field>
             <ds-item-page-author-field [item]="item.payload | async"></ds-item-page-author-field>
-  <ds-item-page-abstract-field [item]="item.payload | async"></ds-item-page-abstract-field>
+        </div>
+        <div class="col-xs-12 col-md-6">
+            <ds-item-page-abstract-field
+                    [item]="item.payload | async"></ds-item-page-abstract-field>
             <ds-item-page-uri-field [item]="item.payload | async"></ds-item-page-uri-field>
-  <ds-item-page-file-section [item]="item.payload | async"></ds-item-page-file-section>
+            <ds-item-page-collections [item]="item.payload | async"></ds-item-page-collections>
+        </div>
+    </div>
 </div>

src/app/item-page/item-page.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Item } from "../core/shared/item.model";
 import { ItemDataService } from "../core/data/item-data.service";
@@ -10,7 +10,6 @@ import { Bitstream } from "../core/shared/bitstream.model";
     selector: 'ds-item-page',
     styleUrls: ['./item-page.component.css'],
     templateUrl: './item-page.component.html',
-    // changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ItemPageComponent implements OnInit {
 

src/app/item-page/item-page.module.ts

@@ -13,6 +13,8 @@ import { ItemPageTitleFieldComponent } from './specific-field/title/item-page-ti
 import { ItemPageSpecificFieldComponent } from './specific-field/item-page-specific-field.component';
 import { SharedModule } from './../shared/shared.module';
 import { ThumbnailComponent } from "../thumbnail/thumbnail.component";
+import { FileSectionComponent } from "./file-section/file-section.component";
+import { CollectionsComponent } from "./collections/collections.component";
 
 @NgModule({
     declarations: [
@@ -27,6 +29,8 @@ import { ThumbnailComponent } from "../thumbnail/thumbnail.component";
         ItemPageTitleFieldComponent,
         ItemPageSpecificFieldComponent,
         ThumbnailComponent,
+        FileSectionComponent,
+        CollectionsComponent
     ],
     imports: [
         ItemPageRoutingModule,

src/app/item-page/metadata-field-wrapper/metadata-field-wrapper.component.scss

@@ -1 +1,6 @@
 @import '../../../styles/variables.scss';
+:host {
+    .simple-view-element {
+        margin-bottom: 15px;
+    }
+}

src/app/item-page/specific-field/abstract/item-page-abstract-field.component.ts

@@ -9,6 +9,7 @@ import { ItemPageSpecificFieldComponent } from "../item-page-specific-field.comp
 export class ItemPageAbstractFieldComponent extends ItemPageSpecificFieldComponent implements OnInit {
 
     @Input() item: Item;
+    separator : string;
 
     fields : string[] = [
         "dc.description.abstract"

src/app/item-page/specific-field/date/item-page-date-field.component.ts

@@ -9,6 +9,7 @@ import { ItemPageSpecificFieldComponent } from "../item-page-specific-field.comp
 export class ItemPageDateFieldComponent extends ItemPageSpecificFieldComponent implements OnInit {
 
     @Input() item: Item;
+    separator : string;
 
     fields : string[] = [
         "dc.date.issued"

src/app/item-page/specific-field/title/item-page-title-field.component.ts

@@ -9,6 +9,7 @@ import { ItemPageSpecificFieldComponent } from "../item-page-specific-field.comp
 export class ItemPageTitleFieldComponent extends ItemPageSpecificFieldComponent implements OnInit {
 
     @Input() item: Item;
+    separator : string;
 
     fields : string[] = [
         "dc.title"

src/app/item-page/specific-field/uri/item-page-uri-field.component.ts

@@ -9,6 +9,8 @@ import { ItemPageSpecificFieldComponent } from "../item-page-specific-field.comp
 export class ItemPageUriFieldComponent extends ItemPageSpecificFieldComponent implements OnInit {
 
   @Input() item: Item;
+  separator : string;
+
 
   fields : string[] = [
     "dc.identifier.uri"

src/app/shared/shared.module.ts

@@ -7,6 +7,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from 'ng2-translate/ng2-translate';
 
 import { ApiService } from './api.service';
+import { FileSizePipe } from "./utils/file-size-pipe";
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -19,6 +20,7 @@ const MODULES = [
 ];
 
 const PIPES = [
+    FileSizePipe
   // put pipes here
 ];
 

src/app/shared/utils/file-size-pipe.ts

@@ -0,0 +1,36 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+/*
+ * Convert bytes into largest possible unit.
+ * Takes an precision argument that defaults to 2.
+ * Usage:
+ *   bytes | fileSize:precision
+ * Example:
+ *   {{ 1024 |  fileSize}}
+ *   formats to: 1 KB
+ */
+@Pipe({name: 'dsFileSize'})
+export class FileSizePipe implements PipeTransform {
+
+    private units = [
+        'bytes',
+        'KiB',
+        'MiB',
+        'GiB',
+        'TiB',
+        'PiB'
+    ];
+
+    transform(bytes: number = 0, precision: number = 2 ) : string {
+        if ( isNaN( parseFloat( String(bytes) )) || ! isFinite( bytes ) ) return '?';
+
+        let unit = 0;
+
+        while ( bytes >= 1024 ) {
+            bytes /= 1024;
+            unit ++;
+        }
+
+        return bytes.toFixed( + precision ) + ' ' + this.units[ unit ];
+    }
+}

src/backend/items.ts

@@ -4,7 +4,7 @@ export const ITEMS = [
       "self": {
         "href": "/items/8871"
       },
-      "collections": [
+      "parents": [
         {
           "href": "/collections/5179"
         },
@@ -96,7 +96,7 @@ export const ITEMS = [
       "self": {
         "href": "/items/9978"
       },
-      "collections": [
+      "parents": [
         {
           "href": "/collections/5179"
         },