hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-13 04:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'entity-page-change-fix' into entities-or2018

Browse Source
This commit is contained in:
Lotte Hofstede
2018-06-01 12:06:42 +02:00
parent 01ab627a51 8ab6eb6ec8
commit 971cf0ebb7
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/+item-page/simple/item-page.component.html
View File

@@ -1,9 +1,9 @@
<div class="container" *ngVar="(itemRDObs | async) as itemRD"> <div class="container" *ngVar="(itemRDObs | async) as itemRD">
<div class="item-page" *ngIf="itemRD?.hasSucceeded" @fadeInOut> <div class="item-page" *ngIf="(itemRDObs | async)?.hasSucceeded" @fadeInOut>
<div *ngIf="itemRD?.payload as item"> <div *ngIf="itemRD?.payload as item">
<ds-entity-type-switcher [object]="item" [viewMode]="ElementViewMode.Full"></ds-entity-type-switcher> <ds-entity-type-switcher [object]="(itemRDObs | async)?.payload" [viewMode]="ElementViewMode.Full"></ds-entity-type-switcher>
</div> </div>
</div> </div>
<ds-error *ngIf="itemRD?.hasFailed" message="{{'error.item' | translate}}"></ds-error> <ds-error *ngIf="(itemRDObs | async)?.hasFailed" message="{{'error.item' | translate}}"></ds-error>
<ds-loading *ngIf="itemRD?.isLoading" message="{{'loading.item' | translate}}"></ds-loading> <ds-loading *ngIf="(itemRDObs | async)?.isLoading" message="{{'loading.item' | translate}}"></ds-loading>
</div> </div>

16
src/app/+item-page/simple/item-page.component.ts
View File

@@ -14,6 +14,7 @@ import { fadeInOut } from '../../shared/animations/fade';
import { hasValue } from '../../shared/empty.util'; import { hasValue } from '../../shared/empty.util';
import * as viewMode from '../../shared/view-mode'; import * as viewMode from '../../shared/view-mode';
import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { Subscription } from 'rxjs/Subscription';
/** /**
* This component renders a simple item page. * This component renders a simple item page.
@@ -31,11 +32,11 @@ export class ItemPageComponent implements OnInit {
id: number; id: number;
private sub: any; private sub: Subscription;
private itemSub: Subscription;
thumbnailObs: Observable<Bitstream>; thumbnailObs: Observable<Bitstream>;
itemRDObs?: BehaviorSubject<RemoteData<Item>> = new BehaviorSubject(new RemoteData(true, true, false, null, null)); itemRDObs: BehaviorSubject<RemoteData<Item>> = new BehaviorSubject(new RemoteData(true, true, undefined, null, null));
ElementViewMode = viewMode.ElementViewMode; ElementViewMode = viewMode.ElementViewMode;
@@ -43,9 +44,7 @@ export class ItemPageComponent implements OnInit {
private route: ActivatedRoute, private route: ActivatedRoute,
private items: ItemDataService, private items: ItemDataService,
private metadataService: MetadataService, private metadataService: MetadataService,
) { ) { }
}
ngOnInit(): void { ngOnInit(): void {
this.sub = this.route.params.subscribe((params) => { this.sub = this.route.params.subscribe((params) => {
@@ -56,7 +55,10 @@ export class ItemPageComponent implements OnInit {
initialize(params) { initialize(params) {
this.id = +params.id; this.id = +params.id;
this.items.findById(params.id).filter((rd) => hasValue(rd.payload)).first().subscribe((item) => this.itemRDObs.next(item)); if (hasValue(this.itemSub)) {
this.itemSub.unsubscribe();
}
this.itemSub = this.items.findById(params.id).subscribe((item) => this.itemRDObs.next(item));
this.metadataService.processRemoteData(this.itemRDObs); this.metadataService.processRemoteData(this.itemRDObs);
this.thumbnailObs = this.itemRDObs this.thumbnailObs = this.itemRDObs
.map((rd: RemoteData<Item>) => rd.payload) .map((rd: RemoteData<Item>) => rd.payload)