From 27b1f42935289f30ee5bafd1319e80ad26bd5c89 Mon Sep 17 00:00:00 2001
From: Richard Bowman <richard.bowman@cantab.net>
Date: Thu, 2 Nov 2023 20:32:15 +0000
Subject: [PATCH] Updated camera stage mapping settings

---
 .../CSMCalibrationSettings.vue                | 120 +++++-------------
 1 file changed, 34 insertions(+), 86 deletions(-)

diff --git a/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue
index a7280c1f..dfc5e25b 100644
--- a/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue
+++ b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="CSMCalibrationSettings">
     <!--Show auto calibrate if default plugin is enabled-->
-    <div v-if="'calibrate_xy' in recalibrationLinks" class="uk-margin-small">
+    <div v-if="'calibrate_xy' in actions" class="uk-margin-small">
       <taskSubmitter
         :button-primary="true"
         :can-terminate="false"
@@ -9,16 +9,15 @@
         :confirmation-message="
           'Start recalibration of the stage to the camera? This may take a while, and the microscope will be locked during this time.'
         "
-        :submit-url="recalibrationLinks.calibrate_xy.href"
+        :submit-url="thingUri + 'calibrate_xy'"
         :submit-label="'Auto-Calibrate using camera'"
         @response="onRecalibrateResponse"
         @error="modalError"
-      >
-      </taskSubmitter>
+      />
     </div>
     <button
-      v-if="'get_calibration' in recalibrationLinks"
-      v-show="dataAvailable && showExtraSettings"
+      v-if="'last_calibration' in properties"
+      v-show="showExtraSettings"
       type="button"
       class="uk-button uk-button-default uk-width-1-1"
       @click="getCalibrationData()"
@@ -51,104 +50,53 @@ export default {
   data: function() {
     return {
       settings: null,
-      recalibrationLinks: {},
-      isCalibrating: false,
-      dataAvailable: false
+      actions: {},
+      properties: {},
     };
   },
 
   computed: {
-    settingsUri: function() {
-      return `${this.$store.getters.baseUri}/api/v2/instrument/settings`;
-    },
-    pluginsUri: function() {
-      return `${this.$store.getters.baseUri}/api/v2/extensions`;
+    thingUri: function() {
+      return `${this.$store.getters.baseUri}/camera_stage_mapping/`;
     }
   },
 
   mounted() {
-    this.updateSettings();
-    this.updateRecalibrationLinks();
+    this.updateActions();
   },
 
   methods: {
-    updateSettings: function() {
-      // Update links
-      axios
-        .get(this.settingsUri)
-        .then(response => {
-          this.settings =
-            response.data.extensions["org.openflexure.camera_stage_mapping"];
-        })
-        .catch(error => {
-          this.modalError(error); // Let mixin handle error
-          this.settings = {};
-        });
-    },
-
-    updateCalibrationDataAvailability: function() {
-      if ("get_calibration" in this.recalibrationLinks) {
-        axios
-          .get(this.recalibrationLinks.get_calibration.href)
-          .then(response => {
-            if (Object.keys(response.data).length === 0) {
-              this.dataAvailable = false;
-            } else {
-              this.dataAvailable = true;
-            }
-          })
-          .catch(error => {
-            this.modalError(error); // Let mixin handle error
-          });
+    getCalibrationData: async function() {
+      try {
+        let response = await axios.get(this.thingUri + "last_calibration");
+        if (response.data == {}) {
+          throw "No calibration data available.";
+        }
+        const data = JSON.stringify(response.data);
+        const url = window.URL.createObjectURL(new Blob([data]));
+        const link = document.createElement("a");
+        link.href = url;
+        link.setAttribute("download", "csm_calibration.json");
+        document.body.appendChild(link);
+        link.click();
+      } catch (error) {
+        this.modalError(error); // Let mixin handle error
       }
     },
 
-    getCalibrationData: function() {
-      axios
-        .get(this.recalibrationLinks.get_calibration.href)
-        .then(response => {
-          if (response.data != {}) {
-            const data = JSON.stringify(response.data);
-            const url = window.URL.createObjectURL(new Blob([data]));
-            const link = document.createElement("a");
-            link.href = url;
-            link.setAttribute("download", "csm_calibration.json");
-            document.body.appendChild(link);
-            link.click();
-          }
-        })
-        .catch(error => {
-          this.modalError(error); // Let mixin handle error
-        });
-    },
-
-    updateRecalibrationLinks: function() {
-      axios
-        .get(this.pluginsUri) // Get a list of plugins
-        .then(response => {
-          var plugins = response.data;
-          var foundExtension = plugins.find(
-            e => e.title === "org.openflexure.camera_stage_mapping"
-          );
-          // if camera-stage mapping extension is enabled
-          if (foundExtension) {
-            // Get plugin action link
-            this.recalibrationLinks = foundExtension.links;
-            // Update whether calibration data is available
-            this.updateCalibrationDataAvailability();
-          } else {
-            this.recalibrationLinks = {};
-          }
-        })
-        .catch(error => {
-          this.modalError(error); // Let mixin handle error
-        });
+    updateActions: async function() {
+      try {
+        let response = await axios.get(this.thingUri); // Get Thing Description
+        console.log("CSM TD", response.data);
+        this.actions = response.data.actions;
+        this.properties = response.data.properties;
+      } catch (error) {
+        this.modalError(error); // Let mixin handle error
+      }
     },
 
     onRecalibrateResponse: function() {
       this.modalNotify("Finished stage-to-camera calibration.");
-      // Update local settings
-      this.updateSettings();
     }
   }
 };