Merge pull request #1675 from frankrousseau/main

Main

src/components/lists/TaskList.vue

@@ -873,6 +873,7 @@ export default {
         this.$t('tasks.fields.entity_name'),
         this.$t('tasks.fields.task_status'),
         this.$t('tasks.fields.assignees'),
+        this.$t('tasks.fields.difficulty'),
         this.$t('tasks.fields.estimation'),
         this.$t('tasks.fields.duration'),
         this.$t('tasks.fields.retake_count'),
@@ -904,6 +905,7 @@ export default {
           this.getEntity(task.entity.id).name,
           task.task_status_short_name,
           assignees,
+          task.difficulty,
           this.formatDuration(task.estimation),
           this.formatDuration(task.duration),
           task.retake_count,

src/components/mixins/annotation.js

@@ -1291,6 +1291,7 @@ export const annotationMixin = {
      * Remove all drawing objects from the fabric canvas
      */
     clearCanvas() {
+      this.endAnnotationSaving()
       if (this.fabricCanvas) {
         this.fabricCanvas.clear()
       }

src/components/mixins/player.js

@@ -739,6 +739,7 @@ export const playerMixin = {
 
     onProgressChanged(frameNumber, updatePlaylistProgress = true) {
       this.clearCanvas()
+      this.reloadAnnotations()
 
       if (this.isCurrentPreviewPicture) {
         this.framesSeenOfPicture = frameNumber + 1
@@ -961,6 +962,7 @@ export const playerMixin = {
         ) {
           this.onAnnotateClicked()
         } else if ((event.ctrlKey || event.metaKey) && event.keyCode === 90) {
+          event.preventDefault()
           this.undoLastAction()
         } else if (event.altKey && event.keyCode === 82) {
           this.redoLastAction()

src/components/mixins/previewRoom.js

@@ -8,6 +8,10 @@ export const previewRoomMixin = {
   },
 
   methods: {
+    isValidRoomId(value) {
+      return value && value !== 'temp'
+    },
+
     openRoom() {
       this.$socket.emit('preview-room:open-playlist', {
         playlist_id: this.room.id

src/components/modals/ViewPlaylistModal.vue

@@ -82,7 +82,7 @@ export default {
       previewFileEntityMap: new Map(),
       currentEntities: {},
       currentPlaylist: {
-        id: '',
+        id: 'temp',
         name: 'Temporary playlist',
         shots: [],
         for_entity: 'shot'

src/components/pages/Edit.vue

@@ -43,7 +43,7 @@
             @open-room="openRoom"
             @join-room="joinRoom"
             @leave-room="leaveRoom"
-            v-if="currentEdit?.id && currentPreview?.id"
+            v-if="isValidRoomId(currentEdit?.id) && currentPreview?.id"
           />
         </div>
       </div>

src/components/pages/playlists/PlaylistPlayer.vue

@@ -60,7 +60,7 @@
         @open-room="openRoom"
         @join-room="joinRoom"
         @leave-room="leaveRoom"
-        v-if="playlist.id && !isFullMode"
+        v-if="isValidRoomId(playlist.id) && !isFullMode"
       />
       <button-simple
         class="playlist-button topbar-button flexrow-item full-button"
@@ -1563,6 +1563,7 @@ export default {
           width: this.currentPreview.width,
           height: this.currentPreview.height
         }
+        this.loadAnnotation(this.getAnnotation(0))
       }
     },
 
@@ -1698,6 +1699,7 @@ export default {
         if (this.isWaveformDisplayed) {
           height -= 60
         }
+
         if (this.$refs['video-container']) {
           this.$refs['video-container'].style.height = `${height}px`
         }

src/components/previews/VideoViewer.vue

@@ -520,6 +520,9 @@ export default {
       this.resetPanZoom()
       this.maxDuration = '00:00.000'
       this.pause()
+      this.$nextTick(() => {
+        this.resetPanZoom()
+      })
     },
 
     light() {