Merge branch 'feat/ui-v2-rebase-services' of github.com:OHIF/Viewers into feat/ui-v2-rebase-services

# Conflicts:
#	platform/viewer/src/routes/Mode/Mode.jsx

platform/viewer/public/config/idc.js

@@ -1,19 +1,48 @@
-window.config = function(props) {
-  var servicesManager = props.servicesManager;
-
-  return {
-    routerBasename: '/',
-    enableGoogleCloudAdapter: true,
-    enableGoogleCloudAdapterUI: false,
-    showStudyList: true,
-    httpErrorHandler: error => {
-      // This is 429 when rejected from the public idc sandbox too often.
-      console.warn(error.status);
-
-      // Could use services manager here to bring up a dialog/modal if needed.
-      console.warn('test, navigate to https://ohif.org/');
-      window.location = 'https://ohif.org/';
+window.config = {
+  routerBasename: '/',
+  enableGoogleCloudAdapter: true,
+  servers: {
+    // This is an array, but we'll only use the first entry for now
+    dicomWeb: [],
+  },
+  // This is an array, but we'll only use the first entry for now
+  oidc: [
+    {
+      // ~ REQUIRED
+      // Authorization Server URL
+      authority: 'https://accounts.google.com',
+      client_id:
+        '723928408739-k9k9r3i44j32rhu69vlnibipmmk9i57p.apps.googleusercontent.com',
+      redirect_uri: '/callback', // `OHIFStandaloneViewer.js`
+      response_type: 'id_token token',
+      scope:
+        'email profile openid https://www.googleapis.com/auth/cloudplatformprojects.readonly https://www.googleapis.com/auth/cloud-healthcare', // email profile openid
+      // ~ OPTIONAL
+      post_logout_redirect_uri: '/logout-redirect.html',
+      revoke_uri: 'https://accounts.google.com/o/oauth2/revoke?token=',
+      automaticSilentRenew: true,
+      revokeAccessTokenOnSignout: true,
     },
-    healthcareApiEndpoint: 'https://idc-sandbox-002.appspot.com/v1beta1',
-  };
+  ],
+  studyListFunctionsEnabled: true,
 };
+
+// window.config = function(props) {
+//   var servicesManager = props.servicesManager;
+
+//   return {
+//     routerBasename: '/',
+//     enableGoogleCloudAdapter: true,
+//     enableGoogleCloudAdapterUI: false,
+//     showStudyList: true,
+//     httpErrorHandler: error => {
+//       // This is 429 when rejected from the public idc sandbox too often.
+//       console.warn(error.status);
+
+//       // Could use services manager here to bring up a dialog/modal if needed.
+//       console.warn('test, navigate to https://ohif.org/');
+//       window.location = 'https://ohif.org/';
+//     },
+//     healthcareApiEndpoint: 'https://idc-sandbox-002.appspot.com/v1beta1',
+//   };
+// };

platform/viewer/src/appInit.js

@@ -8,6 +8,7 @@ import {
   UIDialogService,
   MeasurementService,
   DisplaySetService,
+  ToolBarSerivce,
   // utils,
   // redux as reduxOHIF,
 } from '@ohif/core';
@@ -45,6 +46,7 @@ function appInit(appConfigOrFunc, defaultExtensions) {
     UIDialogService,
     MeasurementService,
     DisplaySetService,
+    ToolBarSerivce,
   ]);
 
   /**

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

@@ -1,55 +0,0 @@
-import { useEffect, useCallback } from 'react';
-import {
-  displaySetManager,
-  ToolBarManager,
-  useViewModel,
-  useToolbarLayout,
-} from '@ohif/core';
-
-export default function DisplaySetCreator({
-  location,
-  mode,
-  dataSourceName,
-  extensionManager,
-  DisplaySetService,
-}) {
-  console.warn('DisplaySetCreator rerendering');
-  const { routes, sopClassHandlers } = mode;
-  const dataSources = extensionManager.getDataSources(dataSourceName);
-  // TODO: For now assume one unique datasource.
-
-  const dataSource = dataSources[0];
-  const route = routes[0];
-
-  // Add toolbar state to the view model context?
-  const { displaySetInstanceUIDs, setDisplaySetInstanceUIDs } = useViewModel();
-
-  const { toolBarLayout, setToolBarLayout } = useToolbarLayout();
-
-  useEffect(() => {
-    let toolBarManager = new ToolBarManager(extensionManager, setToolBarLayout);
-    route.init({ toolBarManager });
-  }, [mode, dataSourceName, location]);
-
-  const createDisplaySets = useCallback(() => {
-    // Add SOPClassHandlers to a new SOPClassManager.
-    displaySetManager.init(extensionManager, sopClassHandlers, {
-      displaySetInstanceUIDs,
-      setDisplaySetInstanceUIDs,
-    });
-
-    const queryParams = location.search;
-
-    // Call the data source to start building the view model?
-    dataSource.retrieve.series.metadata(
-      queryParams,
-      displaySetManager.makeDisplaySets
-    );
-  }, [displaySetInstanceUIDs, location]);
-
-  useEffect(() => {
-    createDisplaySets();
-  }, [mode, dataSourceName, location]);
-
-  return null;
-}

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

@@ -72,10 +72,15 @@ export default function ModeRoute({
   }
 
   useEffect(() => {
-    // TODO -> Make this into a service
-    let toolBarManager = new ToolBarManager(extensionManager); //, setToolBarLayout);
-    route.init({ toolBarManager });
-  }, [mode, dataSourceName, location]);
+    route.init({ servicesManager, extensionManager });
+  }, [
+    mode,
+    dataSourceName,
+    location,
+    route,
+    servicesManager,
+    extensionManager,
+  ]);
 
   // This queries for series, but... What does it do with them?
   useEffect(() => {
@@ -90,11 +95,19 @@ export default function ModeRoute({
       queryParams,
       DisplaySetService.makeDisplaySets
     );
-  }, [mode, dataSourceName, location]);
+  }, [
+    mode,
+    dataSourceName,
+    location,
+    DisplaySetService,
+    extensionManager,
+    sopClassHandlers,
+    dataSource.retrieve.series,
+  ]);
 
   const reducer = (state, action) => {
     console.log(state, action);
-  }
+  };
 
   return (
     <ImageViewerProvider
@@ -103,8 +116,8 @@ export default function ModeRoute({
     >
       <CombinedContextProvider>
         {/* TODO: extensionManager is already provided to the extension module.
-        *  Use it from there instead of passing as a prop here.
-        */}
+         *  Use it from there instead of passing as a prop here.
+         */}
         <DragAndDropProvider>
           <LayoutComponent
             {...layoutTemplateData.props}