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

#885 fix for linter

Browse Source
This commit is contained in:
Dániel Péter Sipos
2020-10-08 15:43:31 +02:00
parent a740453e88
commit 55cca0538a
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts
View File

@@ -37,5 +37,4 @@ describe('MediaViewerImageComponent', () => {
expect(component).toBeTruthy(); expect(component).toBeTruthy();
}); });
describe;
}); });

1
src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
View File

@@ -10,7 +10,6 @@ import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
}) })
export class MediaViewerImageComponent implements OnInit { export class MediaViewerImageComponent implements OnInit {
@Input() images: MediaViewerItem[]; @Input() images: MediaViewerItem[];
constructor() {}
galleryOptions: NgxGalleryOptions[]; galleryOptions: NgxGalleryOptions[];
galleryImages: NgxGalleryImage[]; galleryImages: NgxGalleryImage[];

1
src/app/+item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
View File

@@ -19,7 +19,6 @@ export class MediaViewerVideoComponent implements OnInit {
}; };
replacementThumbnail: string; replacementThumbnail: string;
constructor() {}
ngOnInit() { ngOnInit() {
this.isCollapsed = false; this.isCollapsed = false;

18
src/app/+item-page/media-viewer/media-viewer.component.ts
View File

@@ -1,6 +1,6 @@
import { Component, Input, OnInit } from '@angular/core'; import { Component, Input, OnInit } from '@angular/core';
import { BehaviorSubject, Observable } from 'rxjs'; import { BehaviorSubject, Observable } from 'rxjs';
import { filter, takeWhile } from 'rxjs/operators'; import { filter, take } from 'rxjs/operators';
import { BitstreamDataService } from '../../core/data/bitstream-data.service'; import { BitstreamDataService } from '../../core/data/bitstream-data.service';
import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service'; import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service';
import { PaginatedList } from '../../core/data/paginated-list'; import { PaginatedList } from '../../core/data/paginated-list';
@@ -9,7 +9,7 @@ import { Bitstream } from '../../core/shared/bitstream.model';
import { Item } from '../../core/shared/item.model'; import { Item } from '../../core/shared/item.model';
import { MediaViewerItem } from '../../core/shared/media-viewer-item.model'; import { MediaViewerItem } from '../../core/shared/media-viewer-item.model';
import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators'; import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
import { hasNoValue, hasValue } from '../../shared/empty.util'; import { hasValue } from '../../shared/empty.util';
@Component({ @Component({
selector: 'ds-media-viewer', selector: 'ds-media-viewer',
@@ -35,6 +35,7 @@ export class MediaViewerComponent implements OnInit {
this.loadRemoteData('ORIGINAL').subscribe((bitstreamsRD) => { this.loadRemoteData('ORIGINAL').subscribe((bitstreamsRD) => {
console.log(bitstreamsRD); console.log(bitstreamsRD);
this.loadRemoteData('THUMBNAIL').subscribe((thumbnailsRD) => { this.loadRemoteData('THUMBNAIL').subscribe((thumbnailsRD) => {
console.log(bitstreamsRD,thumbnailsRD)
for (let index = 0; index < bitstreamsRD.payload.page.length; index++) { for (let index = 0; index < bitstreamsRD.payload.page.length; index++) {
this.bitstreamFormatDataService this.bitstreamFormatDataService
.findByBitstream(bitstreamsRD.payload.page[index]) .findByBitstream(bitstreamsRD.payload.page[index])
@@ -62,15 +63,12 @@ export class MediaViewerComponent implements OnInit {
return this.bitstreamDataService return this.bitstreamDataService
.findAllByItemAndBundleName(this.item, bundleName) .findAllByItemAndBundleName(this.item, bundleName)
.pipe( .pipe(
filter((bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) => filter(
hasValue(bitstreamsRD) (bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) =>
hasValue(bitstreamsRD) &&
(hasValue(bitstreamsRD.error) || hasValue(bitstreamsRD.payload))
), ),
takeWhile( take(1)
(bitstreamsRD_1: RemoteData<PaginatedList<Bitstream>>) =>
hasNoValue(bitstreamsRD_1.payload) &&
hasNoValue(bitstreamsRD_1.error),
true
)
); );
} }
} }