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

fixed with subject instead of changedetection hack

Browse Source
This commit is contained in:
Lotte Hofstede
2018-06-01 10:06:50 +02:00
parent 733ca643cc
commit 90126888bb
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/+item-page/full/full-item-page.component.ts
View File

@@ -14,6 +14,7 @@ import { MetadataService } from '../../core/metadata/metadata.service';
import { fadeInOut } from '../../shared/animations/fade'; import { fadeInOut } from '../../shared/animations/fade';
import { hasValue } from '../../shared/empty.util'; import { hasValue } from '../../shared/empty.util';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
/** /**
* This component renders a simple item page. * This component renders a simple item page.
@@ -30,13 +31,12 @@ import { hasValue } from '../../shared/empty.util';
}) })
export class FullItemPageComponent extends ItemPageComponent implements OnInit { export class FullItemPageComponent extends ItemPageComponent implements OnInit {
itemRDObs: Observable<RemoteData<Item>>; itemRDObs: BehaviorSubject<RemoteData<Item>>;
metadataObs: Observable<Metadatum[]>; metadataObs: Observable<Metadatum[]>;
constructor(route: ActivatedRoute, items: ItemDataService, metadataService: MetadataService, constructor(route: ActivatedRoute, items: ItemDataService, metadataService: MetadataService) {
ref: ChangeDetectorRef) { super(route, items, metadataService);
super(route, items, metadataService, ref);
} }
/*** AoT inheritance fix, will hopefully be resolved in the near future **/ /*** AoT inheritance fix, will hopefully be resolved in the near future **/

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

@@ -13,6 +13,7 @@ import { MetadataService } from '../../core/metadata/metadata.service';
import { fadeInOut } from '../../shared/animations/fade'; 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';
/** /**
* This component renders a simple item page. * This component renders a simple item page.
@@ -32,17 +33,16 @@ export class ItemPageComponent implements OnInit {
private sub: any; private sub: any;
itemRDObs: Observable<RemoteData<Item>>;
thumbnailObs: Observable<Bitstream>; thumbnailObs: Observable<Bitstream>;
itemRDObs?: BehaviorSubject<RemoteData<Item>> = new BehaviorSubject(new RemoteData(true, true, false, null, null));
ElementViewMode = viewMode.ElementViewMode; ElementViewMode = viewMode.ElementViewMode;
constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,
private items: ItemDataService, private items: ItemDataService,
private metadataService: MetadataService, private metadataService: MetadataService,
private ref: ChangeDetectorRef
) { ) {
} }
@@ -56,8 +56,7 @@ export class ItemPageComponent implements OnInit {
initialize(params) { initialize(params) {
this.id = +params.id; this.id = +params.id;
this.itemRDObs = this.items.findById(params.id); this.items.findById(params.id).filter((rd) => hasValue(rd.payload)).first().subscribe((item) => this.itemRDObs.next(item));
this.ref.detectChanges();
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)