fix: Use correct external URL for rendered responses with relative URI (#4236)

extensions/default/src/utils/createRenderedRetrieve.js

@@ -17,7 +17,12 @@ const createRenderedRetrieve = (config, params) => {
   const { wadoRoot } = config;
   const { instance, tag = 'PixelData' } = params;
   const { StudyInstanceUID, SeriesInstanceUID, SOPInstanceUID } = instance;
+  const value = instance[tag];
 
+  if (value?.BulkDataURI?.indexOf('?') !== -1) {
+    // The value instance has parameters, so it should not revert to the rendered
+    return;
+  }
   if (tag === 'PixelData' || tag === 'EncapsulatedDocument') {
     return `${wadoRoot}/studies/${StudyInstanceUID}/series/${SeriesInstanceUID}/instances/${SOPInstanceUID}/rendered`;
   }

extensions/default/src/utils/getBulkdataValue.js

@@ -22,7 +22,7 @@ const getBulkdataValue = (config, params) => {
 
   const value = instance[tag];
 
-  const { SeriesInstanceUID, SOPInstanceUID } = instance;
+  const { StudyInstanceUID, SeriesInstanceUID, SOPInstanceUID } = instance;
 
   const BulkDataURI =
     (value && value.BulkDataURI) ||
@@ -32,6 +32,11 @@ const getBulkdataValue = (config, params) => {
   const acceptUri =
     BulkDataURI + (hasAccept ? '' : (hasQuery ? '&' : '?') + `accept=${defaultType}`);
 
+  if (acceptUri.startsWith('series/')) {
+    const { wadoRoot } = config;
+    return `${wadoRoot}/studies/${StudyInstanceUID}/${acceptUri}`;
+  }
+
   // The DICOMweb standard states that the default is multipart related, and then
   // separately states that the accept parameter is the URL parameter equivalent of the accept header.
   return acceptUri;