feat: Add WSI bulk data annotations support (ANN) (#4972)

Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>

platform/app/.webpack/webpack.pwa.js

@@ -116,14 +116,6 @@ module.exports = (env, argv) => {
             from: `${PUBLIC_DIR}/${APP_CONFIG}`,
             to: `${DIST_DIR}/app-config.js`,
           },
-          // Copy Dicom Microscopy Viewer build files
-          {
-            from: '../../../node_modules/dicom-microscopy-viewer/dist/dynamic-import',
-            to: DIST_DIR,
-            globOptions: {
-              ignore: ['**/*.min.js.map'],
-            },
-          },
         ],
       }),
       // Generate "index.html" w/ correct includes/imports
@@ -138,15 +130,15 @@ module.exports = (env, argv) => {
       ...(IS_COVERAGE
         ? []
         : [
-          new InjectManifest({
-            swDest: 'sw.js',
-            swSrc: path.join(SRC_DIR, 'service-worker.js'),
-            // Need to exclude the theme as it is updated independently
-            exclude: [/theme/],
-            // Cache large files for the manifests to avoid warning messages
-            maximumFileSizeToCacheInBytes: 1024 * 1024 * 50,
-          }),
-        ]),
+            new InjectManifest({
+              swDest: 'sw.js',
+              swSrc: path.join(SRC_DIR, 'service-worker.js'),
+              // Need to exclude the theme as it is updated independently
+              exclude: [/theme/],
+              // Cache large files for the manifests to avoid warning messages
+              maximumFileSizeToCacheInBytes: 1024 * 1024 * 50,
+            }),
+          ]),
     ],
     // https://webpack.js.org/configuration/dev-server/
     devServer: {
@@ -163,12 +155,6 @@ module.exports = (env, argv) => {
       proxy: [
         {
           '/dicomweb': 'http://localhost:5000',
-          '/dicom-microscopy-viewer': {
-            target: 'http://localhost:3000',
-            pathRewrite: {
-              '^/dicom-microscopy-viewer': `/${PUBLIC_URL}/dicom-microscopy-viewer`,
-            },
-          },
         },
       ],
       static: [

platform/app/.webpack/writePluginImportsFile.js

@@ -123,7 +123,7 @@ const createCopyPluginToDistForLink = (srcDir, distDir, plugins, folderName) =>
       return exists
         ? {
             from,
-            to: distDir,
+            to: `${distDir}${plugin.to || ''}`,
             toType: 'dir',
           }
         : undefined;

platform/app/package.json

@@ -53,7 +53,7 @@
     "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
     "@cornerstonejs/codec-openjpeg": "^1.2.4",
     "@cornerstonejs/codec-openjph": "^2.4.5",
-    "@cornerstonejs/dicom-image-loader": "^3.32.5",
+    "@cornerstonejs/dicom-image-loader": "^3.32.12",
     "@emotion/serialize": "^1.1.3",
     "@ohif/core": "3.12.0-beta.7",
     "@ohif/extension-cornerstone": "3.12.0-beta.7",

platform/app/pluginConfig.json

@@ -104,9 +104,10 @@
     },
     {
       "packageName": "dicom-microscopy-viewer",
-      "importPath": "/dicom-microscopy-viewer/dicomMicroscopyViewer.min.js",
+      "importPath": "dicom-microscopy-viewer/dicomMicroscopyViewer.min.js",
       "globalName": "dicomMicroscopyViewer",
-      "directory": "./node_modules/dicom-microscopy-viewer/dist/dynamic-import"
+      "directory": "./node_modules/dicom-microscopy-viewer/dist/dynamic-import",
+      "to": "/dicom-microscopy-viewer/"
     }
   ]
 }

platform/app/public/config/default.js

@@ -87,7 +87,7 @@ window.config = {
       ],
     },
   ],
-  defaultDataSourceName: 'dicomweb',
+  defaultDataSourceName: 'ohif',
   /* Dynamic config allows user to pass "configUrl" query string this allows to load config without recompiling application. The regex will ensure valid configuration source */
   // dangerouslyUseDynamicConfig: {
   //   enabled: true,
@@ -101,7 +101,7 @@ window.config = {
   dataSources: [
     {
       namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
-      sourceName: 'dicomweb',
+      sourceName: 'ohif',
       configuration: {
         friendlyName: 'AWS S3 Static wado server',
         name: 'aws',

platform/core/package.json

@@ -37,8 +37,8 @@
     "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
     "@cornerstonejs/codec-openjpeg": "^1.2.4",
     "@cornerstonejs/codec-openjph": "^2.4.5",
-    "@cornerstonejs/core": "^3.32.5",
-    "@cornerstonejs/dicom-image-loader": "^3.32.5",
+    "@cornerstonejs/core": "^3.32.12",
+    "@cornerstonejs/dicom-image-loader": "^3.32.12",
     "@ohif/ui": "3.12.0-beta.7",
     "cornerstone-math": "0.1.9",
     "dicom-parser": "^1.8.21"