Merge pull request #316 from Kitware/misc-patches-6

Misc patches 6
Kitware · Apr 15, 2020 · 549f125 · 549f125
2 parents b97a45e + 9dbc09f
commit 549f125
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 16 deletions.
diff --git a/src/components/core/App/script.js b/src/components/core/App/script.js
@@ -59,6 +59,7 @@ export default {
       screenshotCount: 0,
       errors: [],
       globalSingleNotification: '',
+      notifyPermanent: false,
     };
   },
   computed: {
@@ -191,8 +192,15 @@ export default {
     recordError(error) {
       this.errors.push(error);
     },
-    notify(msg) {
-      this.globalSingleNotification = msg;
+    notify(msg, permanent = false) {
+      if (this.globalSingleNotification) {
+        this.globalSingleNotification = '';
+        this.permanent = false;
+      }
+      this.$nextTick(() => {
+        this.globalSingleNotification = msg;
+        this.notifyPermanent = permanent;
+      });
     },
   },
 };
diff --git a/src/components/core/App/template.html b/src/components/core/App/template.html
@@ -190,6 +190,7 @@
         @input="globalSingleNotification = ''"
         bottom
         left
+        :timeout="notifyPermanent ? 0 : 6000"
         @click="globalSingleNotification = ''"
       >
         {{ globalSingleNotification }}

diff --git a/src/components/core/GirderBox/script.js b/src/components/core/GirderBox/script.js
@@ -153,6 +153,8 @@ export default {
         });
       }
 
+      this.$notify('Uploading...', true);
+
       const image = ITKHelper.convertVtkToItkImage(dataset);
       // If we don't copy here, the renderer's copy of the ArrayBuffer
       // becomes invalid because it's been transferred:
@@ -176,15 +178,20 @@ export default {
               .getProxyById(proxyId)
               .getKey('girderProvenance') || this.location,
         });
-        upload.start().then((response) => {
-          const { itemId } = response;
-          this.girderRest.put(
-            `${this.girderRest.apiRoot}/item/${itemId}`,
-            `metadata=${JSON.stringify(metadata)}`
-          );
-          this.$notify('Image uploaded');
-          this.$refs.girderFileManager.refresh();
-        });
+        upload
+          .start()
+          .then((response) => {
+            const { itemId } = response;
+            this.girderRest.put(
+              `${this.girderRest.apiRoot}/item/${itemId}`,
+              `metadata=${JSON.stringify(metadata)}`
+            );
+            this.$notify('Image uploaded');
+            this.$refs.girderFileManager.refresh();
+          })
+          .catch(() => {
+            this.$notify('Upload error');
+          });
       });
     },
     uploadMeasurements(proxyId) {
@@ -196,17 +203,23 @@ export default {
         const proxyName = this.$proxyManager.getProxyById(proxyId).getName();
         const name = `${proxyName}.measurements.json`;
         const file = new File([JSON.stringify(measurements)], name);
+        this.$notify('Uploading...', true);
         const upload = new GirderUpload(file, {
           $rest: this.girderRest,
           parent:
             this.$proxyManager
               .getProxyById(proxyId)
               .getKey('girderProvenance') || this.location,
         });
-        upload.start().then(() => {
-          this.$notify('Measurements uploaded');
-          this.$refs.girderFileManager.refresh();
-        });
+        upload
+          .start()
+          .then(() => {
+            this.$notify('Measurements uploaded');
+            this.$refs.girderFileManager.refresh();
+          })
+          .catch(() => {
+            this.$notify('Upload error');
+          });
       }
     },
     refreshPage() {

diff --git a/src/io/postProcessing.js b/src/io/postProcessing.js
@@ -3,7 +3,7 @@ import vtkLabelMap from 'paraview-glance/src/vtk/LabelMap';
 export function copyImageToLabelMap(vtkImage) {
   /* eslint-disable-next-line import/no-named-as-default-member */
   const lm = vtkLabelMap.newInstance(
-    vtkImage.get(['direction', 'origin', 'spacing'])
+    vtkImage.get('direction', 'origin', 'spacing')
   );
   lm.setDimensions(vtkImage.getDimensions());
   lm.computeTransforms();