From b4fbbb0d357176d0412cf674a4c28ad503223a8f Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Wed, 30 Oct 2024 12:33:45 +0100 Subject: [PATCH 1/6] [qa] fix code typo on currentSection watcher --- src/components/pages/Edits.vue | 2 +- src/components/pages/Sequences.vue | 2 +- src/components/pages/Shots.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/pages/Edits.vue b/src/components/pages/Edits.vue index 55ac1c17e..ad2b28834 100644 --- a/src/components/pages/Edits.vue +++ b/src/components/pages/Edits.vue @@ -988,7 +988,7 @@ export default { currentSection() { if ( - (this.isTVSHow && this.edits.length === 0) || + (this.isTVShow && this.edits.length === 0) || this.edits[0].episode_id !== this.currentEpisode.id ) { this.$refs['edit-search-field'].setValue('') diff --git a/src/components/pages/Sequences.vue b/src/components/pages/Sequences.vue index 5fec90f64..2f393f999 100644 --- a/src/components/pages/Sequences.vue +++ b/src/components/pages/Sequences.vue @@ -656,7 +656,7 @@ export default { currentSection() { if ( - (this.isTVSHow && this.displayedSequences.length === 0) || + (this.isTVShow && this.displayedSequences.length === 0) || this.displayedSequences[0]?.episode_id !== this.currentEpisode?.id ) { this.$refs['sequence-search-field'].setValue('') diff --git a/src/components/pages/Shots.vue b/src/components/pages/Shots.vue index 3f9715376..b3ea670e6 100644 --- a/src/components/pages/Shots.vue +++ b/src/components/pages/Shots.vue @@ -1171,7 +1171,7 @@ export default { currentSection() { if ( - (this.isTVSHow && this.displayedSequences.length === 0) || + (this.isTVShow && this.displayedSequences.length === 0) || this.displayedSequences[0]?.episode_id !== this.currentEpisode?.id || this.displayedShots[0]?.episode_id !== this.currentEpisode?.id ) { From 05389fab43ab2ad0c16b2ab60450eecadc33753e Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Wed, 30 Oct 2024 12:36:46 +0100 Subject: [PATCH 2/6] [qa] fix style of department combobox in rounded variant --- src/components/widgets/ComboboxDepartment.vue | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/components/widgets/ComboboxDepartment.vue b/src/components/widgets/ComboboxDepartment.vue index cd7ddc653..1420f903c 100644 --- a/src/components/widgets/ComboboxDepartment.vue +++ b/src/components/widgets/ComboboxDepartment.vue @@ -4,11 +4,11 @@ {{ label }}
+ @@ -201,6 +209,7 @@ import AddThumbnailsModal from '@/components/modals/AddThumbnailsModal.vue' import BigThumbnailsButton from '@/components/widgets/BigThumbnailsButton.vue' import BuildFilterModal from '@/components/modals/BuildFilterModal.vue' import ButtonSimple from '@/components/widgets/ButtonSimple.vue' +import ComboboxDepartment from '@/components/widgets/ComboboxDepartment.vue' import CreateTasksModal from '@/components/modals/CreateTasksModal.vue' import DeleteModal from '@/components/modals/DeleteModal.vue' import EditSequenceModal from '@/components/modals/EditSequenceModal.vue' @@ -224,6 +233,7 @@ export default { BigThumbnailsButton, BuildFilterModal, ButtonSimple, + ComboboxDepartment, CreateTasksModal, DeleteModal, EditSequenceModal, From bd778067d0098e99f66b30807841b1121e647c50 Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Wed, 30 Oct 2024 12:43:13 +0100 Subject: [PATCH 4/6] [episodes] add the missing department filter --- src/components/pages/Episodes.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/components/pages/Episodes.vue b/src/components/pages/Episodes.vue index e22f46442..6e8e640c1 100644 --- a/src/components/pages/Episodes.vue +++ b/src/components/pages/Episodes.vue @@ -20,6 +20,14 @@ />
+ @@ -202,6 +210,7 @@ import AddThumbnailsModal from '@/components/modals/AddThumbnailsModal.vue' import BigThumbnailsButton from '@/components/widgets/BigThumbnailsButton.vue' import BuildFilterModal from '@/components/modals/BuildFilterModal.vue' import ButtonSimple from '@/components/widgets/ButtonSimple.vue' +import ComboboxDepartment from '@/components/widgets/ComboboxDepartment.vue' import CreateTasksModal from '@/components/modals/CreateTasksModal.vue' import DeleteModal from '@/components/modals/DeleteModal.vue' import EditEpisodeModal from '@/components/modals/EditEpisodeModal.vue' @@ -225,6 +234,7 @@ export default { BigThumbnailsButton, BuildFilterModal, ButtonSimple, + ComboboxDepartment, CreateTasksModal, DeleteModal, EditEpisodeModal, @@ -362,8 +372,8 @@ export default { 'currentEpisode', 'currentProduction', 'departmentMap', - 'displayedEpisodes', 'departments', + 'displayedEpisodes', 'episodeMap', 'episodes', 'episodeMap', From 1497c0f50826f748ecbedf3d34fa8cd7c30af90c Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Wed, 30 Oct 2024 12:57:18 +0100 Subject: [PATCH 5/6] [ci] update Node.js versions on matrix testing Node.js 22.x is now an LTS release and the "current" release is Node.js 23.x --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 129645fd9..5ce57bec5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: [18, 20, current] + node: [18, 20, 22, current] steps: - uses: actions/checkout@v4 - name: Setup node From 4d9130d720881b308c73918128e1ae41270cd414 Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Wed, 30 Oct 2024 13:00:29 +0100 Subject: [PATCH 6/6] [qa] add a .git-blame-ignore-revs file to improve git-blame --- .git-blame-ignore-revs | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 000000000..0c6eca66d --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,5 @@ +# https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt +# https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view + +# nicopennec: format with eslint & prettier +52b161016c4d97f08cd50b01bfc61ac98f62ef92