Merge pull request #1564 from NicoPennec/fix/various

Various fixes
cgwire · Oct 28, 2024 · ee77c47 · ee77c47
2 parents 1231991 + 176e9b3
commit ee77c47
Show file tree

Hide file tree

Showing 13 changed files with 116 additions and 128 deletions.
diff --git a/src/components/mixins/entities.js b/src/components/mixins/entities.js
@@ -265,12 +265,14 @@ export const entitiesMixin = {
       this.$store.commit('SET_EDIT_LIST_SCROLL_POSITION', scrollPosition)
     },
 
-    onSearchChange() {
+    onSearchChange(clearSelection = true) {
       if (!this.searchField) return
       this.isSearchActive = false
       const searchQuery = this.searchField.getValue() || ''
       this.applySearch(searchQuery)
-      this.clearSelection()
+      if (clearSelection) {
+        this.clearSelection()
+      }
     },
 
     onChangeSortClicked(sortInfo) {

diff --git a/src/components/modals/EditPlaylistModal.vue b/src/components/modals/EditPlaylistModal.vue
@@ -220,7 +220,7 @@ export default {
         this.forClient = this.playlistToEdit.for_client ? 'true' : 'false'
         this.resetForm()
         setTimeout(() => {
-          this.$refs.nameField.focus()
+          this.$refs.nameField?.focus()
         }, 100)
       }
     }

diff --git a/src/components/pages/AssetLibrary.vue b/src/components/pages/AssetLibrary.vue
@@ -1,5 +1,5 @@
 <template>
-  <page-layout>
+  <page-layout :side="isCurrentUserManager">
     <template #main>
       <div class="asset-library">
         <header class="flexrow">
@@ -55,11 +55,12 @@
                 <li
                   class="item flexcolumn"
                   :class="{
+                    'selectable-item': isCurrentUserManager,
                     'selected-item': isSelected(entity)
                   }"
                   :key="entity.id"
                   v-for="entity in group"
-                  @click="toggleEntity(entity)"
+                  @click="isCurrentUserManager && toggleEntity(entity)"
                 >
                   <div class="card" :title="entity.full_name">
                     <entity-preview
@@ -156,6 +157,7 @@ export default {
     ...mapGetters([
       'displayedSharedAssets',
       'displayedSharedAssetsByType',
+      'isCurrentUserManager',
       'openProductions',
       'productionMap',
       'selectedAssets'
@@ -188,10 +190,6 @@ export default {
         }
         return type.sort(firstBy(nameFilter).thenBy(productionFilter))
       })
-    },
-
-    hasSelectedAssets() {
-      return this.selectedAssets.size > 0
     }
   },
 
