From a4ee58ddd95625cd47f9d9920a066365976ffd9f Mon Sep 17 00:00:00 2001
From: kevgliss <kevgliss@gmail.com>
Date: Wed, 1 Feb 2023 17:12:53 -0800
Subject: [PATCH] Removes minimal models from pagination endpoints (#2932)

---
 src/dispatch/incident/priority/models.py               |  2 +-
 src/dispatch/incident/severity/models.py               |  2 +-
 src/dispatch/incident/type/models.py                   |  2 +-
 src/dispatch/participant_role/models.py                |  2 +-
 .../static/dispatch/src/tag/TagFilterAutoComplete.vue  | 10 ++++++++--
 .../dispatch/src/tag_type/TagTypeFilterCombobox.vue    |  2 +-
 src/dispatch/tag/models.py                             |  4 ++--
 src/dispatch/tag_type/models.py                        |  2 +-
 8 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/dispatch/incident/priority/models.py b/src/dispatch/incident/priority/models.py
index 25de4f0e3517..e310c9bf11c3 100644
--- a/src/dispatch/incident/priority/models.py
+++ b/src/dispatch/incident/priority/models.py
@@ -77,4 +77,4 @@ class IncidentPriorityReadMinimal(DispatchBase):
 
 class IncidentPriorityPagination(DispatchBase):
     total: int
-    items: List[IncidentPriorityReadMinimal] = []
+    items: List[IncidentPriorityRead] = []
diff --git a/src/dispatch/incident/severity/models.py b/src/dispatch/incident/severity/models.py
index a2c76e5d79f4..b162ea71a323 100644
--- a/src/dispatch/incident/severity/models.py
+++ b/src/dispatch/incident/severity/models.py
@@ -71,4 +71,4 @@ class IncidentSeverityReadMinimal(DispatchBase):
 
 class IncidentSeverityPagination(DispatchBase):
     total: int
-    items: List[IncidentSeverityReadMinimal] = []
+    items: List[IncidentSeverityRead] = []
diff --git a/src/dispatch/incident/type/models.py b/src/dispatch/incident/type/models.py
index e6b92667dabd..51bc5457cf7b 100644
--- a/src/dispatch/incident/type/models.py
+++ b/src/dispatch/incident/type/models.py
@@ -123,4 +123,4 @@ class IncidentTypeReadMinimal(DispatchBase):
 
 class IncidentTypePagination(DispatchBase):
     total: int
-    items: List[IncidentTypeReadMinimal] = []
+    items: List[IncidentTypeRead] = []
diff --git a/src/dispatch/participant_role/models.py b/src/dispatch/participant_role/models.py
index ce100f27e4cc..dcef84774f7e 100644
--- a/src/dispatch/participant_role/models.py
+++ b/src/dispatch/participant_role/models.py
@@ -45,4 +45,4 @@ class ParticipantRoleReadMinimal(ParticipantRoleRead):
 
 class ParticipantRolePagination(ParticipantRoleBase):
     total: int
-    items: List[ParticipantRoleReadMinimal] = []
+    items: List[ParticipantRoleRead] = []
diff --git a/src/dispatch/static/dispatch/src/tag/TagFilterAutoComplete.vue b/src/dispatch/static/dispatch/src/tag/TagFilterAutoComplete.vue
index 3b473ff8fbab..1d923b7ce52c 100644
--- a/src/dispatch/static/dispatch/src/tag/TagFilterAutoComplete.vue
+++ b/src/dispatch/static/dispatch/src/tag/TagFilterAutoComplete.vue
@@ -27,7 +27,9 @@
     </template>
     <template v-slot:selection="{ item, index }">
       <v-chip close @click:close="value.splice(index, 1)">
-        <span v-if="item.tag_type"> {{ item.tag_type.name }}/ </span>
+        <span v-if="item.tag_type">
+          <span v-if="!project">{{ item.project.name }}/</span>{{ item.tag_type.name }}/
+        </span>
         <a :href="item.uri" target="_blank" :title="item.description">
           {{ item.name }}
         </a>
@@ -35,7 +37,11 @@
     </template>
     <template v-slot:item="data">
       <v-list-item-content>
-        <v-list-item-title> {{ data.item.tag_type.name }}/{{ data.item.name }} </v-list-item-title>
+        <v-list-item-title>
+          <span v-if="!project">{{ data.item.project.name }}/</span>{{ data.item.tag_type.name }}/{{
+            data.item.name
+          }}
+        </v-list-item-title>
         <v-list-item-subtitle style="width: 200px" class="text-truncate">
           {{ data.item.description }}
         </v-list-item-subtitle>
diff --git a/src/dispatch/static/dispatch/src/tag_type/TagTypeFilterCombobox.vue b/src/dispatch/static/dispatch/src/tag_type/TagTypeFilterCombobox.vue
index 83bf50f7c056..a94be81b4e17 100644
--- a/src/dispatch/static/dispatch/src/tag_type/TagTypeFilterCombobox.vue
+++ b/src/dispatch/static/dispatch/src/tag_type/TagTypeFilterCombobox.vue
@@ -32,7 +32,7 @@
     </template>
     <template v-slot:item="data">
       <v-list-item-content>
-        <v-list-item-title> {{ data.item.name }} </v-list-item-title>
+        <v-list-item-title> {{ data.item.project.name }}/{{ data.item.name }} </v-list-item-title>
         <v-list-item-subtitle style="width: 200px" class="text-truncate">
           {{ data.item.description }}
         </v-list-item-subtitle>
diff --git a/src/dispatch/tag/models.py b/src/dispatch/tag/models.py
index 8148cab81e9f..7910d791e7d5 100644
--- a/src/dispatch/tag/models.py
+++ b/src/dispatch/tag/models.py
@@ -64,9 +64,9 @@ class TagReadMinimal(DispatchBase):
     uri: Optional[str] = Field(None, nullable=True)
     discoverable: Optional[bool] = True
     description: Optional[str] = Field(None, nullable=True)
-    tag_type: Optional[TagTypeReadMinimal]
+    tag_type: Optional[TagTypeRead]
 
 
 class TagPagination(DispatchBase):
-    items: List[TagReadMinimal]
+    items: List[TagRead]
     total: int
diff --git a/src/dispatch/tag_type/models.py b/src/dispatch/tag_type/models.py
index 3120bf615453..65def62d376f 100644
--- a/src/dispatch/tag_type/models.py
+++ b/src/dispatch/tag_type/models.py
@@ -48,5 +48,5 @@ class TagTypeReadMinimal(DispatchBase):
 
 
 class TagTypePagination(DispatchBase):
-    items: List[TagTypeReadMinimal]
+    items: List[TagTypeRead]
     total: int