Skip to content

Commit

Permalink
Merge pull request #1660 from NicoPennec/main
Browse files Browse the repository at this point in the history
Fix frame counter in task types
  • Loading branch information
frankrousseau authored Jan 14, 2025
2 parents fd96bf4 + 3c6ac6b commit 1562131
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 62 deletions.
74 changes: 37 additions & 37 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@fullcalendar/vue3": "6.1.15",
"@google/model-viewer": "4.0.0",
"@sentry/vue": "8.48.0",
"@unhead/vue": "1.11.15",
"@unhead/vue": "1.11.18",
"@vuepic/vue-datepicker": "11.0.1",
"async": "3.2.6",
"bowser": "2.11.0",
Expand All @@ -35,7 +35,7 @@
"color-hash": "2.0.2",
"color-string": "1.9.1",
"fabric": "cgwire/fabric.js",
"lucide-vue-next": "0.469.0",
"lucide-vue-next": "0.471.0",
"marked": "14.1.4",
"marked-emoji": "1.4.3",
"moment": "2.30.1",
Expand Down Expand Up @@ -63,7 +63,7 @@
"vuedraggable": "4.1.0",
"vuex": "4.1.0",
"vuex-router-sync": "6.0.0-rc.1",
"wavesurfer.js": "7.8.15"
"wavesurfer.js": "7.8.16"
},
"devDependencies": {
"@vitejs/plugin-vue": "5.2.1",
Expand All @@ -80,7 +80,7 @@
"lint-staged": "15.3.0",
"localStorage": "1.0.4",
"prettier": "3.4.2",
"sass": "1.83.1",
"sass": "1.83.4",
"vite": "6.0.7",
"vitest": "2.1.8",
"vitest-localstorage-mock": "0.1.2"
Expand Down
43 changes: 22 additions & 21 deletions src/components/lists/TaskList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -355,16 +355,8 @@ import ValidationTag from '@/components/widgets/ValidationTag.vue'
import assetStore from '@/store/modules/assets'
import editStore from '@/store/modules/edits'
import episodeStore from '@/store/modules/episodes'
import shotStore from '@/store/modules/shots'
import sequenceStore from '@/store/modules/sequences'
const stores = {
assetStore,
episodeStore,
shotStore,
sequenceStore,
editStore
}
import shotStore from '@/store/modules/shots'
export default {
name: 'task-list',
Expand Down Expand Up @@ -428,10 +420,6 @@ export default {
tasks: {
type: Array,
default: () => []
},
taskType: {
type: Object,
default: () => {}
}
},
Expand All @@ -445,21 +433,36 @@ export default {
computed: {
...mapGetters([
'assetMap',
'editMap',
'episodeMap',
'nbSelectedTasks',
'personMap',
'user',
'selectedTasks',
'sequenceMap',
'shotMap',
'taskMap',
'isCurrentUserManager',
'isCurrentUserSupervisor',
'taskTypeMap'
]),
assetMap() {
return assetStore.cache.assetMap
},
editMap() {
return editStore.cache.editMap
},
episodeMap() {
return episodeStore.cache.episodeMap
},
sequenceMap() {
return sequenceStore.cache.sequenceMap
},
shotMap() {
return shotStore.cache.shotMap
},
isAssets() {
return this.entityType === 'Asset'
},
Expand Down Expand Up @@ -743,9 +746,7 @@ export default {
},
getEntity(entityId) {
const store = stores[`${this.entityType.toLowerCase()}Store`]
const map = store.cache[`${this.entityType.toLowerCase()}Map`]
return map.get(entityId) || {}
return this[`${this.entityType.toLowerCase()}Map`].get(entityId) || {}
},
onKeyDown(event) {
Expand Down

0 comments on commit 1562131

Please sign in to comment.