@@ -280,10 +278,13 @@ export default {
     border: 5px solid transparent;
     border-radius: 1em;
     transition: border-color 0.2s ease-in-out;
-    cursor: pointer;
 
-    &:hover {
-      border-color: var(--background-selectable);
+    &.selectable-item {
+      cursor: pointer;
+
+      &:hover {
+        border-color: var(--background-selectable);
+      }
     }
 
     &.selected-item {

diff --git a/src/components/pages/Assets.vue b/src/components/pages/Assets.vue
@@ -411,7 +411,7 @@ export default {
         this.onSearchChange()
         this.$refs['asset-list'].setScrollPosition(this.assetListScrollPosition)
         this.$nextTick(() => {
-          this.$refs['asset-list'].selectTaskFromQuery()
+          this.$refs['asset-list']?.selectTaskFromQuery()
         })
       }
     }
@@ -629,7 +629,7 @@ export default {
         .then(form => {
           this.loading.edit = false
           this.modals.isNewDisplayed = false
-          this.onSearchChange()
+          this.onSearchChange(false)
         })
         .catch(err => {
           console.error(err)
@@ -837,7 +837,7 @@ export default {
       this.showImportModal()
     },
 
-    onSearchChange() {
+    onSearchChange(clearSelection = true) {
       const searchQuery = this.searchField.getValue() || ''
       if (
         searchQuery.length !== 1 &&
@@ -847,7 +847,9 @@ export default {
         this.setAssetSearch(searchQuery)
         this.setSearchInUrl()
       }
-      this.clearSelection()
+      if (clearSelection) {
+        this.clearSelection()
+      }
     },
 
     saveSearchQuery(searchQuery) {
@@ -988,26 +990,28 @@ export default {
     },
 
     async onFieldChanged({ entry, fieldName, value }) {
-      const data = { id: entry.id }
-      data[fieldName] = value
+      const data = {
+        id: entry.id,
+        [fieldName]: value
+      }
       await this.editAsset(data)
-      this.onSearchChange()
+      this.onSearchChange(false)
     },
 
     async onMetadataChanged({ entry, descriptor, value }) {
-      const metadata = {}
-      metadata[descriptor.field_name] = value
       const data = {
         id: entry.id,
-        data: metadata
+        data: {
+          [descriptor.field_name]: value
+        }
       }
       await this.editAsset(data)
-      this.onSearchChange()
+      this.onSearchChange(false)
     },
 
     async onAssetChanged(asset) {
       await this.editAsset(asset)
-      this.onSearchChange()
+      this.onSearchChange(false)
     },
 
     reset() {

diff --git a/src/components/pages/Edits.vue b/src/components/pages/Edits.vue
@@ -607,7 +607,7 @@ export default {
         .then(form => {
           this.loading.edit = false
           this.modals.isNewDisplayed = false
-          this.onSearchChange()
+          this.onSearchChange(false)
         })
         .catch(err => {
           console.error(err)
@@ -828,7 +828,7 @@ export default {
       this.modals.isDeleteAllTasksDisplayed = true
     },
 
-    onSearchChange() {
+    onSearchChange(clearSelection = true) {
       if (!this.searchField) return
       this.isSearchActive = false
       const searchQuery = this.searchField.getValue() || ''
@@ -838,7 +838,9 @@ export default {
       if (searchQuery.length === 0 && this.isLongEditList) {
         this.applySearch('')
       }
-      this.clearSelection()
+      if (clearSelection) {
+        this.clearSelection()
+      }
     },
 
     saveScrollPosition(scrollPosition) {
@@ -941,22 +943,22 @@ export default {
     async onFieldChanged({ entry, fieldName, value }) {
       const data = {
         id: entry.id,
-        description: entry.description
+        description: entry.description,
+        [fieldName]: value
       }
-      data[fieldName] = value
       await this.editEdit(data)
-      this.onSearchChange()
+      this.onSearchChange(false)
     },
 
     async onMetadataChanged({ entry, descriptor, value }) {
-      const metadata = {}
-      metadata[descriptor.field_name] = value
       const data = {
         id: entry.id,
-        data: metadata
+        data: {
+          [descriptor.field_name]: value
+        }
       }
       await this.editEdit(data)
-      this.onSearchChange()
+      this.onSearchChange(false)
     }
   },
 

diff --git a/src/components/pages/Episodes.vue b/src/components/pages/Episodes.vue
@@ -334,7 +334,7 @@ export default {
           this.episodeListScrollPosition
         )
         this.$nextTick(() => {
-          this.$refs['episode-list'].selectTaskFromQuery()
+          this.$refs['episode-list']?.selectTaskFromQuery()
         })
       }
     }
@@ -559,22 +559,22 @@ export default {
     async onFieldChanged({ entry, fieldName, value }) {
       const data = {
         id: entry.id,
-        description: entry.description
+        description: entry.description,
+        [fieldName]: value
       }
-      data[fieldName] = value
       await this.editEpisode(data)
-      this.onSearchChange()
+      this.onSearchChange(false)
     },
 
     async onMetadataChanged({ entry, descriptor, value }) {
-      const metadata = {}
-      metadata[descriptor.field_name] = value
       const data = {
         id: entry.id,
-        data: metadata
+        data: {
+          [descriptor.field_name]: value
+        }
       }
       await this.editEpisode(data)
-      this.onSearchChange()
+      this.onSearchChange(false)
     },
 
     onEditClicked(episode) {
@@ -596,7 +596,7 @@ export default {
           .then(() => {
             this.loading.edit = false
             this.modals.isNewDisplayed = false
-            this.onSearchChange()
+            this.onSearchChange(false)
           })
           .catch(err => {
             console.error(err)

diff --git a/src/components/pages/MyChecks.vue b/src/components/pages/MyChecks.vue
@@ -277,7 +277,7 @@ export default {
       const isName = this.currentSort === 'entity_name'
       const isPriority = this.currentSort === 'priority'
       const isDueDate = this.currentSort === 'due_date'
-      const tasks = this.filteredTasks
+      const tasks = [...this.filteredTasks]
       if (isName) {
         return tasks.sort(
           firstBy('project_name')

diff --git a/src/components/pages/Sequences.vue b/src/components/pages/Sequences.vue
@@ -559,22 +559,22 @@ export default {
     async onFieldChanged({ entry, fieldName, value }) {
       const data = {
         id: entry.id,
-        description: entry.description
+        description: entry.description,
+        [fieldName]: value
       }
-      data[fieldName] = value
       await this.editSequence(data)
-      this.onSearchChange()
+      this.onSearchChange(false)
     },
 
     async onMetadataChanged({ entry, descriptor, value }) {
-      const metadata = {}
-      metadata[descriptor.field_name] = value
       const data = {
         id: entry.id,
-        data: metadata
+        data: {
+          [descriptor.field_name]: value
+        }
       }
       await this.editSequence(data)
-      this.onSearchChange()
+      this.onSearchChange(false)
     },
 
     onEditClicked(sequence) {
@@ -595,7 +595,7 @@ export default {
           .then(() => {
             this.loading.edit = false
             this.modals.isNewDisplayed = false
-            this.onSearchChange()
+            this.onSearchChange(false)
           })
           .catch(err => {
             console.error(err)

diff --git a/src/components/pages/Shots.vue b/src/components/pages/Shots.vue
@@ -458,7 +458,7 @@ export default {
             // Needed to be sure the shots are loaded
             this.onSearchChange()
             this.$nextTick(() => {
-              this.$refs['shot-list'].selectTaskFromQuery()
+              this.$refs['shot-list']?.selectTaskFromQuery()
             })
           })
         })
@@ -487,7 +487,7 @@ export default {
       this.onSearchChange()
       this.$refs['shot-list'].setScrollPosition(this.shotListScrollPosition)
       this.$nextTick(() => {
-        this.$refs['shot-list'].selectTaskFromQuery()
+        this.$refs['shot-list']?.selectTaskFromQuery()
       })
     }
   },
@@ -705,7 +705,7 @@ export default {
         .then(() => {
           this.loading.edit = false
           this.modals.isNewDisplayed = false
-          this.onSearchChange()
+          this.onSearchChange(false)
         })
         .catch(err => {
           console.error(err)
@@ -935,7 +935,7 @@ export default {
       this.onSearchChange()
     },
 
-    onSearchChange() {
+    onSearchChange(clearSelection = true) {
       if (!this.searchField) return
       this.isSearchActive = false
       const searchQuery = this.searchField.getValue() || ''
@@ -945,7 +945,9 @@ export default {
       if (searchQuery.length === 0 && this.isLongShotList) {
         this.applySearch('')
       }
-      this.clearSelection()
+      if (clearSelection) {
+        this.clearSelection()
+      }
     },
 
     saveScrollPosition(scrollPosition) {
@@ -1080,15 +1082,15 @@ export default {
       }
       data[fieldName] = value
       await this.editShot(data)
-      this.onSearchChange()
+      this.onSearchChange(false)
     },
 
     async onMetadataChanged({ entry, descriptor, value }) {
-      const metadata = {}
-      metadata[descriptor.field_name] = value
       const data = {
         id: entry.id,
-        data: metadata
+        data: {
+          [descriptor.field_name]: value
+        }
       }
       const shot = this.shotMap.get(entry.id)
       if (
@@ -1106,7 +1108,7 @@ export default {
         data.nb_frames = parseInt(value) - parseInt(shot.data.frame_in) + 1
       }
       await this.editShot(data)
-      this.onSearchChange()
+      this.onSearchChange(false)
     },
 
     showEDLImportModal() {