Merge pull request #1481 from frankrousseau/master

Breakdown improvements
cgwire · Jul 9, 2024 · ed3f1b7 · ed3f1b7
2 parents c7c2740 + aad11a6
commit ed3f1b7
Show file tree

Hide file tree

Showing 17 changed files with 659 additions and 207 deletions.
diff --git a/src/components/mixins/search.js b/src/components/mixins/search.js
@@ -11,6 +11,10 @@ export const searchMixin = {
       if (this.applySearch) this.applySearch(searchQuery.search_query)
     },
 
+    removeSearchQuery(searchQuery) {
+      this.removeShotSearch(searchQuery).catch(console.error)
+    },
+
     focusSearchField(options) {
       if (this.searchField) {
         this.searchField.focus(options)

diff --git a/src/components/modals/EditAssetModal.vue b/src/components/modals/EditAssetModal.vue
@@ -31,7 +31,7 @@
           <text-field
             ref="nameField"
             :label="$t('assets.fields.name')"
-            v-model="form.name"
+            v-model.trim="form.name"
             @enter="runConfirmation"
             v-focus
           />

diff --git a/src/components/modals/EditEditModal.vue b/src/components/modals/EditEditModal.vue
@@ -26,7 +26,7 @@
           <text-field
             ref="nameField"
             :label="$t('edits.fields.name')"
-            v-model="form.name"
+            v-model.trim="form.name"
             @enter="runConfirmation"
             v-focus
           />

diff --git a/src/components/modals/EditEpisodeModal.vue b/src/components/modals/EditEpisodeModal.vue
@@ -20,7 +20,7 @@
           <text-field
             ref="nameField"
             :label="$t('episodes.fields.name')"
-            v-model="form.name"
+            v-model.trim="form.name"
             @enter="runConfirmation"
             v-focus
           />

diff --git a/src/components/modals/EditSequenceModal.vue b/src/components/modals/EditSequenceModal.vue
@@ -20,7 +20,7 @@
           <text-field
             ref="nameField"
             :label="$t('sequences.fields.name')"
-            v-model="form.name"
+            v-model.trim="form.name"
             @enter="runConfirmation"
             v-focus
           />

diff --git a/src/components/modals/EditShotModal.vue b/src/components/modals/EditShotModal.vue
@@ -25,7 +25,7 @@
           <text-field
             ref="nameField"
             :label="$t('shots.fields.name')"
-            v-model="form.name"
+            v-model.trim="form.name"
             @enter="runConfirmation"
             v-focus
           />

diff --git a/src/components/modals/PreviewModal.vue b/src/components/modals/PreviewModal.vue
@@ -7,6 +7,9 @@
   >
     <div class="modal-background" @click="$emit('cancel')"></div>
     <div class="new-window">
+      <a class="mr1" :href="previewDlPath" v-if="previewFileId">
+        <arrow-down-icon />
+      </a>
       <a target="_blank" :href="previewPath">
         <arrow-up-right-icon />
       </a>
@@ -24,13 +27,14 @@ import { modalMixin } from '@/components/modals/base_modal'
 
 import { getDownloadAttachmentPath } from '@/lib/path'
 
-import { ArrowUpRightIcon } from 'vue-feather-icons'
+import { ArrowDownIcon, ArrowUpRightIcon } from 'vue-feather-icons'
 
 export default {
   name: 'preview-modal',
   mixins: [modalMixin],
 
   components: {
+    ArrowDownIcon,
     ArrowUpRightIcon
   },
 
@@ -68,6 +72,11 @@ export default {
         return getDownloadAttachmentPath(this.attachment)
       }
       return ''
+    },
+
+    previewDlPath() {
+      const previewId = this.previewFileId
+      return `/api/pictures/originals/preview-files/${previewId}/download`
     }
   },