fix(MergeDataSource): remove duplicated instances and fix to issue #4349

[josue-venegas]

Context

Problems:

1. When having merged two Orthanc (dicomweb) Data Sources it gets the error [Bug] promise.start() is not a function when using merged dataSources #4349, since neither remainingPromises nor requiredSeriesPromises are Promises.
   

2. Also, when a study is present in both servers, the study's UID is found twice, resulting in duplicate calls to the datasource to fetch the metadata and we get 2 display sets for each series.
   

Changes & Results

1. Changed promise.start() and p.start() to promise and p, respectively.
2. Copied the mergeKey behaviour from callToDataSourceAsync to callToDataSource in order to remove duplicate studyUIDs.

Testing

1. Merge two Orthanc servers using the official documentation. For example:

dataSources: [
    {
      sourceName: 'merge',
      namespace: '@ohif/extension-default.dataSourcesModule.merge',
      configuration: {
        name: 'merge',
        friendlyName: 'Merge dicomweb-1 and dicomweb-2 data at the series level',
        seriesMerge: {
          dataSourceNames: ['dicomweb-1', 'dicomweb-2'],
          defaultDataSourceName: 'dicomweb-1'
        },
      },
    },
    {
      friendlyName: "Orthanc Server",
      namespace: "@ohif/extension-default.dataSourcesModule.dicomweb",
      sourceName: "dicomweb-1",
      configuration: {
        name: "Orthanc",
        wadoUriRoot: "${ORTHANC_ROOT_URI}/wado",
        qidoRoot: "${ORTHANC_ROOT_URI}/dicom-web",
        wadoRoot: "${ORTHANC_ROOT_URI}/dicom-web",
        fullUri: "https://${DEPLOYMENT_HOST}${ORTHANC_ROOT_URI}/dicom-web",
        baseUri: "https://${DEPLOYMENT_HOST}${ORTHANC_ROOT_URI}",
        girderUri: "http://orthanc:8042/dicom-web",
        qidoSupportsIncludeField: false,
        imageRendering: "wadors",
        thumbnailRendering: "wadors",
        requestOptions: {
          ServerToken: (options) => {
            return options.ServerToken;
          },
          ServerURL: (options) => {
            return options.ServerURL;
          },
        },
      },
    },
    {
      friendlyName: "Orthanc External Server",
      namespace: "@ohif/extension-default.dataSourcesModule.dicomweb",
      sourceName: "dicomweb-2",
      configuration: {
        name: "ExternalOrthanc",
        wadoUriRoot: ":81/wado",
        qidoRoot: "http://localhost:81/dicom-web",
        wadoRoot: "http://localhost:81/dicom-web",
        fullUri: "http://localhost:81/dicom-web",
        baseUri: "http://localhost:81",
        girderUri: "http://orthanc:81/dicom-web",
        qidoSupportsIncludeField: false,
        imageRendering: "wadors",
        thumbnailRendering: "wadors",
        requestOptions: {
          ServerToken: (options) => {
            return options.ServerToken;
          },
          ServerURL: (options) => {
            return options.ServerURL;
          },
        },
      },
    },
  ],
  /* defaultDataSourceName: "dicomweb", */
  defaultDataSourceName: "merge",

2. Upload different instances of the same study on both servers. For example, CT + RTDose in the first server and RTStruct + RTPlan in the second server. You can use this study.

3. Open OHIF and try to access to that study

Checklist

PR

• My Pull Request title is descriptive, accurate and follows the
  semantic-release format and guidelines.

Code

• My code has been well-documented (function documentation, inline comments,
  etc.)

Public Documentation Updates

• The documentation page has been updated as necessary for any public API
  additions or removals.

Tested Environment

• OS: Fedora 40
• Node version: v20.12.2
• Browser: Chrome 127.0.6533.119, Firefox 129.0

[netlify]

✅ Deploy Preview for ohif-dev ready!

Name	Link
🔨 Latest commit	02cfc43
🔍 Latest deploy log	https://app.netlify.com/sites/ohif-dev/deploys/6712d906452f860008ab346a
😎 Deploy Preview	https://deploy-preview-4355--ohif-dev.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

---

To edit notification comments on pull requests, go to your Netlify site configuration.

[netlify]

✅ Deploy Preview for ohif-platform-docs ready!

Name	Link
🔨 Latest commit	02cfc43
🔍 Latest deploy log	https://app.netlify.com/sites/ohif-platform-docs/deploys/6712d906b417510008246a70
😎 Deploy Preview	https://deploy-preview-4355--ohif-platform-docs.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

---

To edit notification comments on pull requests, go to your Netlify site configuration.

[igoroctaviano]

@josue-venegas-almonacid have you tried using your dicomweb config with enableStudyLazyLoad true/false?

[igoroctaviano]

The merge does work for me, I'm not sure why its giving you errors. Can you dump the network logs?

Also, I tried your changes and it's failing to load studies using OHIF default config.

[elazarcoh]

I needed 2 more things to make it work:

1. fix the tagging part in export const callForAllDataSourcesAsync = async ({

-   const mergedData = data.map((data, i) => tagFunc(data.value, sourceNames[i]));
+  const mergedData = data.map((promiseResult, i) =>
+   promiseResult.status === 'fulfilled' ? tagFunc(promiseResult.value, sourceNames[i]) : []
+  );

2. add tagging for retrieve.series.metadata

export const mergeMap: MergeMap = {
  'query.studies.search': {
    mergeKey: 'studyInstanceUid',
    tagFunc: x => x,
  },
  'query.series.search': {
    mergeKey: 'seriesInstanceUid',
    tagFunc: (series, sourceName) => {
      series.forEach(series => {
        series.RetrieveAETitle = sourceName;
        DicomMetadataStore.updateSeriesMetadata(series);
      });
      return series;
    },
  },
+  'retrieve.series.metadata': {
+    mergeKey: 'seriesInstanceUid',
+    tagFunc: (series, sourceName) => {
+      Object.values(series).forEach(series => {
+        series.RetrieveAETitle = sourceName;
+        DicomMetadataStore.updateSeriesMetadata(series);
+      });
+      return series;
+    },
+  },
  getStudyInstanceUIDs: {
    mergeKey: 'studyInstanceUid',
    tagFunc: x => x,
  },
};

[sedghi]

Please revise this PR by tomorrow to include it in 3.9; otherwise, it will be moved to 3.10-beta. Thanks.