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

Added change detection to assure the form updates.

Browse Source
This commit is contained in:
Michael Spalti
2021-12-17 10:14:39 -08:00
parent e02bb75075
commit 4fbf99a451
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
View File

@@ -1,4 +1,10 @@
import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core'; import {
ChangeDetectionStrategy,
ChangeDetectorRef,
Component,
OnDestroy,
OnInit
} from '@angular/core';
import { Bitstream } from '../../core/shared/bitstream.model'; import { Bitstream } from '../../core/shared/bitstream.model';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { filter, map, mergeMap, switchMap } from 'rxjs/operators'; import { filter, map, mergeMap, switchMap } from 'rxjs/operators';
@@ -355,8 +361,10 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
*/ */
protected subs: Subscription[] = []; protected subs: Subscription[] = [];
constructor(private route: ActivatedRoute, constructor(private route: ActivatedRoute,
private router: Router, private router: Router,
private changeDetectorRef: ChangeDetectorRef,
private location: Location, private location: Location,
private formService: DynamicFormService, private formService: DynamicFormService,
private translate: TranslateService, private translate: TranslateService,
@@ -397,9 +405,9 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
).subscribe(([bitstream, allFormats]) => { ).subscribe(([bitstream, allFormats]) => {
this.bitstream = bitstream as Bitstream; this.bitstream = bitstream as Bitstream;
this.formats = allFormats.page; this.formats = allFormats.page;
this.setIiifStatus(this.bitstream); // testing
this.updateFormatModel(); this.updateFormatModel();
this.updateForm(this.bitstream); this.updateForm(this.bitstream);
this.setIiifStatus(this.bitstream);
}) })
); );
@@ -601,13 +609,17 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
} }
/** /**
* Checks bitstream mimetype to be sure it's an image, excludes bitstreams in the OTHERCONTENT bundle * Checks bitstream mimetype to be sure it's an image, excludes any bitstream in the
* since even if the bitstream is an image it will not be displayed within the viewer, * THUMBNAIL bundle or in the OTHERCONTENT bundle since in that case the image bitstream
* and finally verifies that the parent item itself is iiif-enabled. * it will never be displayed in the viewer, and last verifies that the parent item
* is iiif-enabled.
* @param bitstream * @param bitstream
*/ */
setIiifStatus(bitstream: Bitstream) { setIiifStatus(bitstream: Bitstream) {
const regexExcludeBundles = /OTHERCONTENT|THUMBNAIL/;
const regexIIIFItem = /(true|yes)/i;
const iiifCheck$ = this.bitstream.format.pipe( const iiifCheck$ = this.bitstream.format.pipe(
getFirstSucceededRemoteData(), getFirstSucceededRemoteData(),
filter((format: RemoteData<BitstreamFormat>) => format.payload.mimetype.includes('image/')), filter((format: RemoteData<BitstreamFormat>) => format.payload.mimetype.includes('image/')),
@@ -615,14 +627,13 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
this.bitstream.bundle.pipe( this.bitstream.bundle.pipe(
getFirstSucceededRemoteData(), getFirstSucceededRemoteData(),
filter((bundle: RemoteData<Bundle>) => filter((bundle: RemoteData<Bundle>) =>
this.dsoNameService.getName(bundle.payload) !== 'OTHERCONTENT'), this.dsoNameService.getName(bundle.payload).match(regexExcludeBundles) == null),
mergeMap((bundle: RemoteData<Bundle>) => bundle.payload.item.pipe( mergeMap((bundle: RemoteData<Bundle>) => bundle.payload.item.pipe(
getFirstSucceededRemoteData(), getFirstSucceededRemoteData(),
map((remoteData: RemoteData<Item>) => { map((remoteData: RemoteData<Item>) =>
const regex = /(true|yes)/i; (remoteData.payload.firstMetadataValue('dspace.iiif.enabled') &&
return (remoteData.payload.firstMetadataValue('dspace.iiif.enabled') && remoteData.payload.firstMetadataValue('dspace.iiif.enabled').match(regexIIIFItem) !== null)
remoteData.payload.firstMetadataValue('dspace.iiif.enabled').match(regex) !== null); )
})
)) ))
) )
) )
@@ -650,6 +661,8 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
iiifHeight: bitstream.firstMetadataValue('iiif.image.height') iiifHeight: bitstream.firstMetadataValue('iiif.image.height')
} }
}); });
// Assure that the form always detects the iiif addition.
this.changeDetectorRef.detectChanges();
} }
}); });