Merge branch 'master' into bugfix/export-preview-scoll

Netflix · Nov 1, 2023 · 9869977 · 9869977
2 parents fcbe18b + a09607b
commit 9869977
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 16 deletions.
diff --git a/src/dispatch/plugins/dispatch_aws/plugin.py b/src/dispatch/plugins/dispatch_aws/plugin.py
@@ -75,4 +75,5 @@ def consume(self, db_session, project):
                     if entries:
                         client.delete_message_batch(QueueUrl=queue_url, Entries=entries)
         except Exception as e:
+            db_session.rollback()
             log.exception(e)
diff --git a/src/dispatch/static/dispatch/src/case/ParticipantsTab.vue b/src/dispatch/static/dispatch/src/case/ParticipantsTab.vue
@@ -2,7 +2,7 @@
   <div>
     <div v-if="participants && participants.length">
       <span v-for="participant in participants" :key="participant.id">
-        <v-list-item :href="participant.individual.weblink" target="_blank">
+        <v-list-item :href="participant.individual.weblink" target="_blank" class="my-3">
           <v-list-item-title ref="participants">
             {{ participant.individual.name }} ({{ activeRoles(participant.participant_roles) }})
           </v-list-item-title>

diff --git a/src/dispatch/static/dispatch/src/case/ResourcesTab.vue b/src/dispatch/static/dispatch/src/case/ResourcesTab.vue
@@ -1,6 +1,6 @@
 <template>
   <v-list>
-    <v-list-item v-if="ticket" :href="ticket.weblink" target="_blank">
+    <v-list-item v-if="ticket" :href="ticket.weblink" target="_blank" class="my-3">
       <v-list-item-title>Ticket</v-list-item-title>
       <v-list-item-subtitle>{{ ticket.description }}</v-list-item-subtitle>
 
@@ -9,7 +9,7 @@
       </template>
     </v-list-item>
     <v-divider />
-    <v-list-item v-if="conversation" :href="conversation.weblink" target="_blank">
+    <v-list-item v-if="conversation" :href="conversation.weblink" target="_blank" class="my-3">
       <v-list-item-title>Conversation</v-list-item-title>
       <v-list-item-subtitle>{{ conversation.description }}</v-list-item-subtitle>
 
@@ -19,7 +19,7 @@
     </v-list-item>
     <v-divider />
     <span v-for="group in groups" :key="group.resource_id">
-      <v-list-item :href="group.weblink" target="_blank">
+      <v-list-item :href="group.weblink" target="_blank" class="my-3">
         <v-list-item-title>{{ deslug(group.resource_type) }}</v-list-item-title>
         <v-list-item-subtitle>{{ group.description }}</v-list-item-subtitle>
 
@@ -30,7 +30,7 @@
       <v-divider />
     </span>
     <v-divider />
-    <v-list-item v-if="storage" :href="storage.weblink" target="_blank">
+    <v-list-item v-if="storage" :href="storage.weblink" target="_blank" class="my-3">
       <v-list-item-title>Storage</v-list-item-title>
       <v-list-item-subtitle>{{ storage.description }}</v-list-item-subtitle>
 
@@ -40,7 +40,7 @@
     </v-list-item>
     <v-divider />
     <span v-for="document in documents" :key="document.resource_id">
-      <v-list-item :href="document.weblink" target="_blank">
+      <v-list-item :href="document.weblink" target="_blank" class="my-3">
         <v-list-item-title>{{ deslug(document.resource_type) }}</v-list-item-title>
         <v-list-item-subtitle>{{ document.description }}</v-list-item-subtitle>
 
@@ -59,7 +59,7 @@
         (!documents && documentPluginEnabled)
       "
     >
-      <v-list-item v-if="!loading" @click="createAllResources()">
+      <v-list-item v-if="!loading" @click="createAllResources()" class="my-3">
         <v-list-item-title>Recreate Missing Resources</v-list-item-title>
         <v-list-item-subtitle
           >Initiate a retry for creating any missing or unsuccesfully created
@@ -69,7 +69,7 @@
           <v-icon>refresh</v-icon>
         </template>
       </v-list-item>
-      <v-list-item v-else-if="loading">
+      <v-list-item v-else-if="loading" class="my-3">
         <v-list-item-title>Creating resources...</v-list-item-title>
         <v-list-item-subtitle
           >Initiate a retry for creating any missing or unsuccesfully created

