Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various fixes #1570

Merged
merged 6 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/Edits.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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('')
Expand Down
12 changes: 11 additions & 1 deletion src/components/pages/Episodes.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@
/>
<div class="filler"></div>
<div class="flexrow flexrow-item" v-if="!isCurrentUserClient">
<combobox-department
class="combobox-department flexrow-item"
:selectable-departments="selectableDepartments('Episode')"
:display-all-and-my-departments="true"
rounded
v-model="selectedDepartment"
v-if="departments.length > 0"
/>
<show-assignations-button class="flexrow-item" />
<show-infos-button class="flexrow-item" />
<big-thumbnails-button class="flexrow-item" />
Expand Down Expand Up @@ -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'
Expand All @@ -225,6 +234,7 @@ export default {
BigThumbnailsButton,
BuildFilterModal,
ButtonSimple,
ComboboxDepartment,
CreateTasksModal,
DeleteModal,
EditEpisodeModal,
Expand Down Expand Up @@ -362,8 +372,8 @@ export default {
'currentEpisode',
'currentProduction',
'departmentMap',
'displayedEpisodes',
'departments',
'displayedEpisodes',
'episodeMap',
'episodes',
'episodeMap',
Expand Down
12 changes: 11 additions & 1 deletion src/components/pages/Sequences.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@
/>
<div class="filler"></div>
<div class="flexrow flexrow-item" v-if="!isCurrentUserClient">
<combobox-department
class="combobox-department flexrow-item"
:selectable-departments="selectableDepartments('Sequence')"
:display-all-and-my-departments="true"
rounded
v-model="selectedDepartment"
v-if="departments.length > 0"
/>
<show-assignations-button class="flexrow-item" />
<show-infos-button class="flexrow-item" />
<big-thumbnails-button class="flexrow-item" />
Expand Down Expand Up @@ -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'
Expand All @@ -224,6 +233,7 @@ export default {
BigThumbnailsButton,
BuildFilterModal,
ButtonSimple,
ComboboxDepartment,
CreateTasksModal,
DeleteModal,
EditSequenceModal,
Expand Down Expand Up @@ -656,7 +666,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('')
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/Shots.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
) {
Expand Down
13 changes: 6 additions & 7 deletions src/components/widgets/ComboboxDepartment.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
{{ label }}
</label>
<div
class="department-combo"
:class="{
'department-combo': true,
opened: showDepartmentList,
rounded: rounded,
top: top
rounded,
top
}"
:style="{
width: width + 'px'
Expand Down Expand Up @@ -178,9 +178,9 @@ export default {

listStyle() {
const data = {
'max-height': this.maxHeightSelectInput + 'px',
width: this.width + 'px',
top: '37px',
'max-height': `${this.maxHeightSelectInput}px`,
width: `${this.width}px`,
top: this.rounded ? '31px' : '37px',
left: '0'
}
if (this.top) {
Expand Down Expand Up @@ -304,7 +304,6 @@ export default {

.selected-department-line {
padding-top: 0;

padding-bottom: 0;
border-radius: 50px;
}
Expand Down