Skip to content

Commit

Permalink
Merge pull request #1632 from NicoPennec/main
Browse files Browse the repository at this point in the history
Various fixes
  • Loading branch information
NicoPennec authored Dec 20, 2024
2 parents 74a71f3 + 97d7ab1 commit 6935e03
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 15 deletions.
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/Assets.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down
1 change: 1 addition & 0 deletions src/components/pages/Task.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
})
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 @@ -440,7 +440,7 @@
is-reversed
is-preview
thin
:value="currentPreview?.id"
:model-value="currentPreview?.id"
@update:model-value="changeCurrentPreviewFile"
/>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/sides/TaskInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
:options="previewOptions"
is-preview
thin
:value="previewOptions[currentPreviewIndex]?.value"
:model-value="previewOptions[currentPreviewIndex]?.value"
@update:model-value="onPreviewChanged"
/>
</div>
Expand Down Expand Up @@ -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')
Expand All @@ -852,7 +853,6 @@ export default {
this.errors.addCommentMaxRetakes = isRetakeError
this.loading.addComment = false
})
.finally(() => {})
})
},
Expand Down
3 changes: 3 additions & 0 deletions src/components/widgets/AddComment.vue
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,9 @@ export default {
revision,
link
)
},
reset() {
this.text = ''
this.link = null
this.attachments = []
Expand Down
2 changes: 1 addition & 1 deletion src/components/widgets/ComboboxSimple.vue
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export default {
this.resetOptions()
},
value() {
modelValue() {
this.selectedOption = this.options.find(o => o.value === this.modelValue)
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/widgets/ComboboxStyled.vue
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ export default {
}
},
value() {
modelValue() {
this.selectedOption = this.options.find(o => o.value === this.modelValue)
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/store/modules/productions.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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)
)
}
},
Expand Down

0 comments on commit 6935e03

Please sign in to comment.