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

Improved performance of mirador component by avoiding IIIF bundle bitstream lookup.

Browse Source
This commit is contained in:
Michael Spalti
2021-08-19 13:00:58 -07:00
parent 6019a21ebd
commit fb0d51c574
1 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/app/entity-groups/iiif-entities/mirador-viewer/mirador-viewer.component.ts
View File

@@ -1,4 +1,4 @@
import {ChangeDetectionStrategy, Component, Inject, Input, OnInit, PLATFORM_ID} from '@angular/core'; import { ChangeDetectionStrategy, Component, Inject, Input, OnInit, PLATFORM_ID } from '@angular/core';
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
import { Item } from '../../../core/shared/item.model'; import { Item } from '../../../core/shared/item.model';
import { environment } from '../../../../environments/environment'; import { environment } from '../../../../environments/environment';
@@ -10,7 +10,8 @@ import { Bitstream } from '../../../core/shared/bitstream.model';
import { hasValue } from '../../../shared/empty.util'; import { hasValue } from '../../../shared/empty.util';
import { Observable } from 'rxjs/internal/Observable'; import { Observable } from 'rxjs/internal/Observable';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';
import {isPlatformBrowser} from '@angular/common'; import { of } from 'rxjs';
import { isPlatformBrowser } from '@angular/common';
@Component({ @Component({
selector: 'ds-mirador-viewer', selector: 'ds-mirador-viewer',
@@ -75,22 +76,38 @@ export class MiradorViewerComponent implements OnInit {
if (window.innerWidth > 768) { if (window.innerWidth > 768) {
this.notMobile = true; this.notMobile = true;
} }
this.iframeViewerUrl = this.bitstreamDataService
.findAllByItemAndBundleName(this.item, 'IIIF', {}) // We need to set the multi property to true if the
.pipe( // item is searchable or the IIIF bundle contains more
getFirstCompletedRemoteData(), // than 3 bitstreams. The multi property controls the
map((bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) => { // Mirador side navigation panel.
if (hasValue(bitstreamsRD.payload)) { if (this.searchable) {
if (bitstreamsRD.payload.totalElements > 2) { // If it's searchable set multi to true.
/* IIIF bundle contains multiple images and optionally a const observable = of({multi: true});
* a single json file, thus multi is true only when the count is 3 or more . this.iframeViewerUrl = observable.pipe(
* multi=true enables the side navigation panel in Mirador. */ map((val) => {
this.multi = true; this.multi = val.multi;
}
}
return this.setURL(); return this.setURL();
}) })
); );
} else {
this.iframeViewerUrl = this.bitstreamDataService
.findAllByItemAndBundleName(this.item, 'IIIF', {})
.pipe(
getFirstCompletedRemoteData(),
map((bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) => {
if (hasValue(bitstreamsRD.payload)) {
if (bitstreamsRD.payload.totalElements > 2) {
/* IIIF bundle contains multiple images and optionally a
* a single json file, so multi is true only when the count
* is 3 or more. */
this.multi = true;
}
}
return this.setURL();
})
);
}
} }
} }
} }