Merge pull request #1630 from NicoPennec/main

Various fixes

package.json

@@ -25,7 +25,7 @@
     "@fullcalendar/multimonth": "6.1.15",
     "@fullcalendar/vue3": "6.1.15",
     "@google/model-viewer": "3.5.0",
-    "@sentry/vue": "8.45.1",
+    "@sentry/vue": "8.47.0",
     "@unhead/vue": "1.11.14",
     "@vuepic/vue-datepicker": "9.0.3",
     "async": "3.2.6",
@@ -43,7 +43,7 @@
     "panzoom": "9.4.3",
     "papaparse": "5.4.1",
     "qrcode.vue": "3.6.0",
-    "sanitize-html": "2.13.1",
+    "sanitize-html": "2.14.0",
     "socket.io-client": "4.8.1",
     "superagent": "9.0.2",
     "textarea-caret": "3.1.0",

src/components/modals/AddMetadataModal.vue

@@ -56,7 +56,6 @@
           </div>
 
           <text-field
-            ref="addChoiceField"
             v-model.trim="valueToAdd"
             :button-label="$t('main.add')"
             @enter="addValue"
@@ -302,8 +301,8 @@ export default {
   },
 
   methods: {
-    addValue() {
-      const newValue = this.$refs.addChoiceField.value
+    addValue(value) {
+      const newValue = value
       if (!this.form.values.find(v => v === newValue) && newValue) {
         this.form.values.push(newValue)
         if (this.form.data_type === 'taglist') {

src/components/modals/ManageShotsModal.vue

@@ -154,6 +154,8 @@
 <script>
 import { mapGetters } from 'vuex'
 
+import shotStore from '@/store/modules/shots'
+
 import { modalMixin } from '@/components/modals/base_modal'
 
 import stringHelpers from '@/lib/string'
@@ -220,8 +222,7 @@ export default {
       'currentProduction',
       'displayedEpisodes',
       'displayedSequences',
-      'isTVShow',
-      'shots'
+      'isTVShow'
     ]),
 
     isAddEpisodeAllowed() {
@@ -246,6 +247,10 @@ export default {
         return this.names.shot === shot.name
       })
       return !isEmpty && !isExist && this.selectedSequenceId
+    },
+
+    shots() {
+      return shotStore.cache.shots
     }
   },
 
@@ -352,6 +357,9 @@ export default {
       if (this.active) {
         this.shotPadding = '1'
         this.sequences = this.displayedSequences
+        if (this.selectedSequenceId) {
+          this.selectSequence(this.selectedSequenceId)
+        }
         setTimeout(() => {
           if (this.isTVShow) {
             this.$refs.addEpisodeInput.focus()

src/components/pages/Notifications.vue

@@ -44,9 +44,9 @@
           <span class="filler"></span>
           <button-simple
             class="flexrow-item"
-            @click="markAllNotificationsRead"
-            :loading="loading.markAll"
+            :is-loading="loading.markAll"
             :text="$t('notifications.mark_all_as_read')"
+            @click="markAllNotificationsRead"
           />
         </div>
         <div
@@ -137,7 +137,7 @@
                   class="selector"
                   :label="$t('notifications.read')"
                   is-small
-                  @input="value => toggleNotificationRead(notification, value)"
+                  @click="value => toggleNotificationRead(notification, value)"
                   :value="notification.read ? 'true' : 'false'"
                 />
               </div>
@@ -612,7 +612,7 @@ export default {
     async markAllNotificationsRead() {
       this.loading.markAll = true
       await this.markAllNotificationsAsRead()
-      this.loading.markAll = true
+      this.loading.markAll = false
     }
   },