Rebuild study browser reactivity.

extensions/default/src/Panels/PanelStudyBrowser.jsx

@@ -3,64 +3,73 @@ import PropTypes from 'prop-types';
 import { StudyBrowser } from '@ohif/ui';
 import { dicomMetadataStore } from '@ohif/core';
 
-function StudyDataCreator({ dataSource, servicesManager, setStudiesForPatient, getImageSrc, getStudiesByPatientId, setStudyData, updateThumbnailMap }) {
+function PanelStudyBrowser({
-  const [ displaySets, setDisplaySets ] = useState([]);
+  servicesManager,
+  getImageSrc,
+  getStudiesByPatientId,
+  dataSource,
+}) {
   const { DisplaySetService } = servicesManager.services;
+  const currentDisplaySets = DisplaySetService.activeDisplaySets || [];
+  // TODO: Deep copy? Or By IDs?
+  // TODO: May need to be mapped to a different shape?
 
-  const _getRelatedStudies = async () => {
+  const [displaySets, setDisplaySets] = useState(currentDisplaySets);
-    const currentDisplaySets = DisplaySetService.activeDisplaySets;
+  // TODO: Grab from URL, or pass in as part of contract to panels
-    if (!currentDisplaySets || !currentDisplaySets.length) {
+  const [primaryStudyInstanceUID, setPrimaryStudyInstanceUID] = useState();
-      return;
+  const [activeTabName, setActiveTabName] = useState('primary');
-    }
+  const [studyData, setStudyData] = useState([]);
-
+  const [studiesForPatient, setStudiesForPatient] = useState([]);
-    // Handle launching QIDO-RS request
-    const displaySet = currentDisplaySets[0];
-    const study = dicomMetadataStore.getStudy(
-      displaySet.StudyInstanceUID
-    );
-    const instance = study.series[0].instances[0];
-    const PatientID = instance.PatientID;
-    const studiesForPatient = await getStudiesByPatientId(PatientID);
-
-    debugger;
-
-    setStudiesForPatient(studiesForPatient);
-  }
 
   useEffect(() => {
-    _getRelatedStudies();
+    const mappedStudiesFromDataSource = _mapDataSourceStudies(
-  }, []);
+      studiesForPatient
+    );
 
-  function handleDisplaySetsChanged(displaySets) {
+    const newStudyData = _mergeStudyDataAndDataSourceStudies(
-    console.log('handleDisplaySetsChanged')
+      studyData,
-    console.log(displaySets.length);
+      mappedStudiesFromDataSource,
-    // On initial load
-    // 1. DisplaySets are added for the primary studies, which are used to create
-    //    the initial 'StudyData' to be displayed in the browser
-    // 2. Requests for thumbnails are made for each display set, which
-    //    resolve asynchronously and update thumbnailImageSrcMap
-    // 3. QIDO-RS call is made to retrieve StudyData for related studies, which
-    //    resolves later and is merged into StudyData
-    //
-    // Later, if another study is loaded
-    // 1. Display sets are added again, triggering requests for thumbnails
-    // 2. StudyData is updated from any new information provided by the series-level requests
-
-    // Does any studyData already exist?
-    // If it does, map the new display set data and merge it into the local state
-    // for display
-    const mappedStudiesFromInstances = _getMappedStudiesFromDisplaySets(
       displaySets
     );
 
-    setStudyData(mappedStudiesFromInstances);
+    addDisplaySetsToStudyData(newStudyData, displaySets);
+
+    setStudyData(newStudyData);
+  }, [studiesForPatient]);
+
+  const [thumbnailImageSrcMap, setThumbnailImageSrcMap] = useState(new Map());
+  const updateThumbnailMap = (k, v) => {
+    setThumbnailImageSrcMap(thumbnailImageSrcMap.set(k, v));
+  };
+
+  function setLocalDisplaySetsState(displaySets) {
+    const displaySetsUI = displaySets.map(ds => {
+      return {
+        displaySetInstanceUID: ds.displaySetInstanceUID,
+        description: ds.SeriesDescription,
+        seriesNumber: ds.SeriesNumber,
+        modality: ds.Modality,
+        date: ds.SeriesDate,
+        numInstances: ds.numImageFrames,
+        StudyInstanceUID: ds.StudyInstanceUID,
+        componentType: 'thumbnailTracked', // TODO: PUT THIS SOMEWHERE ELSE
+      };
+    });
+
+    setDisplaySets(displaySetsUI);
   }
 
-  useEffect(() => {
+  function addDisplaySetsToStudyData(studies, displaySets) {
-    handleDisplaySetsChanged(displaySets);
+    displaySets.forEach(displaySet => {
-  }, [displaySets]);
+      const study = studies.find(
+        s => s.studyInstanceUid === displaySet.StudyInstanceUID
+      );
 
-  function handleDisplaySetsAdded(newDisplaySets) {
+      study.displaySets.push(displaySet);
+    });
+  }
+
+  async function handleDisplaySetsAdded(newDisplaySets) {
     // First, launch requests for a thumbnail for the new display sets
     newDisplaySets.forEach(async dset => {
       const uid = dset.displaySetInstanceUID;
@@ -71,68 +80,61 @@ function StudyDataCreator({ dataSource, servicesManager, setStudiesForPatient, g
       const imageSrc = await getImageSrc(imageId);
       updateThumbnailMap(uid, imageSrc);
     });
+
+    // If
+    const firstDisplaySet = newDisplaySets[0];
+    if (!studiesForPatient.length && firstDisplaySet) {
+      async function doAsyncStuff() {
+        const qidoStuff = await _getStudiesByPatientId(
+          firstDisplaySet,
+          getStudiesByPatientId
+        );
+
+        setStudiesForPatient(qidoStuff);
+        debugger;
+        setPrimaryStudyInstanceUID(firstDisplaySet.StudyInstanceUID);
+      }
+
+      doAsyncStuff();
+    }
   }
 
   useEffect(() => {
-    const { unsubscribe } = DisplaySetService.subscribe(
+    // TODO: IF WE HAVE OUR FIRST DISPLAY SET...
+    // QIDO AWAY
+    // IF WE DO NOT, WAIT FOR FIRST DISPLAY_SETS_ADDED
+    const firstDisplaySet = displaySets[0];
+    if (firstDisplaySet) {
+      async function doAsyncStuff() {
+        const qidoStuff = await _getStudiesByPatientId(
+          firstDisplaySet,
+          getStudiesByPatientId
+        );
+        setPrimaryStudyInstanceUID(firstDisplaySet.StudyInstanceUID);
+        setStudiesForPatient(qidoStuff);
+      }
+      doAsyncStuff();
+    }
+
+    const subscriptions = [
+      DisplaySetService.subscribe(
         DisplaySetService.EVENTS.DISPLAY_SETS_ADDED,
         handleDisplaySetsAdded
-    );
+      ),
-
+      DisplaySetService.subscribe(
-    return unsubscribe;
-  }, []);
-
-  function setLocalDisplaySetsState(ds) {
-    setDisplaySets(ds);
-  }
-
-  useEffect(() => {
-    const { unsubscribe } = DisplaySetService.subscribe(
         DisplaySetService.EVENTS.DISPLAY_SETS_CHANGED,
         setLocalDisplaySetsState
-    );
+      ),
+    ];
 
-    return unsubscribe;
+    return () => {
+      subscriptions.forEach(sub => sub.unsubscribe);
+    };
   }, []);
 
-  return null;
+  const primary = studyData.find(
-}
+    study => study.studyInstanceUid === primaryStudyInstanceUID
-
-function PanelStudyBrowser({servicesManager, getImageSrc, getStudiesByPatientId, dataSource}) {
-  const [activeTabName, setActiveTabName] = useState('primary');
-  const [studyData, setStudyData] = useState([]);
-  const [studiesForPatient, setStudiesForPatient] = useState([]);
-  const mappedStudiesFromDataSource = _mapDataSourceStudies(
-    studiesForPatient
   );
-  const merged = _mergeStudyDataAndDataSourceStudies(
-    studyData,
-    mappedStudiesFromDataSource,
-  );
-
-
-  const [thumbnailImageSrcMap, setThumbnailImageSrcMap] = useState(new Map());
-  const updateThumbnailMap = (k, v) => {
-    setThumbnailImageSrcMap(thumbnailImageSrcMap.set(k, v));
-  };
-
-  return (
-    <>
-      <StudyDataCreator dataSource={dataSource} setStudyData={setStudyData} servicesManager={servicesManager} updateThumbnailMap={updateThumbnailMap} getStudiesByPatientId={getStudiesByPatientId} getImageSrc={getImageSrc}/>
-      <StudyBrowserUIData
-      studyData={studyData}
-      activeTabName={activeTabName}
-      setActiveTabName={setActiveTabName}
-      dataSource={dataSource}
-      />
-    </>
-  )
-}
-
-function StudyBrowserUIData({ activeTabName, setActiveTabName, studyData, dataSource }) {
-  const primary = studyData.find(study => {
-    return true; // TODO: check study.StudyInstanceUID matches queryparam?
-  });
 
   // TODO: Filter allStudies to dates within one year of current date
   const recentStudies = studyData.filter(study => {
@@ -158,6 +160,7 @@ function StudyBrowserUIData({ activeTabName, setActiveTabName, studyData, dataSo
   ];
 
   function onClickStudy(StudyInstanceUID) {
+    debugger;
     const study = studyData.find(a => a.studyInstanceUid === StudyInstanceUID);
     if (study && study.displaySets && study.displaySets.length) {
       return;
@@ -201,6 +204,18 @@ PanelStudyBrowser.propTypes = {
 
 export default PanelStudyBrowser;
 
+async function _getStudiesByPatientId(displaySet, getStudiesByPatientId) {
+  const study = dicomMetadataStore.getStudy(displaySet.StudyInstanceUID);
+  const instance = study.series[0].instances[0];
+  const PatientID = instance.PatientID;
+  const studiesByPatientId = await getStudiesByPatientId(PatientID);
+  // const mappedStudiesFromInstances = _getMappedStudiesFromDisplaySets(
+  //   displaySets
+  // );
+
+  return studiesByPatientId;
+}
+
 /**
  * Maps from the DataSource's format to a naturalized object
  *
@@ -244,7 +259,7 @@ function _getMappedStudiesFromDisplaySets(displaySets) {
       modality: ds.Modality,
       date: ds.SeriesDate,
       numInstances: ds.numImageFrames,
-      componentType: 'thumbnailTracked' // TODO: PUT THIS SOMEWHERE ELSE
+      componentType: 'thumbnailTracked', // TODO: PUT THIS SOMEWHERE ELSE
     };
 
     studiesFromInstanceData[ds.StudyInstanceUID] =
@@ -267,31 +282,40 @@ function _getMappedStudiesFromDisplaySets(displaySets) {
 function _mergeStudyDataAndDataSourceStudies(studyData, mappedQidoStudies) {
   return mappedQidoStudies.map(qidoStudy => {
     const { StudyInstanceUID } = qidoStudy;
-    const existing = studyData.find(a => a.studyInstanceUid === StudyInstanceUID) || {};
+    const existing =
+      studyData.find(a => a.studyInstanceUid === StudyInstanceUID) || {};
 
-    return Object.assign({
+    return Object.assign(
-      displaySets: []
+      {},
-    }, existing, {
+      existing,
+      {
+        displaySets: [],
+      },
+      {
         studyInstanceUid: StudyInstanceUID,
         date: qidoStudy.StudyDate,
         description: qidoStudy.StudyDescription,
         modalities: qidoStudy.ModalitiesInStudy,
         numInstances: qidoStudy.NumInstances,
-    });
+      }
+    );
   });
 }
 
 function _mergeStudyDataAndInstanceStudies(studyData, mappedInstanceStudies) {
   const merged = [];
   mappedInstanceStudies.map(studyFromInstances => {
-    const existing =
+    const existing = studyData.find(
-      studyData.find(a => a.studyInstanceUid === studyFromInstances.studyInstanceUid);
+      a => a.studyInstanceUid === studyFromInstances.studyInstanceUid
+    );
 
     if (existing) {
-      merged.push(Object.assign({}, existing, {
+      merged.push(
+        Object.assign({}, existing, {
           displaySets: studyFromInstances.displaySets,
-        modalities: studyFromInstances.modalities
+          modalities: studyFromInstances.modalities,
-      }))
+        })
+      );
     } else {
       merged.push(studyFromInstances);
     }

extensions/default/src/Panels/WrappedPanelStudyBrowser.jsx

@@ -11,13 +11,17 @@ import getImageSrcFromImageId from './getImageSrcFromImageId';
  * @param {object} commandsManager
  * @param {object} extensionManager
  */
-function WrappedPanelStudyBrowser({ commandsManager, extensionManager, servicesManager }) {
+function WrappedPanelStudyBrowser({
+  commandsManager,
+  extensionManager,
+  servicesManager,
+}) {
   // Note: this feels odd
   const dataSource = extensionManager.getDataSources('dicomweb')[0];
   const getStudiesByPatientId = patientId =>
-    dataSource.query.studies.search(patientId);
+    dataSource.query.studies.search({ patientId });
   const _getImageSrcFromImageId = _createGetImageSrcFromImageIdFn(
-    commandsManager.getCommand.bind(commandsManager),
+    commandsManager.getCommand.bind(commandsManager)
   );
 
   return (
@@ -42,7 +46,9 @@ function WrappedPanelStudyBrowser({ commandsManager, extensionManager, servicesM
 function _createGetImageSrcFromImageIdFn(getCommand) {
   try {
     const command = getCommand('getCornerstoneLibraries', 'VIEWER');
-    if(!command) { return; }
+    if (!command) {
+      return;
+    }
     const { cornerstone } = command.commandFn();
 
     return getImageSrcFromImageId.bind(null, cornerstone);

platform/core/src/services/DisplaySetService/DisplaySetService.js

@@ -96,7 +96,6 @@ export default class DisplaySetService {
       displaySetsAdded = displaySets;
     }
 
-    // If array of array of instances
     if (displaySetsAdded && displaySetsAdded.length) {
       this._broadcastChange(EVENTS.DISPLAY_SETS_ADDED, displaySetsAdded);
 

platform/viewer/src/routes/Mode/Mode.jsx

@@ -81,8 +81,6 @@ export default function ModeRoute({
   }, [mode, dataSourceName, location]);
 
   return (
-    <React.Fragment>
-      {/*<ToolbarLayoutProvider>*/}
     <CombinedContextProvider>
       {/* TODO: extensionManager is already provided to the extension module.
        *  Use it from there instead of passing as a prop here.
@@ -94,8 +92,6 @@ export default function ModeRoute({
         />
       </DragAndDropProvider>
     </CombinedContextProvider>
-      {/*</ToolbarLayoutProvider>*/}
-    </React.Fragment>
   );
 }