From 8b15d9c334aa009247961847463524f09c4a3fcc Mon Sep 17 00:00:00 2001
From: David Whittaker <84562015+whitdog47@users.noreply.github.com>
Date: Mon, 20 Nov 2023 11:20:59 -0800
Subject: [PATCH] Fixing project and case type select (#4010)

---
 .../dispatch/src/case/type/CaseTypeSelect.vue | 27 ++++++++++---------
 .../dispatch/src/project/ProjectSelect.vue    | 16 +++--------
 .../static/e2e/pages/report-incident-page.ts  |  2 +-
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/src/dispatch/static/dispatch/src/case/type/CaseTypeSelect.vue b/src/dispatch/static/dispatch/src/case/type/CaseTypeSelect.vue
index 76b8f2d443e1..eebee8a357ac 100644
--- a/src/dispatch/static/dispatch/src/case/type/CaseTypeSelect.vue
+++ b/src/dispatch/static/dispatch/src/case/type/CaseTypeSelect.vue
@@ -1,17 +1,16 @@
 <template>
-  <v-combobox
+  <v-select
     v-model="case_type"
     :items="items"
-    v-model:search="search"
     :menu-props="{ maxHeight: '400' }"
     item-title="name"
     item-value="id"
     :label="label"
-    placeholder="Start typing to search"
     :hint="hint"
     return-object
     :loading="loading"
     no-filter
+    :error-messages="show_error"
   >
     <template #item="data">
       <v-list-item v-bind="data.props" :title="null">
@@ -26,7 +25,7 @@
         <v-list-item-subtitle> Load More </v-list-item-subtitle>
       </v-list-item>
     </template>
-  </v-combobox>
+  </v-select>
 </template>
 
 <script>
@@ -82,6 +81,14 @@ export default {
         this.$emit("update:modelValue", value)
       },
     },
+    show_error() {
+      let items_names = this.items.map((item) => item.name)
+      let selected_item = this.case_type?.name || ""
+      if (items_names.includes(selected_item)) {
+        return null
+      }
+      return "Not a valid case type"
+    },
   },
 
   methods: {
@@ -89,12 +96,13 @@ export default {
       this.numItems = this.numItems + 5
       this.fetchData()
     },
+
     fetchData() {
       this.error = null
       this.loading = "error"
 
       let filterOptions = {
-        q: this.search,
+        q: "",
         sortBy: ["name"],
         descending: [false],
         itemsPerPage: this.numItems,
@@ -102,11 +110,11 @@ export default {
 
       if (this.project) {
         filterOptions = {
-          ...filterOptions,
           filters: {
             project: [this.project],
             enabled: ["true"],
           },
+          ...filterOptions,
         }
       }
 
@@ -115,13 +123,6 @@ export default {
       CaseTypeApi.getAll(filterOptions).then((response) => {
         this.items = response.data.items
 
-        if (this.case_type) {
-          // check to see if the current selection is available in the list and if not we add it
-          if (!this.items.find((match) => match.id === this.case_type.id)) {
-            this.items = [this.case_type].concat(this.items)
-          }
-        }
-
         this.total = response.data.total
         this.loading = false
 
diff --git a/src/dispatch/static/dispatch/src/project/ProjectSelect.vue b/src/dispatch/static/dispatch/src/project/ProjectSelect.vue
index fb7622d7b5e4..774466451bbc 100644
--- a/src/dispatch/static/dispatch/src/project/ProjectSelect.vue
+++ b/src/dispatch/static/dispatch/src/project/ProjectSelect.vue
@@ -1,14 +1,13 @@
 <template>
-  <v-combobox
+  <v-select
     :items="items"
     :label="label"
     :loading="loading"
     :menu-props="{ maxHeight: '400' }"
-    v-model:search="search"
-    @update:search="getFilteredData({ q: $event })"
     item-title="name"
     item-value="id"
     v-model="project"
+    return-object
   >
     <template #no-data>
       <v-list-item>
@@ -31,7 +30,7 @@
         <v-list-item-subtitle> Load More </v-list-item-subtitle>
       </v-list-item>
     </template>
-  </v-combobox>
+  </v-select>
 </template>
 
 <script>
@@ -84,7 +83,7 @@ export default {
       this.error = null
       this.loading = "error"
       let filterOptions = {
-        q: this.search,
+        q: "",
         itemsPerPage: this.numItems,
         sortBy: ["name"],
         descending: [false],
@@ -93,13 +92,6 @@ export default {
       ProjectApi.getAll(filterOptions).then((response) => {
         this.items = response.data.items
 
-        if (this.project) {
-          // check to see if the current selection is available in the list and if not we add it
-          if (!this.items.find((match) => match.id === this.project.id)) {
-            this.items = [this.project].concat(this.items)
-          }
-        }
-
         this.total = response.data.total
 
         if (this.items.length < this.total) {
diff --git a/tests/static/e2e/pages/report-incident-page.ts b/tests/static/e2e/pages/report-incident-page.ts
index b270b61876dd..66ccd62e9a1c 100644
--- a/tests/static/e2e/pages/report-incident-page.ts
+++ b/tests/static/e2e/pages/report-incident-page.ts
@@ -21,7 +21,7 @@ export class ReportIncidentPage {
     this.reportHeader = page.getByText("Report Incident").first()
     this.titleTextBox = page.getByLabel("Title", { exact: true })
     this.descriptionTextBox = page.getByLabel("Description", { exact: true })
-    this.projectDropdown = page.getByRole("combobox").filter({ hasText: "Project" }).locator("i")
+    this.projectDropdown = page.getByRole("button", { name: "Project" })
     this.typeDropdown = page.getByRole("button", { name: "Type" })
     this.priorityDropdown = page.getByRole("button", { name: "Priority" })
     this.tagsDropdown = page.getByRole("combobox").filter({ hasText: "Tags" }).locator("i")