Move files around to confuse James and Erik

extensions/default/src/DicomWebDataSource/index.js

@@ -6,7 +6,7 @@ import {
   processResults,
   processSeriesResults,
 } from './qido.js';
-import { dicomMetadataStore, IWebApiDataSource, utils } from '@ohif/core';
+import { DicomMetadataStore, IWebApiDataSource, utils } from '@ohif/core';
 
 import getImageId from './utils/getImageId';
 import * as dcmjs from 'dcmjs';
@@ -89,7 +89,7 @@ function createDicomWebApi(dicomWebConfig) {
       series: {
         // TODO: change queryParams to `StudyInstanceUID` for now?
         // Conduct query, return a promise like others
-        // Await this call and add to dicomMetadataStore after receiving result
+        // Await this call and add to DicomMetadataStore after receiving result
         metadata: (queryParams, callback) => {
           let { StudyInstanceUIDs } = urlUtil.parse(queryParams, true);
 
@@ -104,7 +104,7 @@ function createDicomWebApi(dicomWebConfig) {
           const storeInstances = instances => {
             const naturalizedInstances = instances.map(naturalizeDataset);
 
-            dicomMetadataStore.addInstances(naturalizedInstances);
+            DicomMetadataStore.addInstances(naturalizedInstances);
             callback(naturalizedInstances);
           };
 
@@ -146,7 +146,7 @@ function createDicomWebApi(dicomWebConfig) {
       function storeInstances(instances) {
         const naturalizedInstances = instances.map(naturalizeDataset);
 
-        dicomMetadataStore.addInstances(naturalizedInstances);
+        DicomMetadataStore.addInstances(naturalizedInstances);
       }
 
       seriesPromises.forEach(async seriesPromise => {

extensions/default/src/DicomWebDataSource/wado/retrieveMetadataLoaderAsync.js

@@ -1,10 +1,6 @@
 import RetrieveMetadataLoader from './retrieveMetadataLoader';
 //import { sortStudySeries, sortingCriteria } from '../../sortStudy';
 import getSeriesInfo from './utils/getSeriesInfo';
-// import {
-//   createStudyFromSOPInstanceList,
-//   addInstancesToStudy,
-// } from './studyInstanceHelpers';
 
 /**
  * Map seriesList to an array of seriesInstanceUid
@@ -15,19 +11,6 @@ function mapStudySeries(seriesList) {
   return seriesList.map(series => getSeriesInfo(series).seriesInstanceUid);
 }
 
-// function attachSeriesLoader(server, study, seriesLoader) {
-//   study.seriesLoader = Object.freeze({
-//     hasNext() {
-//       return seriesLoader.hasNext();
-//     },
-//     async next() {
-//       const series = await seriesLoader.next();
-//       await addInstancesToStudy(server, study, series.sopInstances);
-//       return study.seriesMap[series.seriesInstanceUID];
-//     },
-//   });
-// }
-
 /**
  * Creates an immutable series loader object which loads each series sequentially using the iterator interface
  * @param {DICOMWebClient} dicomWebClient The DICOMWebClient instance to be used for series load