From 17df67c801d79242362e07f06fe29969ceaec3f7 Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Thu, 19 Dec 2024 18:44:44 +0100 Subject: [PATCH 1/5] [qa] fix edge case of undefined value --- src/components/pages/Assets.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/pages/Assets.vue b/src/components/pages/Assets.vue index a4dfe38b09..20b7e404bd 100644 --- a/src/components/pages/Assets.vue +++ b/src/components/pages/Assets.vue @@ -837,7 +837,7 @@ export default { }, onSearchChange(clearSelection = true) { - const searchQuery = this.searchField.getValue() || '' + const searchQuery = this.searchField?.getValue() || '' if ( searchQuery.length !== 1 && searchQuery !== undefined && From 1447256738047a37b1f937ee91b32f706230f21f Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Fri, 20 Dec 2024 10:06:57 +0100 Subject: [PATCH 2/5] [automations] fix data loading Wrong cache access --- src/store/modules/productions.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/store/modules/productions.js b/src/store/modules/productions.js index 1a6f7dfc47..159a15a603 100644 --- a/src/store/modules/productions.js +++ b/src/store/modules/productions.js @@ -2,6 +2,7 @@ import productionsApi from '@/store/api/productions' import { sortProductions, sortByName } from '@/lib/sorting' import assetTypeStore from '@/store/modules/assettypes' +import statusAutomationsStore from '@/store/modules/statusautomation' import taskTypeStore from '@/store/modules/tasktypes' import taskStatusStore from '@/store/modules/taskstatus' @@ -221,7 +222,7 @@ const getters = { return [] } else { return state.currentProduction.status_automations.map(id => - rootState.statusAutomations.statusAutomationMap.get(id) + statusAutomationsStore.cache.statusAutomationMap.get(id) ) } }, From 184d149a1023ea181304b634922f29a32d12b1b8 Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Fri, 20 Dec 2024 13:44:44 +0100 Subject: [PATCH 3/5] [tasks] improve comment form Clear comment form only on post successful. --- src/components/pages/Task.vue | 1 + src/components/sides/TaskInfo.vue | 2 +- src/components/widgets/AddComment.vue | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/pages/Task.vue b/src/components/pages/Task.vue index c801c5c595..1fcc89ac66 100644 --- a/src/components/pages/Task.vue +++ b/src/components/pages/Task.vue @@ -924,6 +924,7 @@ export default { .dispatch(action, params) .then(() => { drafts.clearTaskDraft(this.task.id) + this.$refs['add-comment']?.reset() this.reset() this.loading.addComment = false }) diff --git a/src/components/sides/TaskInfo.vue b/src/components/sides/TaskInfo.vue index cb5c2bba8b..435303a7b6 100644 --- a/src/components/sides/TaskInfo.vue +++ b/src/components/sides/TaskInfo.vue @@ -841,6 +841,7 @@ export default { .dispatch(action, params) .then(() => { drafts.clearTaskDraft(this.task.id) + this.$refs['add-comment']?.reset() this.reset() this.loading.addComment = false this.$emit('comment-added') @@ -852,7 +853,6 @@ export default { this.errors.addCommentMaxRetakes = isRetakeError this.loading.addComment = false }) - .finally(() => {}) }) }, diff --git a/src/components/widgets/AddComment.vue b/src/components/widgets/AddComment.vue index cb7e8c9456..3067ea2d84 100644 --- a/src/components/widgets/AddComment.vue +++ b/src/components/widgets/AddComment.vue @@ -663,6 +663,9 @@ export default { revision, link ) + }, + + reset() { this.text = '' this.link = null this.attachments = [] From d4673918408863e9ed3efc78336f6143f1177dea Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Fri, 20 Dec 2024 16:16:31 +0100 Subject: [PATCH 4/5] [tasks] fix synchronization of selected preview version Wrong migration code to Vue 3 --- src/components/previews/PreviewPlayer.vue | 2 +- src/components/sides/TaskInfo.vue | 2 +- src/components/widgets/ComboboxSimple.vue | 2 +- src/components/widgets/ComboboxStyled.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/previews/PreviewPlayer.vue b/src/components/previews/PreviewPlayer.vue index 4345948913..43ac1f09b8 100644 --- a/src/components/previews/PreviewPlayer.vue +++ b/src/components/previews/PreviewPlayer.vue @@ -440,7 +440,7 @@ is-reversed is-preview thin - :value="currentPreview?.id" + :model-value="currentPreview?.id" @update:model-value="changeCurrentPreviewFile" /> diff --git a/src/components/sides/TaskInfo.vue b/src/components/sides/TaskInfo.vue index 435303a7b6..52d77992ef 100644 --- a/src/components/sides/TaskInfo.vue +++ b/src/components/sides/TaskInfo.vue @@ -91,7 +91,7 @@ :options="previewOptions" is-preview thin - :value="previewOptions[currentPreviewIndex]?.value" + :model-value="previewOptions[currentPreviewIndex]?.value" @update:model-value="onPreviewChanged" /> diff --git a/src/components/widgets/ComboboxSimple.vue b/src/components/widgets/ComboboxSimple.vue index e39a9c69a9..035b135acd 100644 --- a/src/components/widgets/ComboboxSimple.vue +++ b/src/components/widgets/ComboboxSimple.vue @@ -88,7 +88,7 @@ export default { this.resetOptions() }, - value() { + modelValue() { this.selectedOption = this.options.find(o => o.value === this.modelValue) } } diff --git a/src/components/widgets/ComboboxStyled.vue b/src/components/widgets/ComboboxStyled.vue index 3f368ef274..5b04cef18f 100644 --- a/src/components/widgets/ComboboxStyled.vue +++ b/src/components/widgets/ComboboxStyled.vue @@ -200,7 +200,7 @@ export default { } }, - value() { + modelValue() { this.selectedOption = this.options.find(o => o.value === this.modelValue) } } From 97d7ab125dfd11eb31eb81c5666a5617f7106cca Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Fri, 20 Dec 2024 16:20:31 +0100 Subject: [PATCH 5/5] [qa] bump dependencies --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 157a4b20a1..6499ce90c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "color-hash": "2.0.2", "color-string": "1.9.1", "fabric": "cgwire/fabric.js", - "lucide-vue-next": "0.468.0", + "lucide-vue-next": "0.469.0", "marked": "14.1.4", "marked-emoji": "1.4.3", "moment": "2.30.1", @@ -2926,9 +2926,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.74", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.74.tgz", - "integrity": "sha512-ck3//9RC+6oss/1Bh9tiAVFy5vfSKbRHAFh7Z3/eTRkEqJeWgymloShB17Vg3Z4nmDNp35vAd1BZ6CMW4Wt6Iw==", + "version": "1.5.75", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.75.tgz", + "integrity": "sha512-Lf3++DumRE/QmweGjU+ZcKqQ+3bKkU/qjaKYhIJKEOhgIO9Xs6IiAQFkfFoj+RhgDk4LUeNsLo6plExHqSyu6Q==", "dev": true, "license": "ISC" }, @@ -5091,9 +5091,9 @@ "license": "ISC" }, "node_modules/lucide-vue-next": { - "version": "0.468.0", - "resolved": "https://registry.npmjs.org/lucide-vue-next/-/lucide-vue-next-0.468.0.tgz", - "integrity": "sha512-quV/6T8YB1XK0VOEnebg3Byd8Rsan5/m95cvjnuHV4vcS3qEnLAybkrSh0hk3ppavx+V7R1PjNW+mGDvcBdz4A==", + "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==", "license": "ISC", "peerDependencies": { "vue": ">=3.0.1" diff --git a/package.json b/package.json index 84bad95d1e..ce4246ccb2 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "color-hash": "2.0.2", "color-string": "1.9.1", "fabric": "cgwire/fabric.js", - "lucide-vue-next": "0.468.0", + "lucide-vue-next": "0.469.0", "marked": "14.1.4", "marked-emoji": "1.4.3", "moment": "2.30.1",