From 44733b987e2f90a8baebfd83acca8247f8b06976 Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.sweed@gmail.com>
Date: Fri, 15 May 2020 14:53:31 +0200
Subject: [PATCH] Thumbnails sort of show up

---
 extensions/default/src/getPanelModule.js      |  3 +--
 platform/core/src/classes/MetadataProvider.js | 25 +++----------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/extensions/default/src/getPanelModule.js b/extensions/default/src/getPanelModule.js
index 1881afe9a..7a4dbb527 100644
--- a/extensions/default/src/getPanelModule.js
+++ b/extensions/default/src/getPanelModule.js
@@ -14,7 +14,6 @@ import MeasurementTable from './MeasurementTable.js';
 // - show errors in UI for thumbnails if promise fails
 
 function getImageSrc(imageId, { cornerstone }) {
-  // TODO: Switch to async/await when it stops failing
   return new Promise((resolve, reject) => {
     cornerstone.loadAndCacheImage(imageId).then(image => {
       const canvas = document.createElement('canvas');
@@ -117,7 +116,7 @@ function StudyBrowserPanel({ getDataSources, commandsManager }) {
       modality: ds.Modality,
       date: ds.SeriesDate,
       numInstances: ds.numImageFrames,
-      //imageSrc,
+      imageSrc: thumbnailImageSrcMap.get(ds.displaySetInstanceUid),
     };
 
     const displaySetViewportData = viewportData.find(
diff --git a/platform/core/src/classes/MetadataProvider.js b/platform/core/src/classes/MetadataProvider.js
index d633c321f..2a00919e1 100644
--- a/platform/core/src/classes/MetadataProvider.js
+++ b/platform/core/src/classes/MetadataProvider.js
@@ -4,6 +4,7 @@ import dicomParser from 'dicom-parser';
 import getPixelSpacingInformation from '../utils/metadataProvider/getPixelSpacingInformation';
 import fetchPaletteColorLookupTableData from '../utils/metadataProvider/fetchPaletteColorLookupTableData';
 import fetchOverlayData from '../utils/metadataProvider/fetchOverlayData';
+import dicomMetadataStore from '../dicomMetadataStore';
 
 class MetadataProvider {
   constructor() {
@@ -22,7 +23,7 @@ class MetadataProvider {
     });
   }
 
-  async addInstance(dicomJSONDatasetOrP10ArrayBuffer, options = {}) {
+  /*async addInstance(dicomJSONDatasetOrP10ArrayBuffer, options = {}) {
     let dicomJSONDataset;
 
     // If Arraybuffer, parse to DICOMJSON before naturalizing.
@@ -61,7 +62,7 @@ class MetadataProvider {
     await this._checkBulkDataAndInlineBinaries(instance, options.server);
 
     return instance;
-  }
+  }*/
 
   addImageIdToUIDs(imageId, uids) {
     // This method is a fallback for when you don't have WADO-URI or WADO-RS.
@@ -122,7 +123,7 @@ class MetadataProvider {
 
     const { StudyInstanceUID, SeriesInstanceUID, SOPInstanceUID } = uids;
 
-    return this._getInstanceData(
+    return dicomMetadataStore.getInstance(
       StudyInstanceUID,
       SeriesInstanceUID,
       SOPInstanceUID
@@ -428,24 +429,6 @@ class MetadataProvider {
     return metadata;
   }
 
-  _getInstanceData(StudyInstanceUID, SeriesInstanceUID, SOPInstanceUID) {
-    const study = this.studies.get(StudyInstanceUID);
-
-    if (!study) {
-      return;
-    }
-
-    const series = study.series.get(SeriesInstanceUID);
-
-    if (!series) {
-      return;
-    }
-
-    const instance = series.instances.get(SOPInstanceUID);
-
-    return instance;
-  }
-
   _getUIDsFromImageID(imageId) {
     if (imageId.includes('wadors:')) {
       const strippedImageId = imageId.split('studies/')[1];