capture changes

platform/core/src/services/DisplaySetService/DisplaySetService.js

@@ -107,6 +107,12 @@ export default class DisplaySetService {
     }
   };
 
+  hasDisplaySetsForStudy(StudyInstanceUID) {
+    return displaySetCache.some(
+      displaySet => displaySet.StudyInstanceUID === StudyInstanceUID
+    );
+  }
+
   makeDisplaySetForInstances(instances) {
     const instance = instances[0];
 

platform/ui/index.js

@@ -11,6 +11,9 @@ export {
   withModal,
   ViewportDialogProvider,
   useViewportDialog,
+  ImageViewerContext,
+  ImageViewerProvider,
+  useImageViewer,
 } from './src/contextProviders';
 
 /** COMPONENTS */

platform/ui/src/contextProviders/ImageViewerProvider.jsx

@@ -0,0 +1,18 @@
+import React, { createContext, useContext, useReducer } from 'react';
+
+// export const IMAGE_VIEWER_DEFAULT_VALUE = {
+//   StudyInstanceUIDs: [],
+//   setImageViewer: () => {},
+// };
+
+export const ImageViewerContext = createContext();
+
+export function ImageViewerProvider({ reducer, initialState, children }) {
+  return (
+    <ImageViewerContext.Provider value={useReducer(reducer, initialState)}>
+      {children}
+    </ImageViewerContext.Provider>
+  );
+}
+
+export const useImageViewer = () => useContext(ImageViewerContext);

platform/ui/src/contextProviders/index.js

@@ -10,4 +10,10 @@ export {
   useViewportDialog,
 } from './ViewportDialogProvider';
 
+export {
+  ImageViewerContext,
+  ImageViewerProvider,
+  useImageViewer,
+} from './ImageViewerProvider';
+
 export { default as DragAndDropProvider } from './DragAndDropProvider';

platform/viewer/src/routes/Mode/Mode.jsx

@@ -1,14 +1,13 @@
-import React, { useEffect, useCallback } from 'react';
+import React, { useEffect } from 'react';
 import { useParams } from 'react-router';
 import PropTypes from 'prop-types';
 //
 import { ToolBarManager } from '@ohif/core';
-import { DragAndDropProvider } from '@ohif/ui';
+import { DragAndDropProvider, ImageViewerProvider } from '@ohif/ui';
 //
 import { useQuery } from '@hooks';
 import ViewportGrid from '@components/ViewportGrid';
 import Compose from './Compose';
-//import DisplaySetCreator from './DisplaySetCreator';
 
 export default function ModeRoute({
   location,
@@ -22,6 +21,10 @@ export default function ModeRoute({
   const queryStudyInstanceUIDs = query.get('StudyInstanceUIDs');
   const { StudyInstanceUIDs: paramsStudyInstanceUIDs } = useParams();
   const StudyInstanceUIDs = queryStudyInstanceUIDs || paramsStudyInstanceUIDs;
+  const StudyInstanceUIDsAsArray =
+    StudyInstanceUIDs && Array.isArray(StudyInstanceUIDs)
+      ? StudyInstanceUIDs
+      : [StudyInstanceUIDs];
 
   const { extensions, sopClassHandlers } = mode;
   // TODO:
@@ -89,19 +92,28 @@ export default function ModeRoute({
     );
   }, [mode, dataSourceName, location]);
 
+  const reducer = (state, action) => {
+    console.log(state, action);
+  }
+
   return (
-    <CombinedContextProvider>
-      {/* TODO: extensionManager is already provided to the extension module.
-       *  Use it from there instead of passing as a prop here.
-       */}
-      <DragAndDropProvider>
-        <LayoutComponent
-          {...layoutTemplateData.props}
-          StudyInstanceUIDs={StudyInstanceUIDs}
-          ViewportGridComp={ViewportGridWithDataSource}
-        />
-      </DragAndDropProvider>
-    </CombinedContextProvider>
+    <ImageViewerProvider
+      initialState={{ StudyInstanceUIDs: StudyInstanceUIDsAsArray }}
+      reducer={reducer}
+    >
+      <CombinedContextProvider>
+        {/* TODO: extensionManager is already provided to the extension module.
+        *  Use it from there instead of passing as a prop here.
+        */}
+        <DragAndDropProvider>
+          <LayoutComponent
+            {...layoutTemplateData.props}
+            StudyInstanceUIDs={StudyInstanceUIDs}
+            ViewportGridComp={ViewportGridWithDataSource}
+          />
+        </DragAndDropProvider>
+      </CombinedContextProvider>
+    </ImageViewerProvider>
   );
 }
 
@@ -117,4 +129,5 @@ ModeRoute.propTypes = {
   mode: PropTypes.object.isRequired,
   dataSourceName: PropTypes.string,
   extensionManager: PropTypes.object,
+  servicesManager: PropTypes.object,
 };