From 2c376baa774ff57a991c09f8ea0402da0d133f33 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 11 Nov 2019 10:43:45 +0000
Subject: [PATCH] Moved camera calibration to new-style task

---
 .../settingsComponents/cameraSettings.vue     | 57 ++++++-------------
 .../genericComponents/taskSubmitter.vue       | 35 ++++++++++--
 2 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/src/components/controlComponents/settingsComponents/cameraSettings.vue b/src/components/controlComponents/settingsComponents/cameraSettings.vue
index 1e8490b5..c4b2b695 100644
--- a/src/components/controlComponents/settingsComponents/cameraSettings.vue
+++ b/src/components/controlComponents/settingsComponents/cameraSettings.vue
@@ -26,13 +26,15 @@
     
     <!--Show auto calibrate if default plugin is enabled-->
     <div v-if="this.$store.state.apiState.plugin.includes('default_camera_calibration')">
-      <div v-if="isCalibrating">
-        <progressBar/>
-      </div>
-
-      <div v-bind:hidden="isCalibrating">
-        <button type="button" v-on:click="recalibrateConfirm()" class="uk-button uk-button-default uk-form-small uk-float-right uk-margin-small uk-width-1-1">Auto-Calibrate</button>
-      </div>
+      <taskSubmitter
+        v-bind:canTerminate="false"
+        v-bind:requiresConfirmation="true"
+        v-bind:confirmationMessage="'Start recalibration? This may take a while, and the microscope will be locked during this time.'"
+        v-bind:submitURL="recalibrateApiUri"
+        v-bind:submitLabel="'Auto-Calibrate (Task)'"
+        v-on:response="onRecalibrateResponse"
+        v-on:error="onRecalibrateError">
+      </taskSubmitter>
     </div>
 
   </form>
@@ -43,14 +45,14 @@
 
 <script>
 import axios from 'axios'
-import progressBar from "../../genericComponents/progressBar"
+import taskSubmitter from "../../genericComponents/taskSubmitter"
 
 // Export main app
 export default {
   name: 'microscopeSettings',
 
   components: {
-    progressBar
+    taskSubmitter
   },
 
   data: function () {
@@ -95,37 +97,14 @@ export default {
           this.modalError(error) // Let mixin handle error
         })
     },
-    recalibrateConfirm: function() {
-      var context = this
-      this.modalConfirm('Start recalibration? This may take a while, and the microscope will be locked during this time.')
-        .then(function() {
-          context.recalibrateRequest()
-        }, function () {
-          console.log('Rejected recalibration.')
-        })
+
+    onRecalibrateResponse: function() {
+      this.modalNotify("Finished recalibration.")
+      return new Promise(r => setTimeout(r, 500)) // wait 500ms before updating config, so it's fresh
     },
-    recalibrateRequest: function() {
-      // Send move request
-      axios.post(this.recalibrateApiUri)
-        .then(response => { 
-          console.log("Task ID: " + response.data.id)
-          this.isCalibrating = true
-          return this.$store.dispatch('pollTask', [response.data.id, null, null])
-        })
-        .then(() => {
-          this.modalNotify("Finished recalibration.")
-          return new Promise(r => setTimeout(r, 500)) // wait 500ms before updating config, so it's fresh
-        })
-        .then(() => {
-          return this.$store.dispatch('updateConfig');
-        })
-        .then(this.updateInputValues)
-        .catch(error => {
-          this.modalError(error) // Let mixin handle error
-        })
-        .finally(() => {
-          this.isCalibrating = false
-        })
+
+    onRecalibrateError: function(error) {
+      this.modalError(error) // Let mixin handle error
     }
 
   },
diff --git a/src/components/genericComponents/taskSubmitter.vue b/src/components/genericComponents/taskSubmitter.vue
index 39049279..11e5c74c 100644
--- a/src/components/genericComponents/taskSubmitter.vue
+++ b/src/components/genericComponents/taskSubmitter.vue
@@ -7,10 +7,10 @@
       <div v-else class="indeterminate"></div>
     </div>
 
-    <button type="button" v-on:click="terminateTask()" class="uk-button uk-button-danger uk-form-small uk-margin uk-float-right uk-width-1-1">Terminate</button>
+    <button v-if="canTerminate" type="button" v-on:click="terminateTask()" class="uk-button uk-button-danger uk-form-small uk-margin uk-float-right uk-width-1-1">Terminate</button>
   </div>
 
-  <button type="button" v-on:click="startTask()" v-bind:hidden="taskRunning" class="uk-button uk-button-primary uk-form-small uk-margin uk-float-right uk-width-1-1">{{ submitLabel }}</button>
+  <button type="button" v-on:click="bootstrapTask()" v-bind:hidden="taskRunning" class="uk-button uk-button-primary uk-form-small uk-margin uk-float-right uk-width-1-1">{{ submitLabel }}</button>
 
 </div>
 </template>
@@ -29,7 +29,7 @@ export default {
     submitData: {
       type: Object,
       required: false,
-      default: {}
+      default: () => ({})
     },
     pollInterval: {
       type: Number,
@@ -46,6 +46,21 @@ export default {
       required: false,
       default: "Submit"
     },
+    canTerminate: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    requiresConfirmation: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    confirmationMessage: {
+      type: String,
+      required: false,
+      default: "Start task?"
+    }
   },
 
   data: function () {
@@ -64,6 +79,18 @@ export default {
   },
 
   methods: {
+    bootstrapTask: function() {
+      if (this.requiresConfirmation) {
+        this.modalConfirm(this.confirmationMessage)
+          .then(() => {
+            this.startTask()
+          }, () => {})
+      }
+      else {
+        this.startTask()
+      }
+    },
+
     startTask: function() {
       console.log("Task start clicked")
       this.$emit('submit', this.submitData)
@@ -86,7 +113,7 @@ export default {
       })
       .catch(error => {
         if (!error) {
-          error =  "Unknown error"
+          error =  Error("Unknown error")
         }
         console.log("Emitting onError: ", error)
         this.$emit('error', error)