feat(panel and auth): fix study panel to not rely on priors and add token param to url (#3381)

* fix: multiframe

* fix the unnecessary use of prior since some servers dont like it

* add authentication via token in url

* add data citation

* add resources

* upgrade packages

* yarn lock

* apply review comments

extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.tsx

@@ -18,7 +18,7 @@ const { formatDate } = utils;
 function PanelStudyBrowserTracking({
   servicesManager,
   getImageSrc,
-  getStudiesForPatientByStudyInstanceUID,
+  getStudiesForPatientByMRN,
   requestDisplaySetCreationForStudy,
   dataSource,
 }) {
@@ -76,8 +76,6 @@ function PanelStudyBrowserTracking({
   const activeViewportDisplaySetInstanceUIDs =
     viewports[activeViewportIndex]?.displaySetInstanceUIDs;
 
-  const isSingleViewport = numCols === 1 && numRows === 1;
-
   useEffect(() => {
     const added = measurementService.EVENTS.MEASUREMENT_ADDED;
     const addedRaw = measurementService.EVENTS.RAW_MEASUREMENT_ADDED;
@@ -108,15 +106,29 @@ function PanelStudyBrowserTracking({
     };
   }, [measurementService, activeViewportIndex, sendTrackedMeasurementsEvent]);
 
-  const { trackedStudy, trackedSeries } = trackedMeasurements.context;
+  const { trackedSeries } = trackedMeasurements.context;
 
   // ~~ studyDisplayList
   useEffect(() => {
     // Fetch all studies for the patient in each primary study
     async function fetchStudiesForPatient(StudyInstanceUID) {
-      const qidoStudiesForPatient =
-        (await getStudiesForPatientByStudyInstanceUID(StudyInstanceUID)) || [];
-      // TODO: This should be "naturalized DICOM JSON" studies
+      // current study qido
+      const qidoForStudyUID = await dataSource.query.studies.search({
+        studyInstanceUid: StudyInstanceUID,
+      });
+
+      let qidoStudiesForPatient = qidoForStudyUID;
+
+      // try to fetch the prior studies based on the patientID if the
+      // server can respond.
+      try {
+        qidoStudiesForPatient = await getStudiesForPatientByMRN(
+          qidoForStudyUID
+        );
+      } catch (error) {
+        console.warn(error);
+      }
+
       const mappedStudies = _mapDataSourceStudies(qidoStudiesForPatient);
       const actuallyMappedStudies = mappedStudies.map(qidoStudy => {
         return {
@@ -125,7 +137,6 @@ function PanelStudyBrowserTracking({
           description: qidoStudy.StudyDescription,
           modalities: qidoStudy.ModalitiesInStudy,
           numInstances: qidoStudy.NumInstances,
-          // displaySets: []
         };
       });
 
@@ -146,11 +157,16 @@ function PanelStudyBrowserTracking({
 
     StudyInstanceUIDs.forEach(sid => fetchStudiesForPatient(sid));
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [StudyInstanceUIDs, getStudiesForPatientByStudyInstanceUID]);
+  }, [StudyInstanceUIDs, getStudiesForPatientByMRN]);
 
   // ~~ Initial Thumbnails
   useEffect(() => {
     const currentDisplaySets = displaySetService.activeDisplaySets;
+
+    if (!currentDisplaySets.length) {
+      return;
+    }
+
     currentDisplaySets.forEach(async dSet => {
       const newImageSrcEntry = {};
       const displaySet = displaySetService.getDisplaySetByUID(
@@ -170,13 +186,16 @@ function PanelStudyBrowserTracking({
         });
       }
     });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [displaySetService, dataSource, getImageSrc]);
 
   // ~~ displaySets
   useEffect(() => {
-    // TODO: Are we sure `activeDisplaySets` will always be accurate?
     const currentDisplaySets = displaySetService.activeDisplaySets;
+
+    if (!currentDisplaySets.length) {
+      return;
+    }
+
     const mappedDisplaySets = _mapDisplaySets(
       currentDisplaySets,
       thumbnailImageSrcMap,
@@ -194,9 +213,9 @@ function PanelStudyBrowserTracking({
   }, [
     displaySetService.activeDisplaySets,
     trackedSeries,
-    thumbnailImageSrcMap,
     viewports,
     dataSource,
+    thumbnailImageSrcMap,
   ]);
 
   // ~~ subscriptions --> displaySets
@@ -379,7 +398,7 @@ PanelStudyBrowserTracking.propTypes = {
     getImageIdsForDisplaySet: PropTypes.func.isRequired,
   }).isRequired,
   getImageSrc: PropTypes.func.isRequired,
-  getStudiesForPatientByStudyInstanceUID: PropTypes.func.isRequired,
+  getStudiesForPatientByMRN: PropTypes.func.isRequired,
   requestDisplaySetCreationForStudy: PropTypes.func.isRequired,
 };
 

extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/getImageSrcFromImageId.js

@@ -6,7 +6,7 @@ function getImageSrcFromImageId(cornerstone, imageId) {
   return new Promise((resolve, reject) => {
     const canvas = document.createElement('canvas');
     cornerstone.utilities
-      .loadImageToCanvas(canvas, imageId)
+      .loadImageToCanvas({ canvas, imageId })
       .then(imageId => {
         resolve(canvas.toDataURL());
       })

extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/index.tsx

@@ -10,8 +10,8 @@ function _getStudyForPatientUtility(extensionManager) {
     '@ohif/extension-default.utilityModule.common'
   );
 
-  const { getStudiesForPatientByStudyInstanceUID } = utilityModule.exports;
-  return getStudiesForPatientByStudyInstanceUID;
+  const { getStudiesForPatientByMRN } = utilityModule.exports;
+  return getStudiesForPatientByMRN;
 }
 
 /**
@@ -28,10 +28,10 @@ function WrappedPanelStudyBrowserTracking({
 }) {
   const dataSource = extensionManager.getActiveDataSource()[0];
 
-  const getStudiesForPatientByStudyInstanceUID = _getStudyForPatientUtility(
+  const getStudiesForPatientByMRN = _getStudyForPatientUtility(
     extensionManager
   );
-  const _getStudiesForPatientByStudyInstanceUID = getStudiesForPatientByStudyInstanceUID.bind(
+  const _getStudiesForPatientByMRN = getStudiesForPatientByMRN.bind(
     null,
     dataSource
   );
@@ -48,9 +48,7 @@ function WrappedPanelStudyBrowserTracking({
       servicesManager={servicesManager}
       dataSource={dataSource}
       getImageSrc={_getImageSrcFromImageId}
-      getStudiesForPatientByStudyInstanceUID={
-        _getStudiesForPatientByStudyInstanceUID
-      }
+      getStudiesForPatientByMRN={_getStudiesForPatientByMRN}
       requestDisplaySetCreationForStudy={_requestDisplaySetCreationForStudy}
     />
   );