Skip to content
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
214 changes: 91 additions & 123 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@fullcalendar/multimonth": "6.1.20",
"@fullcalendar/vue3": "6.1.20",
"@google/model-viewer": "4.2.0",
"@sentry/vue": "10.46.0",
"@sentry/vue": "10.47.0",
"@unhead/vue": "2.1.12",
"@vuepic/vue-datepicker": "11.0.3",
"bowser": "2.14.1",
Expand Down
11 changes: 9 additions & 2 deletions src/components/lists/TaskList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<th
class="sequence"
ref="th-type"
v-else-if="!isEpisodes && !isSequences"
v-else-if="!isEpisodes && !isSequences && !isEdits"
>
{{ $t('tasks.fields.sequence') }}
</th>
Expand Down Expand Up @@ -110,7 +110,10 @@
<td class="asset-type" v-if="isAssets">
{{ getEntity(task.entity.id).asset_type_name }}
</td>
<td class="sequence" v-else-if="!isEpisodes && !isSequences">
<td
class="sequence"
v-else-if="!isEpisodes && !isSequences && !isEdits"
>
{{ getEntity(task.entity.id).sequence_name }}
</td>
<td class="name">
Expand Down Expand Up @@ -495,6 +498,10 @@ export default {
return this.entityType === 'Asset'
},

isEdits() {
return this.entityType === 'Edit'
},

isEpisodes() {
return this.entityType === 'Episode'
},
Expand Down
4 changes: 2 additions & 2 deletions src/components/modals/BuildFilterModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -526,9 +526,9 @@ export default {

team() {
return sortPeople(
this.currentProduction.team
this.currentProduction?.team
.map(personId => this.personMap.get(personId))
.filter(person => person && !person.is_bot)
.filter(person => person && !person.is_bot) ?? []
)
},

Expand Down
2 changes: 1 addition & 1 deletion src/components/modals/EditAssetModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<text-field
ref="resolutionField"
:label="$t('shots.fields.resolution')"
:placeholder="currentProduction.resolution"
:placeholder="currentProduction?.resolution"
v-model.trim="form.data.resolution"
@enter="runConfirmation"
/>
Expand Down
19 changes: 19 additions & 0 deletions src/components/modals/EditCustomActionModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@
<form @submit.prevent>
<text-field
ref="nameField"
:errored="errors.name"
:label="$t('custom_actions.fields.name')"
v-model.trim="form.name"
v-focus
@enter="confirmClicked"
/>

<text-field
ref="urlField"
:errored="errors.url"
:label="$t('custom_actions.fields.url')"
placeholder="https://..."
type="url"
Expand Down Expand Up @@ -109,6 +112,10 @@ export default {
entityType: 'all',
isAjax: 'false'
},
errors: {
name: false,
url: false
},
entityTypeOptions: [
{
label: 'all',
Expand Down Expand Up @@ -140,6 +147,18 @@ export default {

methods: {
confirmClicked() {
this.errors.name = false
this.errors.url = false
if (!this.form.name) {
this.errors.name = true
this.$refs.nameField.focus()
return
}
if (!this.form.url) {
this.errors.url = true
this.$refs.urlField.focus()
return
}
this.$emit('confirm', this.form)
},

Expand Down
2 changes: 1 addition & 1 deletion src/components/modals/EditEditModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<text-field
ref="resolutionField"
:label="$t('shots.fields.resolution')"
:placeholder="currentProduction.resolution"
:placeholder="currentProduction?.resolution"
@enter="runConfirmation"
v-model.trim="form.data.resolution"
/>
Expand Down
2 changes: 1 addition & 1 deletion src/components/modals/EditEpisodeModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<text-field
ref="resolutionField"
:label="$t('shots.fields.resolution')"
:placeholder="currentProduction.resolution"
:placeholder="currentProduction?.resolution"
v-model.trim="form.data.resolution"
@enter="runConfirmation"
/>
Expand Down
2 changes: 1 addition & 1 deletion src/components/modals/EditSequenceModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<text-field
ref="resolutionField"
:label="$t('shots.fields.resolution')"
:placeholder="currentProduction.resolution"
:placeholder="currentProduction?.resolution"
v-model.trim="form.data.resolution"
@enter="runConfirmation"
/>
Expand Down
6 changes: 3 additions & 3 deletions src/components/modals/EditShotModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,22 @@
type="number"
:max="1000"
:step="0.001"
:placeholder="currentProduction.fps"
:placeholder="currentProduction?.fps"
v-model="form.fps"
@enter="runConfirmation"
/>
<text-field
ref="resolutionField"
:label="$t('shots.fields.resolution')"
:placeholder="currentProduction.resolution"
:placeholder="currentProduction?.resolution"
v-model.trim="form.resolution"
@enter="runConfirmation"
/>
<text-field
ref="maxRetakesField"
type="number"
:label="$t('shots.fields.max_retakes')"
:placeholder="currentProduction.max_retakes"
:placeholder="currentProduction?.max_retakes"
v-model="form.max_retakes"
@enter="runConfirmation"
/>
Expand Down
4 changes: 2 additions & 2 deletions src/components/pages/ProductionNewsFeed.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
v-if="!isStudio && isTVShow"
/>
<combobox-status
class="flexrow-item selector"
class="flexrow-item selector nowrap"
:label="$t('news.task_status')"
:task-status-list="taskStatusList"
v-model="taskStatusId"
/>
<combobox-task-type
class="flexrow-item selector"
class="flexrow-item selector nowrap"
:label="$t('news.task_type')"
:task-type-list="taskTypeList"
v-model="taskTypeId"
Expand Down
2 changes: 1 addition & 1 deletion src/components/previews/PreviewPlayer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@ export default {
},

currentProduction() {
return this.productionMap.get(this.task.project_id)
return this.productionMap.get(this.task?.project_id)
},

marginBottom() {
Expand Down
14 changes: 11 additions & 3 deletions src/store/modules/assets.js
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,9 @@ const actions = {
assets = cache.result
}
const lines = assets.map(asset => {
if (asset.shared) {
return [asset.asset_type_name, asset.name]
}
let assetLine = []
if (rootGetters.isTVShow) {
assetLine.push(
Expand Down Expand Up @@ -1087,9 +1090,14 @@ const mutations = {
},

[UPDATE_ASSET](state, asset) {
Object.assign(cache.assetMap.get(asset.id), asset)
const cachedAsset = state.displayedAssets.find(a => a.id === asset.id)
Object.assign(cachedAsset, asset)
const cachedAsset = cache.assetMap.get(asset.id)
if (cachedAsset) {
Object.assign(cachedAsset, asset)
}
const displayedAsset = state.displayedAssets.find(a => a.id === asset.id)
if (displayedAsset) {
Object.assign(displayedAsset, asset)
}
state.displayedAssets = [...state.displayedAssets]
cache.assetIndex = buildAssetIndex(cache.assets)
},
Expand Down