From 55cca0538a494adf6df852148266138fab84c24c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= <dsipos@monguz.hu>
Date: Thu, 8 Oct 2020 15:43:31 +0200
Subject: [PATCH] #885 fix for linter

---
 .../media-viewer-image.component.spec.ts       |  1 -
 .../media-viewer-image.component.ts            |  1 -
 .../media-viewer-video.component.ts            |  1 -
 .../media-viewer/media-viewer.component.ts     | 18 ++++++++----------
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts b/src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts
index 2cc02bd2ac..35a7835cd1 100644
--- a/src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts
+++ b/src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts
@@ -37,5 +37,4 @@ describe('MediaViewerImageComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  describe;
 });
diff --git a/src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts b/src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
index 78fef69765..06952fa4cd 100644
--- a/src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
+++ b/src/app/+item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
@@ -10,7 +10,6 @@ import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
 })
 export class MediaViewerImageComponent implements OnInit {
   @Input() images: MediaViewerItem[];
-  constructor() {}
 
   galleryOptions: NgxGalleryOptions[];
   galleryImages: NgxGalleryImage[];
diff --git a/src/app/+item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/app/+item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
index 12a55979bf..0cf2decc67 100644
--- a/src/app/+item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
+++ b/src/app/+item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
@@ -19,7 +19,6 @@ export class MediaViewerVideoComponent implements OnInit {
   };
 
   replacementThumbnail: string;
-  constructor() {}
 
   ngOnInit() {
     this.isCollapsed = false;
diff --git a/src/app/+item-page/media-viewer/media-viewer.component.ts b/src/app/+item-page/media-viewer/media-viewer.component.ts
index c6c336826a..ee17f01110 100644
--- a/src/app/+item-page/media-viewer/media-viewer.component.ts
+++ b/src/app/+item-page/media-viewer/media-viewer.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
 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 { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service';
 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 { MediaViewerItem } from '../../core/shared/media-viewer-item.model';
 import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { hasNoValue, hasValue } from '../../shared/empty.util';
+import { hasValue } from '../../shared/empty.util';
 
 @Component({
   selector: 'ds-media-viewer',
@@ -35,6 +35,7 @@ export class MediaViewerComponent implements OnInit {
     this.loadRemoteData('ORIGINAL').subscribe((bitstreamsRD) => {
       console.log(bitstreamsRD);
       this.loadRemoteData('THUMBNAIL').subscribe((thumbnailsRD) => {
+        console.log(bitstreamsRD,thumbnailsRD)
         for (let index = 0; index < bitstreamsRD.payload.page.length; index++) {
           this.bitstreamFormatDataService
             .findByBitstream(bitstreamsRD.payload.page[index])
@@ -62,15 +63,12 @@ export class MediaViewerComponent implements OnInit {
     return this.bitstreamDataService
       .findAllByItemAndBundleName(this.item, bundleName)
       .pipe(
-        filter((bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) =>
-          hasValue(bitstreamsRD)
+        filter(
+          (bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) =>
+            hasValue(bitstreamsRD) &&
+            (hasValue(bitstreamsRD.error) || hasValue(bitstreamsRD.payload))
         ),
-        takeWhile(
-          (bitstreamsRD_1: RemoteData<PaginatedList<Bitstream>>) =>
-            hasNoValue(bitstreamsRD_1.payload) &&
-            hasNoValue(bitstreamsRD_1.error),
-          true
-        )
+        take(1)
       );
   }
 }