Partially revert PR #323

justified by plan to change the thumbnail of logbook to the file hash rather than the id
paulscherrerinstitute · Feb 5, 2024 · a25404b · a25404b
1 parent 8a64c87
commit a25404b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/scilog/src/app/core/model/logbooks.ts b/scilog/src/app/core/model/logbooks.ts
@@ -4,7 +4,6 @@ export interface Logbooks extends Basesnippets {
     name?: string;
     description?: string;
     thumbnail?: string;
-    thumbnailHash?: string;
     location?: string;
     readACL?: string[];
     updateACL?: string[];

diff --git a/scilog/src/app/overview/logbook-cover/logbook-cover.component.spec.ts b/scilog/src/app/overview/logbook-cover/logbook-cover.component.spec.ts
@@ -78,15 +78,4 @@ describe('LogbookWidgetComponent', () => {
     expect(isAnyEditAllowedSpy).toHaveBeenCalledTimes(1);
   });
 
-  [undefined, 'hash'].forEach((t, i) => {
-    it(`should getImageFromService ${i}`, async () => {
-      logbookItemDataSpy.getImage.calls.reset();
-      component.logbook.thumbnail = 'abc'
-      component.logbook.thumbnailHash = t
-      spyOn(component, 'createImageFromBlob');
-      await component.getImageFromService();
-      expect(logbookItemDataSpy.getImage).toHaveBeenCalledOnceWith(t ?? 'abc');
-    });
-  });
-
 });
diff --git a/scilog/src/app/overview/logbook-cover/logbook-cover.component.ts b/scilog/src/app/overview/logbook-cover/logbook-cover.component.ts
@@ -58,10 +58,7 @@ export class LogbookWidgetComponent implements OnInit {
 
   async getImageFromService() {
     this.isImageLoading = true;
-    let data = await this.logbookItemDataService.getImage(
-      this.logbook.thumbnailHash ?? 
-      this.logbook.thumbnail
-    );
+    let data = await this.logbookItemDataService.getImage(this.logbook.thumbnail);
     this.createImageFromBlob(data);
     this.isImageLoading = false;
   }