From 15b6d7d663e2caaa450f835648cdba9aba8578f3 Mon Sep 17 00:00:00 2001
From: David Whittaker <84562015+whitdog47@users.noreply.github.com>
Date: Wed, 26 Jun 2024 16:54:27 -0700
Subject: [PATCH] Bugfix/plugin metadata not set (#4879)

---
 .../src/plugin/PluginInstanceCombobox.vue     | 26 ++++++++++++++-----
 .../src/plugin/PluginMetadataInput.vue        |  4 +--
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/dispatch/static/dispatch/src/plugin/PluginInstanceCombobox.vue b/src/dispatch/static/dispatch/src/plugin/PluginInstanceCombobox.vue
index 58183576bd61..9d8319f64b46 100644
--- a/src/dispatch/static/dispatch/src/plugin/PluginInstanceCombobox.vue
+++ b/src/dispatch/static/dispatch/src/plugin/PluginInstanceCombobox.vue
@@ -4,6 +4,8 @@
     :loading="loading"
     :items="items"
     item-title="plugin.slug"
+    item-value="plugin.slug"
+    @update:search="getFilteredData()"
     v-model:search="search"
     hide-selected
     :label="label"
@@ -39,14 +41,14 @@
 
 <script>
 import { cloneDeep, debounce } from "lodash"
-
+import SearchUtils from "@/search/utils"
 import PluginApi from "@/plugin/api"
 
 export default {
   name: "PluginCombobox",
   props: {
     modelValue: {
-      type: [Object],
+      type: Object,
       default: null,
     },
     type: {
@@ -78,7 +80,9 @@ export default {
   },
 
   created() {
-    this.plugin = cloneDeep(this.modelValue)
+    if (this.modelValue && this.modelValue.slug) {
+      this.plugin = cloneDeep(this.modelValue)
+    }
     this.fetchData()
   },
 
@@ -132,11 +136,21 @@ export default {
 
       let filterOptions = {
         q: this.search,
-        sortBy: ["slug"],
+        sortBy: ["Plugin.slug"],
         itemsPerPage: this.numItems,
         filter: JSON.stringify(filter),
       }
 
+      if (this.project) {
+        filterOptions = {
+          ...filterOptions,
+          filters: {
+            project: [this.project],
+          },
+        }
+        filterOptions = SearchUtils.createParametersFromTableOptions({ ...filterOptions })
+      }
+
       PluginApi.getAllInstances(filterOptions).then((response) => {
         this.items = response.data.items
         this.total = response.data.total
@@ -150,8 +164,8 @@ export default {
         this.loading = false
       })
     },
-    getFilteredData: debounce(function (options) {
-      this.fetchData(options)
+    getFilteredData: debounce(function () {
+      this.fetchData()
     }, 500),
   },
 
diff --git a/src/dispatch/static/dispatch/src/plugin/PluginMetadataInput.vue b/src/dispatch/static/dispatch/src/plugin/PluginMetadataInput.vue
index 1eeebe189088..2f20e998d8cd 100644
--- a/src/dispatch/static/dispatch/src/plugin/PluginMetadataInput.vue
+++ b/src/dispatch/static/dispatch/src/plugin/PluginMetadataInput.vue
@@ -138,7 +138,7 @@ export default {
     },
     addItem(plugin_idx) {
       if (!this.plugins[plugin_idx].metadata) {
-        this.$set(this.plugins[plugin_idx], "metadata", [])
+        this.plugins[plugin_idx].metadata = []
       }
       this.plugins[plugin_idx].metadata.push({ key: "", value: "" })
       this.$emit("update:modelValue", this.plugins)
@@ -148,7 +148,7 @@ export default {
       this.$emit("update:modelValue", this.plugins)
     },
     setPlugin(event) {
-      this.$set(this.plugins, event.idx, event.plugin)
+      this.plugins[event.idx] = event.plugin
       this.plugins[event.idx].slug = event.plugin.plugin.slug
       this.$emit("update:modelValue", this.plugins)
     },