Merge branch 'feat/v2-main' into feat/v2-main-docusaurus-netlify-monorepo

extensions/default/src/DicomWebDataSource/index.js

@@ -266,6 +266,10 @@ function createDicomWebApi(dicomWebConfig, UserAuthenticationService) {
         study.isLoaded = true;
       }
 
+      // Google Cloud Healthcare doesn't return StudyInstanceUID, so we need to add
+      // it manually here
+      seriesSummaryMetadata.forEach(aSeries => { aSeries.StudyInstanceUID = StudyInstanceUID })
+
       DicomMetadataStore.addSeriesMetadata(seriesSummaryMetadata, madeInClient);
 
       const numberOfSeries = seriesPromises.length;

extensions/default/src/Panels/PanelStudyBrowser.jsx

@@ -175,7 +175,8 @@ function PanelStudyBrowser({
     setExpandedStudyInstanceUIDs(updatedExpandedStudyInstanceUIDs);
 
     if (!shouldCollapseStudy) {
-      requestDisplaySetCreationForStudy(DisplaySetService, StudyInstanceUID);
+      const madeInClient = true
+      requestDisplaySetCreationForStudy(DisplaySetService, StudyInstanceUID, madeInClient);
     }
   }
 

extensions/default/src/Panels/requestDisplaySetCreationForStudy.js

@@ -1,7 +1,8 @@
 function requestDisplaySetCreationForStudy(
   dataSource,
   DisplaySetService,
-  StudyInstanceUID
+  StudyInstanceUID,
+  madeInClient,
 ) {
   // TODO: is this already short-circuited by the map of Retrieve promises?
   if (
@@ -12,7 +13,7 @@ function requestDisplaySetCreationForStudy(
     return;
   }
 
-  dataSource.retrieveSeriesMetadata({ StudyInstanceUID });
+  dataSource.retrieveSeriesMetadata({ StudyInstanceUID, madeInClient });
 }
 
 export default requestDisplaySetCreationForStudy;