fix(misc): Update the data source name, provide a /datasources example customization for debug (#3036)

* fix(misc):Update the data source name, provide  a /datasources

Update the imports for a few things to match, to avoid 2 versions

Fix the datasources name

pr:Make the data source selector configurable

* Updated data source selector page as requested

* PR fixes

platform/docs/package.json

@@ -37,7 +37,7 @@
     "@docusaurus/plugin-google-gtag": "2.0.1",
     "@mdx-js/react": "^1.6.21",
     "@svgr/webpack": "^5.5.0",
-    "classnames": "^2.3.1",
+    "classnames": "^2.3.2",
     "clsx": "^1.1.1",
     "file-loader": "^6.2.0",
     "plugin-image-zoom": "ataft/plugin-image-zoom",

platform/ui/package.json

@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "browser-detect": "^0.2.28",
-    "classnames": "2.2.6",
+    "classnames": "^2.3.2",
     "lodash.debounce": "4.0.8",
     "moment": "2.24.0",
     "mousetrap": "^1.6.5",

platform/viewer/package.json

@@ -49,8 +49,8 @@
     "@babel/runtime": "7.16.3",
     "@ohif/core": "^3.0.0",
     "@ohif/extension-cornerstone": "^3.0.0",
-    "@ohif/extension-cornerstone-dicom-sr": "^3.0.0",
     "@ohif/extension-cornerstone-dicom-seg": "^3.0.0",
+    "@ohif/extension-cornerstone-dicom-sr": "^3.0.0",
     "@ohif/extension-default": "^3.0.0",
     "@ohif/extension-dicom-pdf": "^3.0.1",
     "@ohif/extension-dicom-video": "^3.0.1",
@@ -58,12 +58,13 @@
     "@ohif/mode-basic-dev-mode": "^3.0.0",
     "@ohif/mode-longitudinal": "^3.0.0",
     "@ohif/ui": "^2.0.0",
-    "@types/react": "^16.0.0",
-    "classnames": "^2.2.6",
+    "@types/react": "^17.0.38",
+    "classnames": "^2.3.2",
     "config-point": "^0.4.8",
     "core-js": "^3.16.1",
     "cornerstone-math": "^0.1.9",
     "cornerstone-wado-image-loader": "^4.2.1",
+    "dayjs": "^1.11.6",
     "dcmjs": "^0.28.3",
     "detect-gpu": "^4.0.16",
     "dicom-parser": "^1.8.9",
@@ -73,7 +74,6 @@
     "i18next": "^17.0.3",
     "i18next-browser-languagedetector": "^3.0.1",
     "lodash.isequal": "4.5.0",
-    "moment": "^2.24.0",
     "oidc-client": "1.11.5",
     "prop-types": "^15.7.2",
     "query-string": "^6.12.1",
@@ -86,12 +86,13 @@
     "react-router-dom": "^6.3.0"
   },
   "devDependencies": {
+    "@babel/plugin-proposal-private-methods": "^7.18.6",
     "@percy/cypress": "^3.1.1",
     "cypress": "^9.5.4",
     "cypress-file-upload": "^3.5.3",
-    "identity-obj-proxy": "3.0.x",
-    "lodash": "4.17.15",
     "glob": "^8.0.3",
+    "identity-obj-proxy": "3.0.x",
+    "lodash": "^4.17.21",
     "tailwindcss": "3.2.4",
     "terser-webpack-plugin": "^5.1.1",
     "webpack": "^5.50.0",

platform/viewer/public/config/multiple.js

@@ -1,7 +1,7 @@
 window.config = {
   routerBasename: '/',
   customizationService: [
-    '@ohif/extension-default.customizationModule.helloPage',
+    '@ohif/extension-default.customizationModule.datasources',
     {
       id: 'class:StudyBrowser',
       true: 'black',
@@ -43,8 +43,8 @@ window.config = {
       sourceName: 'aws',
       configuration: {
         name: 'aws',
-        qidoRoot: 'https://viewer.flexview.ai/dicomweb',
-        wadoRoot: 'https://viewer.flexview.ai/dicomweb',
+        qidoRoot: 'https://dd32w2rfebxel.cloudfront.net/dicomweb',
+        wadoRoot: 'https://dd32w2rfebxel.cloudfront.net/dicomweb',
         qidoSupportsIncludeField: false,
         supportsReject: false,
         supportsStow: false,

platform/viewer/src/routes/DataSourceWrapper.tsx

@@ -20,9 +20,7 @@ function DataSourceWrapper(props) {
   const location = useLocation();
 
   // TODO - get the variable from the props all the time...
-  let dataSourceName = new URLSearchParams(location.search).get(
-    'datasourcename'
-  );
+  let dataSourceName = new URLSearchParams(location.search).get('datasources');
   const dataPath = dataSourceName ? `/${dataSourceName}` : '';
 
   if (!dataSourceName && window.config.defaultDataSourceName) {

platform/viewer/src/routes/WorkList/WorkList.tsx

@@ -498,7 +498,7 @@ const defaultFilterValues = {
   sortDirection: 'none',
   pageNumber: 1,
   resultsPerPage: 25,
-  datasourcename: '',
+  datasources: '',
 };
 
 function _tryParseInt(str, defaultValue) {
@@ -530,7 +530,7 @@ function _getQueryFilterValues(query) {
     sortDirection: query.get('sortDirection'),
     pageNumber: _tryParseInt(query.get('pageNumber'), undefined),
     resultsPerPage: _tryParseInt(query.get('resultsPerPage'), undefined),
-    datasourcename: query.get('datasourcename'),
+    datasources: query.get('datasources'),
   };
 
   // Delete null/undefined keys

platform/viewer/src/routes/index.tsx

@@ -74,6 +74,7 @@ const createRoutes = ({
           {...route.props}
           route={route}
           servicesManager={servicesManager}
+          extensionManager={extensionManager}
           hotkeysManager={hotkeysManager}
         />
       </ErrorBoundary>