Merge pull request #1679 from NicoPennec/main

Various fixes
cgwire · Jan 23, 2025 · 904486d · 904486d
2 parents b09bccc + 956d7c9
commit 904486d
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 7 deletions.
diff --git a/src/components/mixins/entity_list.js b/src/components/mixins/entity_list.js
@@ -557,6 +557,8 @@ export const entityListMixin = {
     },
 
     startBrowsing(event) {
+      if (event.target.tagName === 'INPUT') return
+
       document.body.style.cursor = 'grabbing'
       this.isBrowsingX = true
       this.isBrowsingY = true

diff --git a/src/store/modules/assets.js b/src/store/modules/assets.js
@@ -1262,7 +1262,10 @@ const mutations = {
   },
 
   [CLEAR_SELECTED_TASKS](state, validationInfo) {
-    if (tasksStore.state.nbSelectedTasks > 0) {
+    if (
+      tasksStore.state.nbSelectedValidations > 0 ||
+      tasksStore.state.nbSelectedTasks > 0
+    ) {
       const tmpGrid = JSON.parse(JSON.stringify(state.assetSelectionGrid))
       state.assetSelectionGrid = clearSelectionGrid(tmpGrid)
     }

diff --git a/src/store/modules/edits.js b/src/store/modules/edits.js
@@ -991,7 +991,10 @@ const mutations = {
   },
 
   [CLEAR_SELECTED_TASKS](state, validationInfo) {
-    if (tasksStore.state.nbSelectedTasks > 0) {
+    if (
+      tasksStore.state.nbSelectedValidations > 0 ||
+      tasksStore.state.nbSelectedTasks > 0
+    ) {
       const tmpGrid = JSON.parse(JSON.stringify(state.editSelectionGrid))
       state.editSelectionGrid = clearSelectionGrid(tmpGrid)
     }

diff --git a/src/store/modules/episodes.js b/src/store/modules/episodes.js
@@ -918,7 +918,10 @@ const mutations = {
   },
 
   [CLEAR_SELECTED_TASKS](state, validationInfo) {
-    if (taskStore.state.nbSelectedTasks > 0) {
+    if (
+      taskStore.state.nbSelectedValidations > 0 ||
+      taskStore.state.nbSelectedTasks > 0
+    ) {
       const tmpGrid = JSON.parse(JSON.stringify(state.episodeSelectionGrid))
       state.episodeSelectionGrid = clearSelectionGrid(tmpGrid)
     }

diff --git a/src/store/modules/people.js b/src/store/modules/people.js
@@ -771,7 +771,10 @@ const mutations = {
   },
 
   [CLEAR_SELECTED_TASKS](state, validationInfo) {
-    if (taskStore.state.nbSelectedTasks > 0) {
+    if (
+      taskStore.state.nbSelectedValidations > 0 ||
+      taskStore.state.nbSelectedTasks > 0
+    ) {
       state.personTaskSelectionGrid = clearSelectionGrid(
         state.personTaskSelectionGrid
       )

diff --git a/src/store/modules/sequences.js b/src/store/modules/sequences.js
@@ -984,7 +984,10 @@ const mutations = {
   },
 
   [CLEAR_SELECTED_TASKS](state, validationInfo) {
-    if (taskStore.state.nbSelectedTasks > 0) {
+    if (
+      taskStore.state.nbSelectedValidations > 0 ||
+      taskStore.state.nbSelectedTasks > 0
+    ) {
       const tmpGrid = JSON.parse(JSON.stringify(state.sequenceSelectionGrid))
       state.sequenceSelectionGrid = clearSelectionGrid(tmpGrid)
     }

diff --git a/src/store/modules/shots.js b/src/store/modules/shots.js
@@ -1186,7 +1186,10 @@ const mutations = {
   },
 
   [CLEAR_SELECTED_TASKS](state, validationInfo) {
-    if (tasksStore.state.nbSelectedTasks > 0) {
+    if (
+      tasksStore.state.nbSelectedValidations > 0 ||
+      tasksStore.state.nbSelectedTasks > 0
+    ) {
       const tmpGrid = JSON.parse(JSON.stringify(state.shotSelectionGrid))
       state.shotSelectionGrid = clearSelectionGrid(tmpGrid)
     }

diff --git a/src/store/modules/tasks.js b/src/store/modules/tasks.js
@@ -1168,6 +1168,8 @@ const mutations = {
     if (state.nbSelectedTasks > 0) {
       state.selectedTasks = new Map()
       state.nbSelectedTasks = 0
+    }
+    if (state.nbSelectedValidations > 0) {
       state.selectedValidations = new Map()
       state.nbSelectedValidations = 0
     }

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
@@ -710,8 +710,11 @@ const mutations = {
         )
         if (filterGroup) {
           Object.assign(filterGroup, userFilterGroup)
+          // update the shared status of filters in group
           state.userFilters?.[typeName]?.[projectId].forEach(filter => {
-            filter.is_shared = userFilterGroup.is_shared
+            if (filter.search_filter_group_id === userFilterGroup.id) {
+              filter.is_shared = userFilterGroup.is_shared
+            }
           })
         }
       })