Fixed onError propagation

openflexure_microscope/api/static/src/components/genericComponents/taskSubmitter.vue

@@ -198,7 +198,6 @@ export default {
             if (!error) {
               error = Error("Unknown error");
             }
-
             this.$emit("error", error);
             this.$emit("finished");
           })

openflexure_microscope/api/static/src/components/tabContentComponents/captureComponents/paneCapture.vue

@@ -248,9 +248,8 @@
         :submit-data="scanPayload"
         :submit-label="'Start Scan'"
         :button-primary="true"
-        @submit="onScanSubmit"
         @response="onScanResponse"
-        @error="onScanError"
+        @error="modalError"
       >
       </taskSubmitter>
     </div>
@@ -433,14 +432,8 @@ export default {
         });
     },
 
-    onScanSubmit: function() {},
-
     onScanResponse: function() {
       this.modalNotify("Finished scan.");
-    },
-
-    onScanError: function(error) {
-      this.modalError(error);
     }
   }
 };

openflexure_microscope/api/static/src/components/tabContentComponents/galleryComponents/scanCard.vue

@@ -119,7 +119,6 @@ export default {
 
     deleteAll: function() {
       axios.all(this.allURLs.map(l => axios.delete(l))).then(() => {
-        console.log("Delete finished")
         // Emit signal to update capture list
         this.$root.$emit("globalUpdateCaptures");
       });

openflexure_microscope/api/static/src/components/tabContentComponents/galleryComponents/zipDownloader.vue

@@ -18,7 +18,7 @@
         :submit-label="'Create ZIP'"
         :submit-data="captureIds"
         @response="onResponse"
-        @error="onError"
+        @error="modalError"
       >
       </taskSubmitter>
     </div>
@@ -163,10 +163,6 @@ export default {
       this.lastSessionId = response.output.id;
       this.downloadUrl = `${this.zipGetterUri}/${this.lastSessionId}`;
       this.downloadReady = true;
-    },
-
-    onError: function(error) {
-      this.modalError(error); // Let mixin handle error
     }
   }
 };

openflexure_microscope/api/static/src/components/tabContentComponents/navigateComponents/paneNavigate.vue

@@ -148,6 +148,7 @@
                   :submit-on-event="'globalFastAutofocusEvent'"
                   @taskStarted="isAutofocusing = 1"
                   @finished="isAutofocusing = 0"
+                  @error="modalError"
                 ></taskSubmitter>
               </div>
 
@@ -160,6 +161,7 @@
                   :button-primary="false"
                   @taskStarted="isAutofocusing = 2"
                   @finished="isAutofocusing = 0"
+                  @error="modalError"
                 ></taskSubmitter>
               </div>
 
@@ -172,6 +174,7 @@
                   :button-primary="false"
                   @taskStarted="isAutofocusing = 3"
                   @finished="isAutofocusing = 0"
+                  @error="modalError"
                 ></taskSubmitter>
               </div>
             </div>

openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue

@@ -12,7 +12,7 @@
         :submit-url="recalibrationLinks.calibrate_xy.href"
         :submit-label="'Auto-Calibrate using camera'"
         @response="onRecalibrateResponse"
-        @error="onRecalibrateError"
+        @error="modalError"
       >
       </taskSubmitter>
     </div>
@@ -149,10 +149,6 @@ export default {
       this.modalNotify("Finished stage-to-camera calibration.");
       // Update local settings
       this.updateSettings();
-    },
-
-    onRecalibrateError: function(error) {
-      this.modalError(error); // Let mixin handle error
     }
   }
 };

openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue

@@ -11,7 +11,7 @@
         :submit-url="recalibrationLinks.recalibrate.href"
         :submit-label="'Auto-Calibrate'"
         @response="onRecalibrateResponse"
-        @error="onRecalibrateError"
+        @error="modalError"
       >
       </taskSubmitter>
     </div>
@@ -128,10 +128,6 @@ export default {
       this.modalNotify("Finished recalibration.");
     },
 
-    onRecalibrateError: function(error) {
-      this.modalError(error); // Let mixin handle error
-    },
-
     flattenLensShadingTableRequest: function() {
       axios.post(this.recalibrationLinks.flatten_lens_shading_table.href);
     },

openflexure_microscope/api/static/src/components/tabContentComponents/slideScanComponents/paneSlideScan.vue

@@ -95,7 +95,7 @@
           submit-label="Start scan"
           @submit="scanRunning = true"
           @response="scanRunning = false"
-          @error="scanRunning = false"
+          @error="onScanError"
         ></taskSubmitter>
         <br />
 
@@ -293,6 +293,11 @@ export default {
         pad(tzo % 60)
       );
     }
+  },
+
+  onScanError: function(error) {
+    this.scanRunning = false;
+    this.modalError(error);
   }
 };
 </script>