Merge pull request #1656 from NicoPennec/main

Various fixes

package.json

@@ -25,9 +25,9 @@
     "@fullcalendar/multimonth": "6.1.15",
     "@fullcalendar/vue3": "6.1.15",
     "@google/model-viewer": "4.0.0",
-    "@sentry/vue": "8.47.0",
+    "@sentry/vue": "8.48.0",
     "@unhead/vue": "1.11.15",
-    "@vuepic/vue-datepicker": "10.0.0",
+    "@vuepic/vue-datepicker": "11.0.1",
     "async": "3.2.6",
     "bowser": "2.11.0",
     "chart.js": "4.4.7",
@@ -36,7 +36,7 @@
     "color-string": "1.9.1",
     "fabric": "cgwire/fabric.js",
     "lucide-vue-next": "0.469.0",
-    "marked": "15.0.6",
+    "marked": "14.1.4",
     "marked-emoji": "1.4.3",
     "moment": "2.30.1",
     "moment-timezone": "0.5.46",
@@ -49,7 +49,7 @@
     "textarea-caret": "3.1.0",
     "thenby": "1.3.4",
     "three": "0.172.0",
-    "uuid": "11.0.4",
+    "uuid": "11.0.5",
     "v-autosize": "2.0.1",
     "vue": "3.5.13",
     "vue-3-slider-component": "1.0.1",
@@ -82,7 +82,7 @@
     "prettier": "3.4.2",
     "sass": "1.83.1",
     "vite": "6.0.7",
