From fe20392a97e96381074dd87a2c6492a12653460f Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Tue, 26 Nov 2019 14:54:10 +0000
Subject: [PATCH] Converted to API v2 format

---
 src/components/panelLeft.vue                 | 44 ++++++++++++++++++--
 src/components/pluginComponents/JsonForm.vue |  2 +-
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/components/panelLeft.vue b/src/components/panelLeft.vue
index 2ee9d7b2..8bb8b78b 100644
--- a/src/components/panelLeft.vue
+++ b/src/components/panelLeft.vue
@@ -45,7 +45,7 @@
       <hr />
 
       <tabIcon
-        v-for="plugin in $store.state.apiPlugins"
+        v-for="plugin in pluginsGuiList"
         :id="plugin.id"
         :key="plugin.id"
         :require-connection="plugin.requiresConnection"
@@ -96,7 +96,7 @@
         </tabContent>
 
         <tabContent
-          v-for="plugin in $store.state.apiPlugins"
+          v-for="plugin in pluginsGuiList"
           :id="plugin.id"
           :key="plugin.id"
           :require-connection="plugin.requiresConnection"
@@ -126,6 +126,8 @@
 </template>
 
 <script>
+import axios from "axios";
+
 // Import generic components
 import tabIcon from "./genericComponents/tabIcon";
 import tabContent from "./genericComponents/tabContent";
@@ -155,18 +157,52 @@ export default {
 
   data: function() {
     return {
+      plugins: {},
       currentTab: "status",
       showControlBar: true
     };
   },
 
   computed: {
-    pluginApiUri: function() {
-      return this.$store.getters.uri + "/plugin";
+    pluginsUri: function() {
+      return `${this.$store.getters.baseUri}/api/v2/plugins`;
+    },
+    pluginsGuiList: function() {
+      // List of plugin GUIs, obtained from this.plugins values
+      console.log("Recalculating plugins");
+      var pluginGuis = [];
+      for (let plugin of Object.values(this.plugins)) {
+        if (plugin.gui) {
+          pluginGuis.push(plugin.gui);
+        }
+      }
+      return pluginGuis;
     }
   },
 
+  created: function() {
+    // Watch for host 'ready', then update status
+    this.$store.watch(
+      (state, getters) => {
+        return getters.ready;
+      },
+      () => {
+        this.updatePlugins();
+      }
+    );
+  },
   methods: {
+    updatePlugins: function() {
+      axios
+        .get(this.pluginsUri)
+        .then(response => {
+          console.log(response);
+          this.plugins = response.data;
+        })
+        .catch(error => {
+          this.modalError(error); // Let mixin handle error
+        });
+    },
     setTab: function(event, tab) {
       if (this.currentTab == tab) {
         this.showControlBar = !this.showControlBar;
diff --git a/src/components/pluginComponents/JsonForm.vue b/src/components/pluginComponents/JsonForm.vue
index 655b4430..0a718d82 100644
--- a/src/components/pluginComponents/JsonForm.vue
+++ b/src/components/pluginComponents/JsonForm.vue
@@ -129,7 +129,7 @@ export default {
 
   computed: {
     pluginApiUri: function() {
-      return this.$store.getters.uri + "/plugin";
+      return `${this.$store.getters.baseUri}/api/v2/plugins`;
     },
 
     submitApiUri: function() {