diff --git a/src/dispatch/static/dispatch/src/incident/ParticipantsTab.vue b/src/dispatch/static/dispatch/src/incident/ParticipantsTab.vue
@@ -2,7 +2,7 @@
   <div>
     <div v-if="participants && participants.length">
       <span v-for="participant in participants" :key="participant.id">
-        <v-list-item :href="participant.individual.weblink" target="_blank">
+        <v-list-item :href="participant.individual.weblink" target="_blank" class="my-3">
           <v-list-item-title>
             {{ participant.individual.name }} ({{ activeRoles(participant.participant_roles) }})
           </v-list-item-title>

diff --git a/src/dispatch/static/dispatch/src/incident/ResourcesTab.vue b/src/dispatch/static/dispatch/src/incident/ResourcesTab.vue
@@ -1,6 +1,6 @@
 <template>
   <v-list>
-    <v-list-item v-if="ticket" :href="ticket.weblink" target="_blank">
+    <v-list-item v-if="ticket" :href="ticket.weblink" target="_blank" class="my-3">
       <v-list-item-title>Ticket</v-list-item-title>
       <v-list-item-subtitle>{{ ticket.description }}</v-list-item-subtitle>
 
@@ -9,7 +9,7 @@
       </template>
     </v-list-item>
     <v-divider />
-    <v-list-item v-if="conference" :href="conference.weblink" target="_blank">
+    <v-list-item v-if="conference" :href="conference.weblink" target="_blank" class="my-3">
       <v-list-item-title>Video Conference</v-list-item-title>
       <v-list-item-subtitle>{{ conference.description }}</v-list-item-subtitle>
 
@@ -18,7 +18,7 @@
       </template>
     </v-list-item>
     <v-divider />
-    <v-list-item v-if="conversation" :href="conversation.weblink" target="_blank">
+    <v-list-item v-if="conversation" :href="conversation.weblink" target="_blank" class="my-3">
       <v-list-item-title>Conversation</v-list-item-title>
       <v-list-item-subtitle>{{ conversation.description }}</v-list-item-subtitle>
 
@@ -27,7 +27,7 @@
       </template>
     </v-list-item>
     <v-divider />
-    <v-list-item v-if="storage" :href="storage.weblink" target="_blank">
+    <v-list-item v-if="storage" :href="storage.weblink" target="_blank" class="my-3">
       <v-list-item-title>Storage</v-list-item-title>
       <v-list-item-subtitle>{{ storage.description }}</v-list-item-subtitle>
 
@@ -37,7 +37,7 @@
     </v-list-item>
     <v-divider />
     <span v-for="document in documents" :key="document.resource_id">
-      <v-list-item :href="document.weblink" target="_blank">
+      <v-list-item :href="document.weblink" target="_blank" class="my-3">
         <v-list-item-title>{{ deslug(document.resource_type) }}</v-list-item-title>
         <v-list-item-subtitle>{{ document.description }}</v-list-item-subtitle>
 
@@ -56,7 +56,7 @@
         (!documents && documentPluginEnabled)
       "
     >
-      <v-list-item v-if="!loading" @click="createAllResources()">
+      <v-list-item v-if="!loading" @click="createAllResources()" class="my-3">
         <v-list-item-title>Recreate Missing Resources</v-list-item-title>
         <v-list-item-subtitle
           >Initiate a retry for creating any missing or unsuccesfully created
@@ -66,7 +66,7 @@
           <v-icon>refresh</v-icon>
         </template>
       </v-list-item>
-      <v-list-item v-else-if="loading">
+      <v-list-item v-else-if="loading" class="my-3">
         <v-list-item-title>Creating resources...</v-list-item-title>
         <v-list-item-subtitle
           >Initiate a retry for creating any missing or unsuccesfully created

diff --git a/src/dispatch/static/dispatch/src/main.js b/src/dispatch/static/dispatch/src/main.js
@@ -8,6 +8,7 @@ import { plugin, defaultConfig } from "@formkit/vue"
 import "roboto-fontface/css/roboto/roboto-fontface.css"
 import "font-awesome/css/font-awesome.css"
 import "@formkit/themes/genesis"
+import "./styles/index.scss"
 
 import * as Sentry from "@sentry/vue"
 

diff --git a/src/dispatch/static/dispatch/src/styles/index.scss b/src/dispatch/static/dispatch/src/styles/index.scss
@@ -0,0 +1,3 @@
+.v-data-table {
+    font-size: 0.875rem;
+}