From 1380cc9f365bc145a697fea178f1456602c19541 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 16 Mar 2020 14:07:11 +0000
Subject: [PATCH] Started shifting extension forms into new nav layout

---
 .../controlComponents/panePlugins.vue         | 17 ------
 src/components/panelLeft.vue                  | 12 ++---
 src/components/pluginComponents/JsonForm.vue  |  1 +
 .../tabContentComponents/extensionContent.vue | 52 +++++++++++++++++++
 .../viewComponents/settingsDisplay.vue        | 16 +++---
 5 files changed, 67 insertions(+), 31 deletions(-)
 delete mode 100644 src/components/controlComponents/panePlugins.vue
 create mode 100644 src/components/tabContentComponents/extensionContent.vue

diff --git a/src/components/controlComponents/panePlugins.vue b/src/components/controlComponents/panePlugins.vue
deleted file mode 100644
index 6c82d3ad..00000000
--- a/src/components/controlComponents/panePlugins.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-  <div id="panePlugins">
-    <h3>Plugins</h3>
-    <div class="uk-placeholder uk-text-center">
-      Plugin support coming soon...
-    </div>
-  </div>
-</template>
-
-<script>
-// Export main app
-export default {
-  name: "PanePlugins"
-};
-</script>
-
-<style lang="less"></style>
diff --git a/src/components/panelLeft.vue b/src/components/panelLeft.vue
index 7c81f70e..8a518345 100644
--- a/src/components/panelLeft.vue
+++ b/src/components/panelLeft.vue
@@ -122,7 +122,7 @@
           :key="`${form.route}/${form.name}`.replace(/\s+/g, '-').toLowerCase()"
           class="uk-flex uk-flex-column"
         >
-          <JsonForm
+          <extensionContent
             :name="form.name"
             :route="form.route"
             :is-task="form.isTask"
@@ -145,16 +145,13 @@ import axios from "axios";
 import tabIcon from "./genericComponents/tabIcon";
 import tabContent from "./genericComponents/tabContent";
 
-// Import control components
-import paneNavigate from "./controlComponents/paneNavigate";
-import paneCapture from "./controlComponents/paneCapture";
-
 // Import new content components
 import connectContent from "./tabContentComponents/connectContent.vue";
 import navigateContent from "./tabContentComponents/navigateContent.vue";
 import captureContent from "./tabContentComponents/captureContent.vue";
 import settingsContent from "./tabContentComponents/settingsContent.vue";
 import galleryContent from "./tabContentComponents/galleryContent.vue";
+import extensionContent from "./tabContentComponents/extensionContent.vue";
 
 // Import plugin components
 import JsonForm from "./pluginComponents/JsonForm";
@@ -166,14 +163,13 @@ export default {
   components: {
     tabIcon,
     tabContent,
-    paneNavigate,
-    paneCapture,
     JsonForm,
     connectContent,
     navigateContent,
     captureContent,
     settingsContent,
-    galleryContent
+    galleryContent,
+    extensionContent
   },
 
   data: function() {
diff --git a/src/components/pluginComponents/JsonForm.vue b/src/components/pluginComponents/JsonForm.vue
index 81587134..340eb5a9 100644
--- a/src/components/pluginComponents/JsonForm.vue
+++ b/src/components/pluginComponents/JsonForm.vue
@@ -203,6 +203,7 @@ export default {
 
     updateForm() {
       // Trigger a plugin form update
+      console.log("Emitting reloadForms");
       this.$emit("reloadForms");
     },
 
diff --git a/src/components/tabContentComponents/extensionContent.vue b/src/components/tabContentComponents/extensionContent.vue
new file mode 100644
index 00000000..db81dfe2
--- /dev/null
+++ b/src/components/tabContentComponents/extensionContent.vue
@@ -0,0 +1,52 @@
+<template>
+  <!-- Grid managing tab content -->
+  <div uk-grid class="uk-height-1-1 uk-margin-remove uk-padding-remove">
+    <div class="control-component">
+      <JsonForm v-bind="$props" v-on="$listeners" />
+    </div>
+    <div class="view-component uk-width-expand"></div>
+  </div>
+</template>
+
+<script>
+import JsonForm from "../pluginComponents/JsonForm";
+
+export default {
+  name: "ExtensionContent",
+
+  components: {
+    JsonForm
+  },
+
+  props: {
+    name: {
+      type: String,
+      required: false,
+      default: "Plugin"
+    },
+    schema: {
+      type: Array,
+      required: true
+    },
+    route: {
+      type: String,
+      required: true
+    },
+    isTask: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    submitLabel: {
+      type: String,
+      required: false,
+      default: "Submit"
+    },
+    emitOnResponse: {
+      type: String,
+      required: false,
+      default: null
+    }
+  }
+};
+</script>
diff --git a/src/components/viewComponents/settingsDisplay.vue b/src/components/viewComponents/settingsDisplay.vue
index fca7c060..8b457552 100644
--- a/src/components/viewComponents/settingsDisplay.vue
+++ b/src/components/viewComponents/settingsDisplay.vue
@@ -6,13 +6,17 @@
         <appSettings />
         <streamSettings />
       </div>
-      <div v-if="$store.getters.ready">
-        <h3>Camera settings</h3>
-        <cameraSettings />
+      <div>
+        <div v-if="$store.getters.ready">
+          <h3>Camera settings</h3>
+          <cameraSettings />
+        </div>
       </div>
-      <div v-if="$store.getters.ready">
-        <h3>Microscope settings</h3>
-        <microscopeSettings />
+      <div>
+        <div v-if="$store.getters.ready">
+          <h3>Microscope settings</h3>
+          <microscopeSettings />
+        </div>
       </div>
     </div>
   </div>