-    "vitest": "0.34.6",
+    "vitest": "2.1.8",
     "vitest-localstorage-mock": "0.1.2"
   },
   "engines": {

src/App.vue

@@ -43,6 +43,7 @@ export default {
       'assetTypeMap',
       'currentEpisode',
       'currentProduction',
+      'departmentMap',
       'editMap',
       'episodeMap',
       'isCurrentUserAdmin',

src/components/lists/TaskList.vue

@@ -523,7 +523,7 @@ export default {
             const entity = this.shotMap.get(task.entity.id)
             if (previousTask) {
               const previousEntity = this.shotMap.get(previousTask.entity.id)
-              if (previousEntity.sequence_id !== entity.sequence_id) {
+              if (previousEntity?.sequence_id !== entity?.sequence_id) {
                 result.push(currentTasks)
                 currentTasks = {
                   name: task.sequence_name,
@@ -545,7 +545,7 @@ export default {
             const entity = this.assetMap.get(task.entity.id)
             if (previousTask) {
               const previousEntity = this.assetMap.get(previousTask.entity.id)
-              if (previousEntity.asset_type_id !== entity.asset_type_id) {
+              if (previousEntity?.asset_type_id !== entity?.asset_type_id) {
                 result.push(currentTasks)
                 currentTasks = {
                   name: task.entity_type_name,
@@ -1102,6 +1102,7 @@ td.retake-count {
       margin-bottom: 0.5em;
       margin-top: 0.3em;
       padding: 0 0.5em;
+      word-break: break-word;
     }
     .task-data {
       padding: 0 0.1em 0 0.3em;

src/components/mixins/player.js

@@ -386,9 +386,15 @@ export const playerMixin = {
     },
 
     hideBars() {
-      this.$refs.header.style.opacity = 0
-      this.$refs['button-bar'].style.opacity = 0
-      this.$refs['video-progress'].$el.style.opacity = 0
+      if (this.$refs.header) {
+        this.$refs.header.style.opacity = 0
+      }
+      if (this.$refs['button-bar']) {
+        this.$refs['button-bar'].style.opacity = 0
+      }
+      if (this.$refs['video-progress']) {
+        this.$refs['video-progress'].$el.style.opacity = 0
+      }
     },
 
     updateTaskPanel() {
@@ -437,6 +443,7 @@ export const playerMixin = {
       } else if (this.isCurrentPreviewModel) {
         this.playModel()
       } else {
+        if (!this.rawPlayer) return
         this._setCurrentTimeOnHandleIn()
         this.rawPlayer.play()
         if (this.isComparing) {
@@ -588,6 +595,7 @@ export const playerMixin = {
         previousFrameTime = previousFrame / this.fps
         this.setFullPlayerTime(previousFrameTime)
       } else {
+        if (!this.rawPlayer) return
         this.rawPlayer.goPreviousFrame()
         if (this.isComparing) this.syncComparisonPlayer()
         const annotation = this.getAnnotation(this.rawPlayer.getCurrentTime())

src/components/mixins/search.js

@@ -18,21 +18,19 @@ export const searchMixin = {
     },
 
     focusSearchField(options) {
-      if (this.searchField) {
-        this.searchField.focus(options)
-      }
+      this.searchField?.focus(options)
     },
 
     setSearchFromUrl() {
       const searchQuery = this.searchField?.getValue()
       const searchFromUrl = this.$route.query.search
       if (!searchQuery && searchFromUrl) {
-        this.searchField.setValue(searchFromUrl)
+        this.searchField?.setValue(searchFromUrl)
       }
     },
 
     setSearchInUrl() {
-      const searchQuery = this.searchField.getValue()
+      const searchQuery = this.searchField?.getValue()
       if (this.$route.query.search !== searchQuery) {
         this.$router.push({
           query: {

src/components/modals/EditSearchFilterGroupModal.vue

@@ -43,7 +43,7 @@
         </form>
 
         <div v-if="groupToEdit?.id" class="mt2">
-          $t('main.created_by'):
+          {{ $t('main.created_by') }}:
           <people-name :person="personMap.get(groupToEdit.person_id)" />
         </div>
 

src/components/modals/EditSearchFilterModal.vue

@@ -53,7 +53,7 @@
         </form>
 
         <div v-if="searchQueryToEdit?.id" class="mt2">
-          $t('main.created_by'):
+          {{ $t('main.created_by') }}:
           <people-name :person="personMap.get(searchQueryToEdit.person_id)" />
         </div>
 

src/components/pages/Asset.vue

@@ -64,25 +64,23 @@
         <div class="flexrow mt1">
           <span
             class="tag tag-standby"
-            v-show="
-              currentSection === 'casting' && currentAsset.is_casting_standby
+            v-if="
+              currentSection === 'casting' && currentAsset?.is_casting_standby
             "
           >
             {{ $t('breakdown.fields.standby') }}
           </span>
-          <span
-            class="flexrow-item mt05"
-            v-show="currentSection === 'schedule'"
-          >
-            {{ $t('schedule.zoom_level') }}:
-          </span>
-          <combobox-number
-            class="zoom-level flexrow-item"
-            :options="zoomOptions"
-            is-simple
-            v-model="zoomLevel"
-            v-show="currentSection === 'schedule'"
-          />
+          <template v-if="currentSection === 'schedule'">
+            <span class="flexrow-item mt05">
+              {{ $t('schedule.zoom_level') }}:
+            </span>
+            <combobox-number
+              class="zoom-level flexrow-item"
+              is-simple
+              :options="zoomOptions"
+              v-model="zoomLevel"
+            />
+          </template>
         </div>
 
         <div class="flexrow infos" v-show="currentSection === 'infos'">

src/components/pages/AssetLibrary.vue

@@ -277,6 +277,7 @@ export default {
     background-color: var(--background);
     border: 5px solid transparent;
     border-radius: 1em;
+    height: fit-content;
     transition: border-color 0.2s ease-in-out;
 
     &.selectable-item {
@@ -310,6 +311,7 @@ export default {
 
       .entity-name {
         margin-left: 0.5em;
+        word-break: break-word;
       }
     }
   }

src/components/pages/Assets.vue

@@ -1050,7 +1050,7 @@ export default {
     currentSection() {
       if (
         this.isTVShow &&
-        this.currentEpisode.id &&
+        this.currentEpisode?.id &&
         !this.displayedAssets.find(
           asset => asset.episode_id === this.currentEpisode.id
         )

src/components/pages/ProductionQuota.vue

@@ -96,7 +96,7 @@
         :max-quota="maxQuota"
       />
     </div>
-    <div class="column side-column" v-if="showInfo">
+    <div class="column side-column" v-if="showInfo && currentPerson">
       <people-quota-info
         :person="currentPerson"
         :year="currentYear"

src/components/pages/Task.vue

@@ -92,15 +92,17 @@
                 </em>
               </div>
 
-              <div class="set-main-preview flexrow-item flexrow pull-right">
+              <div
+                class="set-main-preview flexrow-item flexrow pull-right"
+                v-if="isCurrentUserManager && $refs['preview-player']"
+              >
                 <button
                   :class="{
                     button: true,
                     'flexrow-item': true,
                     'is-loading': loading.setPreview
                   }"
                   @click="setPreview"
-                  v-if="isCurrentUserManager"
                 >
                   <image-icon class="icon" />
                   <span class="text">
@@ -1012,9 +1014,10 @@ export default {
     },
 
     setPreview() {
+      const previewPlayer = this.$refs['preview-player']
+      if (!previewPlayer) return
       this.loading.setPreview = true
       this.errors.setPreview = false
-      const previewPlayer = this.$refs['preview-player']
       const previewId = previewPlayer.currentPreview.id
       this.$store
         .dispatch('setPreview', {

src/components/pages/TaskType.vue

@@ -533,7 +533,7 @@ export default {
   },
 
   mounted() {
-    this.searchField.setValue(this.$route.query.search || '')
+    this.searchField?.setValue(this.$route.query.search || '')
     this.clearSelectedTasks()
     const isAssets = this.$route.path.includes('assets')
     const isShots = this.$route.path.includes('shots')

src/components/previews/PlaylistProgress.vue

@@ -31,7 +31,7 @@
       @mousedown="startPlaylistProgressDrag"
       @touchstart="
         () => {
-          startProgressDrag()
+          startPlaylistProgressDrag()
           isFrameNumberVisible = true
         }
       "
@@ -52,7 +52,7 @@
         @mousedown="startPlaylistProgressDrag"
         @touchstart="
           () => {
-            startProgressDrag
+            startPlaylistProgressDrag()
             isFrameNumberVisible = true
           }
         "

src/components/previews/PreviewPlayer.vue

@@ -105,7 +105,7 @@
           :task="task"
           @comment-added="$emit('comment-added')"
           @time-code-clicked="timeCodeClicked"
-          v-show="!isCommentsHidden"
+          v-if="!isCommentsHidden"
         />
       </div>
     </div>
@@ -443,7 +443,10 @@
             v-if="currentPreview && !isConcept"
           />
 
-          <div class="flexrow" v-if="fullScreen && !isConcept">
+          <div
+            class="flexrow"
+            v-if="fullScreen && !isConcept && lastPreviewFileOptions.length"
+          >
             <combobox-styled
               class="preview-combo flexrow-item"
               :options="lastPreviewFileOptions"
@@ -476,7 +479,7 @@
             :title="$t('playlists.actions.download_file')"
             v-if="
               !isCurrentUserArtist ||
-              currentProduction.is_preview_download_allowed
+              currentProduction?.is_preview_download_allowed
             "
           >
             <download-icon class="icon is-small" />
@@ -759,11 +762,11 @@ export default {
   computed: {
     ...mapGetters([
       'assetMap',
-      'currentProduction',
       'getProductionBackgrounds',
       'isCurrentUserArtist',
       'isTVShow',
       'organisation',
+      'productionMap',
       'selectedConcepts',
       'user'
     ]),
@@ -827,6 +830,10 @@ export default {
       }
     },
 
+    currentProduction() {
+      return this.productionMap.get(this.task.project_id)
+    },
+
     marginBottom() {
       let margin = 32 // buttons bar
       if (this.isMovie) margin += 28 // progress bar
@@ -1473,7 +1480,7 @@ export default {
 
     isDefaultBackground(background) {
       const defaultId =
-        this.currentProduction.default_preview_background_file_id
+        this.currentProduction?.default_preview_background_file_id
       return defaultId ? background.id === defaultId : background.is_default
     },
 
@@ -2002,6 +2009,7 @@ export default {
   watch: {
     current3DAnimation() {
       if (this.is3DModel) {
+        this.isPlaying = true
         this.previewViewer.playModelAnimation(this.current3DAnimation)
       }
     },
@@ -2032,7 +2040,7 @@ export default {
         }, 500)
       } else if (this.is3DModel) {
         this.fixCanvasSize({ width: 0, height: 0, left: 0, top: 0 })
-        this.previewViewer.resize()
+        this.previewViewer?.resize()
       } else if (this.isSound || this.isFile) {
         // hide canvas
         this.fixCanvasSize({ width: 0, height: 0, left: 0, top: 0 })

src/components/previews/VideoViewer.vue

@@ -172,6 +172,7 @@ export default {
         this.video.addEventListener('resize', this.resetSize)
 
         this.video.addEventListener('loadedmetadata', () => {
+          if (!this.video) return
           this.configureVideo()
           this.onWindowResize()
           this.setCurrentTime(0)

src/components/tops/Topbar.vue

@@ -614,7 +614,6 @@ export default {
             this.$router.push({
               params: {
                 production_id: routeProductionId,
-                section: this.currentProjectSection,
                 episode_id: this.currentEpisodeId
               },
               query

src/components/widgets/AddComment.vue

@@ -457,7 +457,7 @@ export default {
   mounted() {
     const production = this.productionMap.get(this.task.project_id)
     this.mode =
-      production.is_publish_default_for_artists && this.isCurrentUserArtist
+      production?.is_publish_default_for_artists && this.isCurrentUserArtist
         ? 'publish'
         : 'status'
 

src/components/widgets/Spinner.vue

@@ -37,9 +37,9 @@ export default {
   },
 
   computed: {
-    sizeStyle: function () {
+    sizeStyle() {
       return {
-        width: this.size ? this.size + 'px' : 'auto'
+        width: this.size ? `${this.size}px` : null
       }
     }
   }