fix: resolves #1483 (#1527)

platform/viewer/src/connectedComponents/ConnectedStudyBrowser.js

@@ -2,6 +2,7 @@ import OHIF from '@ohif/core';
 import { connect } from 'react-redux';
 import { StudyBrowser } from '@ohif/ui';
 import cloneDeep from 'lodash.clonedeep';
+import findDisplaySetByUID from './findDisplaySetByUID';
 
 const { setActiveViewportSpecificData } = OHIF.redux.actions;
 
@@ -38,8 +39,9 @@ const mapStateToProps = (state, ownProps) => {
 const mapDispatchToProps = (dispatch, ownProps) => {
   return {
     onThumbnailClick: displaySetInstanceUID => {
-      const displaySet = ownProps.studyMetadata[0].displaySets.find(
-        ds => ds.displaySetInstanceUID === displaySetInstanceUID
+      const displaySet = findDisplaySetByUID(
+        ownProps.studyMetadata,
+        displaySetInstanceUID
       );
 
       dispatch(setActiveViewportSpecificData(displaySet));

platform/viewer/src/connectedComponents/findDisplaySetByUID.js

@@ -0,0 +1,25 @@
+/**
+ * Finds displaySet by UID across all displaySets inside studyMetadata
+ * @param {Array} studyMetadata
+ * @param {string} displaySetInstanceUID
+ */
+export default function findDisplaySetByUID(
+  studyMetadata,
+  displaySetInstanceUID
+) {
+  if (!Array.isArray(studyMetadata)) return null;
+
+  const allDisplaySets = studyMetadata.reduce((all, current) => {
+    let currentDisplaySet = [];
+    if (current && Array.isArray(current.displaySets)) {
+      currentDisplaySet = current.displaySets;
+    }
+    return all.concat(currentDisplaySet);
+  }, []);
+
+  const bySetInstanceUID = ds =>
+    ds.displaySetInstanceUID === displaySetInstanceUID;
+
+  const displaySet = allDisplaySets.find(bySetInstanceUID);
+  return displaySet || null;
+}

platform/viewer/src/connectedComponents/findDisplaySetByUID.test.js

@@ -0,0 +1,43 @@
+import findDisplaySetByUID from './findDisplaySetByUID';
+
+describe('findDisplaySetByUID', () => {
+  test('returns null when studyMetadata isnt an array', () => {
+    const result = findDisplaySetByUID(undefined, 'hello');
+    expect(result).toBeNull();
+  });
+
+  test('returns null when no match found', () => {
+    const result = findDisplaySetByUID([], 'no-match');
+    expect(result).toBeNull();
+  });
+
+  test('it handles missing displaySet arrays', () => {
+    const expected = '9388-2291-a8fe';
+    const studyMetadata = [
+      { displaySets: null },
+      {
+        displaySets: [{ displaySetInstanceUID: expected }],
+      },
+      null,
+      7,
+    ];
+    const result = findDisplaySetByUID(studyMetadata, expected);
+    expect(result.displaySetInstanceUID).toBe(expected);
+  });
+
+  test('returns correct displaySet by UID', () => {
+    const expected = '1234-5678';
+    const studyMetadata = [
+      { displaySets: [{ displaySetInstanceUID: '0011-2239' }] },
+      {
+        displaySets: [
+          { displaySetInstanceUID: '0392-2211' },
+          { displaySetInstanceUID: expected },
+        ],
+      },
+      { displaySets: [{ displaySetInstanceUID: '3384-9933' }] },
+    ];
+    const result = findDisplaySetByUID(studyMetadata, expected);
+    expect(result.displaySetInstanceUID).toBe(expected);
+  });
+});