From 9fa3b418f988ac52510795fc6e60eaac22c223c2 Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Tue, 14 Jan 2025 10:11:49 +0100 Subject: [PATCH 1/2] [qa] bump dependencies --- package-lock.json | 74 +++++++++++++++++++++++------------------------ package.json | 8 ++--- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/package-lock.json b/package-lock.json index a8cbd7a3b..c8bac1731 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,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", @@ -25,7 +25,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", @@ -53,7 +53,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", @@ -70,7 +70,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" @@ -1765,22 +1765,22 @@ "license": "ISC" }, "node_modules/@unhead/dom": { - "version": "1.11.15", - "resolved": "https://registry.npmjs.org/@unhead/dom/-/dom-1.11.15.tgz", - "integrity": "sha512-2OZ7zvZQLqlqkhvsKsNOhxxoO3vgjygzzrmtooQR9QNKY+3HjwJ3+QfjGswXI976YV7VJem57ydQSMk1ijB7yg==", + "version": "1.11.18", + "resolved": "https://registry.npmjs.org/@unhead/dom/-/dom-1.11.18.tgz", + "integrity": "sha512-zQuJUw/et9zYEV0SZWTDX23IgurwMaXycAuxt4L6OgNL0T4TWP3a0J/Vm3Q02hmdNo/cPKeVBrwBdnFUXjGU4w==", "license": "MIT", "dependencies": { - "@unhead/schema": "1.11.15", - "@unhead/shared": "1.11.15" + "@unhead/schema": "1.11.18", + "@unhead/shared": "1.11.18" }, "funding": { "url": "https://github.com/sponsors/harlan-zw" } }, "node_modules/@unhead/schema": { - "version": "1.11.15", - "resolved": "https://registry.npmjs.org/@unhead/schema/-/schema-1.11.15.tgz", - "integrity": "sha512-UkLz1dqw4yoh4jELEyLsgSG7yrXc+gv68GkQeTv8LysEPa8sXtFqhfuqTBLhY3sHqSnP8RkDknhtFhG2S3fuKQ==", + "version": "1.11.18", + "resolved": "https://registry.npmjs.org/@unhead/schema/-/schema-1.11.18.tgz", + "integrity": "sha512-a3TA/OJCRdfbFhcA3Hq24k1ZU1o9szicESrw8DZcGyQFacHnh84mVgnyqSkMnwgCmfN4kvjSiTBlLEHS6+wATw==", "license": "MIT", "dependencies": { "hookable": "^5.5.3", @@ -1791,12 +1791,12 @@ } }, "node_modules/@unhead/shared": { - "version": "1.11.15", - "resolved": "https://registry.npmjs.org/@unhead/shared/-/shared-1.11.15.tgz", - "integrity": "sha512-VT42ssmwpFGfixfXqAZ+Rn7KyNG0yFqWGsvLOXIgahiTzh3N1k2st1tPvuYFZU22dtWBNxG7cvy8yxUd1vunMQ==", + "version": "1.11.18", + "resolved": "https://registry.npmjs.org/@unhead/shared/-/shared-1.11.18.tgz", + "integrity": "sha512-OsupRQRxJqqnuKiL1Guqipjbl7MndD5DofvmGa3PFGu2qNPmOmH2mxGFjRBBgq2XxY1KalIHl/2I9HV6gbK8cw==", "license": "MIT", "dependencies": { - "@unhead/schema": "1.11.15", + "@unhead/schema": "1.11.18", "packrup": "^0.1.2" }, "funding": { @@ -1804,15 +1804,15 @@ } }, "node_modules/@unhead/vue": { - "version": "1.11.15", - "resolved": "https://registry.npmjs.org/@unhead/vue/-/vue-1.11.15.tgz", - "integrity": "sha512-2NT8Kph5AvB/qO+C8UKAc7cudbFRZTJk0eRpn8o1nG3yk2+mWvN0vsTTjnKvXixNF193I/R+zqo/NkcjgaWG9A==", + "version": "1.11.18", + "resolved": "https://registry.npmjs.org/@unhead/vue/-/vue-1.11.18.tgz", + "integrity": "sha512-Jfi7t/XNBnlcauP9UTH3VHBcS69G70ikFd2e5zdgULLDRWpOlLs1sSTH1V2juNptc93DOk9RQfC5jLWbLcivFw==", "license": "MIT", "dependencies": { - "@unhead/schema": "1.11.15", - "@unhead/shared": "1.11.15", + "@unhead/schema": "1.11.18", + "@unhead/shared": "1.11.18", "hookable": "^5.5.3", - "unhead": "1.11.15" + "unhead": "1.11.18" }, "funding": { "url": "https://github.com/sponsors/harlan-zw" @@ -5356,9 +5356,9 @@ "license": "ISC" }, "node_modules/lucide-vue-next": { - "version": "0.469.0", - "resolved": "https://registry.npmjs.org/lucide-vue-next/-/lucide-vue-next-0.469.0.tgz", - "integrity": "sha512-EjOap+vY3xEzCMrnaccDHO4BH3k3Lr+sOyvzRQCaayYxkxKla0w6Jr4h3cHAzA4vMSp63Dcy7vDiGeCPcCY+Gg==", + "version": "0.471.0", + "resolved": "https://registry.npmjs.org/lucide-vue-next/-/lucide-vue-next-0.471.0.tgz", + "integrity": "sha512-ZJyImsuBOR91VF5auILuo1U0m93sSjYs+i/m5ISx8oG4FWMXX7hzuotx24/dTMRp+e8pMWUeVmPBKsNcNSrUzg==", "license": "ISC", "peerDependencies": { "vue": ">=3.0.1" @@ -6525,9 +6525,9 @@ } }, "node_modules/sass": { - "version": "1.83.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.1.tgz", - "integrity": "sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==", + "version": "1.83.4", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.4.tgz", + "integrity": "sha512-B1bozCeNQiOgDcLd33e2Cs2U60wZwjUUXzh900ZyQF5qUasvMdDZYbQ566LJu7cqR+sAHlAfO6RMkaID5s6qpA==", "dev": true, "license": "MIT", "dependencies": { @@ -7347,14 +7347,14 @@ } }, "node_modules/unhead": { - "version": "1.11.15", - "resolved": "https://registry.npmjs.org/unhead/-/unhead-1.11.15.tgz", - "integrity": "sha512-fA0rYB7qMHKY4sg0yzEXhi0cqiF/nl/OUKNaXOS9ChJwCjJxabpZvmQIUOiGS+1ckoFbZc3qZnhDLpdeNhOQwg==", + "version": "1.11.18", + "resolved": "https://registry.npmjs.org/unhead/-/unhead-1.11.18.tgz", + "integrity": "sha512-TWgGUoZMpYe2yJwY6jZ0/9kpQT18ygr2h5lI6cUXdfD9UzDc0ytM9jGaleSYkj9guJWXkk7izYBnzJvxl8mRvQ==", "license": "MIT", "dependencies": { - "@unhead/dom": "1.11.15", - "@unhead/schema": "1.11.15", - "@unhead/shared": "1.11.15", + "@unhead/dom": "1.11.18", + "@unhead/schema": "1.11.18", + "@unhead/shared": "1.11.18", "hookable": "^5.5.3" }, "funding": { @@ -9040,9 +9040,9 @@ } }, "node_modules/wavesurfer.js": { - "version": "7.8.15", - "resolved": "https://registry.npmjs.org/wavesurfer.js/-/wavesurfer.js-7.8.15.tgz", - "integrity": "sha512-fWNnQt5BEGzuoJ7HRxfvpT1rOEI1AmCGPZ/+7QDkDVN/m2vIBeLVQ+5vENRMz1YwvZ/u1No0UV492/o8G++KXQ==", + "version": "7.8.16", + "resolved": "https://registry.npmjs.org/wavesurfer.js/-/wavesurfer.js-7.8.16.tgz", + "integrity": "sha512-lhQF42A4Wn7ug5bixaqGK53qWF2minWdXlzxPtLV+QoVH3WgvVSdsP2HBaHRbkfT2Lh67kJG6CquFdukmf95gg==", "license": "BSD-3-Clause" }, "node_modules/webidl-conversions": { diff --git a/package.json b/package.json index a70946b00..c812d483b 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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", @@ -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", @@ -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" From 3c6ac6b714097081f75838c6c51cc67349ff595f Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Tue, 14 Jan 2025 10:44:56 +0100 Subject: [PATCH 2/2] [qa] fix access to store maps --- src/components/lists/TaskList.vue | 43 ++++++++++++++++--------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/src/components/lists/TaskList.vue b/src/components/lists/TaskList.vue index d4ff42fa7..6e1fc6955 100644 --- a/src/components/lists/TaskList.vue +++ b/src/components/lists/TaskList.vue @@ -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', @@ -428,10 +420,6 @@ export default { tasks: { type: Array, default: () => [] - }, - taskType: { - type: Object, - default: () => {} } }, @@ -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' }, @@ -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) {