configuration for the slicer metadata release (#227)

Author: BryonLewis

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dive-dsa",
-  "version": "1.10.24",
+  "version": "1.10.25",
   "author": {
     "name": "Kitware, Inc.",
     "email": "Bryon.Lewis@kitware.com"
@@ -41,7 +41,7 @@
     "mousetrap": "^1.6.5",
     "semver": "^7.3.5",
     "vue": "^2.7.15",
-    "vue-girder-slicer-cli-ui": "0.0.9",
+    "vue-girder-slicer-cli-ui": "0.1.1",
     "vue-gtag": "^1.9.1",
     "vue-router": "^3.0.3",
     "vuetify": "^2.3.10",

client/yarn.lock

@@ -3225,7 +3225,7 @@ axe-core@^4.10.0:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.3.tgz#04145965ac7894faddbac30861e5d8f11bfd14fc"
   integrity sha512-Xm7bpRXnDSX2YE2YFfBk2FnF0ep6tmG7xPh8iHee8MIcrgq762Nkce856dYtJYLkuIoYZvGfTs/PbZhideTcEg==
 
-axios@*, axios@^1.5.0, axios@^1.6.7:
+axios@*, axios@^1.6.7, axios@^1.8.2:
   version "1.8.4"
   resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.4.tgz#78990bb4bc63d2cae072952d374835950a82f447"
   integrity sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==
@@ -11003,17 +11003,17 @@ vue-eslint-parser@^9.0.1, vue-eslint-parser@^9.0.3, vue-eslint-parser@^9.3.1, vu
     lodash "^4.17.21"
     semver "^7.3.6"
 
-vue-girder-slicer-cli-ui@0.0.9:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/vue-girder-slicer-cli-ui/-/vue-girder-slicer-cli-ui-0.0.9.tgz#7725fbfb8f6b92f917b1e1fc264ad0e868ae47b1"
-  integrity sha512-IYaecdkcAHgnCvRBaDxLxUrAmYr5Ft70NPwUGLmYvlP95HHgTObuIEqke4b2WU4AIFabwhlP9LeU5KGaUEJW5A==
+vue-girder-slicer-cli-ui@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/vue-girder-slicer-cli-ui/-/vue-girder-slicer-cli-ui-0.1.1.tgz#66b8a0d40fd07dda223cdf1b0c293fbb14f48819"
+  integrity sha512-qax2QHhxlfxVvccFaWuIOt1+M//dokqYRcNkT5VGPfo4Rb3QQ9YbskKeXTdH9r5VB6UOgcMbF7f8toErvzNKRQ==
   dependencies:
     "@jamescoyle/vue-icon" "^0.1.2"
     "@mdi/js" "^7.2.96"
     "@popperjs/core" "^2.11.8"
     "@vueuse/components" "^10.7.0"
     "@vueuse/core" "^10.7.0"
-    axios "^1.5.0"
+    axios "^1.8.2"
     jquery "^3.7.1"
     js-cookie "^3.0.5"
     lodash "^4.17.21"

dive-dsa-slicer/vue-girder-slicer-ui/package.json

@@ -4,7 +4,7 @@
     "name": "Kitware, Inc.",
     "email": "Bryon.Lewis@kitware.com"
   },
-  "version": "0.1.0",
+  "version": "0.1.1",
   "type": "module",
   "files": [
     "dist",

docs/SlicerCLI.md

@@ -13,6 +13,10 @@ The system will automatically populate the file input with a reference to the vi
 
 The system will also populate any folder output with the DIVE Dataset Folder if it has the ID/name **DIVEDirectory**
 
+**girderToken** and **girderApiUrl** are automtically set as well.  This can be uyseful if the system is utilize girder-client for communication with the main container.
+
+The system will alos populate and text input for the field **DIVEMetadata** and **DIVEMetadataRoot** if the system is run in within a DIVEMetadata Context
+
 #### Examples
 
 There are examples located at [**DIVE-DSA-Slicer Repository**](https://github.com/DigitalSlideArchive/dive-dsa/tree/main/dive-dsa-slicer/example-docker-containers).  These are simple examples that show the generation of fullframe tracks.  The more important one is the LongRunning or GirderClient versions.  They show how to automatically push the data back to the system and kick off the post process event to load the new tracks in to the Dataset.

server/dive_server/web_client/JobStatus.js

@@ -1,10 +1,14 @@
-import JobStatus from '@girder/jobs/JobStatus';
+const events = girder.events;
 
-const jobPluginIsCancelable = JobStatus.isCancelable;
-JobStatus.isCancelable = function (job) {
-    if (job.get('type').startsWith('Dive Metadata Slicer CLI Batch')) {
-        return ![JobStatus.CANCELED, JobStatus.WORKER_CANCELING || 824,
-            JobStatus.SUCCESS, JobStatus.ERROR].includes(job.get('status'));
-    }
-    return jobPluginIsCancelable(job);
-};
+// g:appload.before runs after all plugin static files have been loaded
+events.on('g:appload.before', () => {
+    const JobStatus = girder.plugins.jobs.JobStatus;
+    const jobPluginIsCancelable = JobStatus.isCancelable;
+    JobStatus.isCancelable = function (job) {
+        if (job.get('type').startsWith('Dive Metadata Slicer CLI Batch')) {
+            return ![JobStatus.CANCELED, JobStatus.WORKER_CANCELING || 824,
+                JobStatus.SUCCESS, JobStatus.ERROR].includes(job.get('status'));
+        }
+        return jobPluginIsCancelable(job);
+    };
+});

server/dive_server/web_client/main.js

@@ -3,4 +3,5 @@ import './views/itemList';
 import './views/folderList';
 import './views/folderPage';
 import './routes';
+import './JobStatus';
 

server/dive_server/web_client/package.json

@@ -14,7 +14,7 @@
         ]
     },
     "dependencies": {
-        "dive-dsa": "^1.10.3",
+        "dive-dsa": "^1.10.25",
         "webpack": "^2.7.0",
         "copy-webpack-plugin": "^4.5.2"
     }