From b484950fdf959e53c74d97982eb3e4f0f9cd7c31 Mon Sep 17 00:00:00 2001 From: volar Date: Tue, 5 Dec 2023 17:33:46 +0100 Subject: [PATCH] wip --- .../components/UploadQueueDialogSingle.vue | 13 ++++++++++++- .../UploadQueueDialogSingleSidebarMetadata.vue | 17 +++++++++++++++-- .../components/UploadQueueItemEditable.vue | 15 ++++++++++----- .../uploadQueue/composables/damConfigState.ts | 2 ++ 4 files changed, 39 insertions(+), 8 deletions(-) diff --git a/src/components/damImage/uploadQueue/components/UploadQueueDialogSingle.vue b/src/components/damImage/uploadQueue/components/UploadQueueDialogSingle.vue index 27712172..b3c8e742 100644 --- a/src/components/damImage/uploadQueue/components/UploadQueueDialogSingle.vue +++ b/src/components/damImage/uploadQueue/components/UploadQueueDialogSingle.vue @@ -323,7 +323,18 @@ onMounted(() => { class="system-border-b pr-1" >
-
DAM upload
+
+ {{ t('common.damImage.upload.title') }} +
+
+ {{ t('common.damImage.upload.titleDone') }} +
diff --git a/src/components/damImage/uploadQueue/components/UploadQueueDialogSingleSidebarMetadata.vue b/src/components/damImage/uploadQueue/components/UploadQueueDialogSingleSidebarMetadata.vue index a7c691df..89aa5d0f 100644 --- a/src/components/damImage/uploadQueue/components/UploadQueueDialogSingleSidebarMetadata.vue +++ b/src/components/damImage/uploadQueue/components/UploadQueueDialogSingleSidebarMetadata.vue @@ -6,6 +6,7 @@ import type { DocId } from '@/types/common' import type { DamAssetType } from '@/types/coreDam/Asset' import UploadQueueDialogSingleSidebarMetadataContent from '@/components/damImage/uploadQueue/components/UploadQueueDialogSingleSidebarMetadataContent.vue' import { ADamAssetMetadataValidationScopeSymbol } from '@/components/damImage/uploadQueue/composables/uploadValidations' +import { useAlerts } from '@/composables/system/alerts' withDefaults( defineProps<{ @@ -27,11 +28,23 @@ const { t } = useI18n() const v$ = useVuelidate({}, {}, { $scope: ADamAssetMetadataValidationScopeSymbol }) +const { showValidationError } = useAlerts() + const onSave = async () => { + v$.value.$touch() + if (v$.value.$invalid) { + showValidationError() + return + } emit('onSave') } const onSaveAndApply = async () => { + v$.value.$touch() + if (v$.value.$invalid) { + showValidationError() + return + } emit('onSaveAndApply') } @@ -48,11 +61,11 @@ const onSaveAndApply = async () => { - Save and apply + {{ t('common.damImage.upload.saveAndApply') }} diff --git a/src/components/damImage/uploadQueue/components/UploadQueueItemEditable.vue b/src/components/damImage/uploadQueue/components/UploadQueueItemEditable.vue index 2853b788..64a56002 100644 --- a/src/components/damImage/uploadQueue/components/UploadQueueItemEditable.vue +++ b/src/components/damImage/uploadQueue/components/UploadQueueItemEditable.vue @@ -13,13 +13,10 @@ import ASystemEntityScope from '@/components/form/ASystemEntityScope.vue' import { useDamConfigState } from '@/components/damImage/uploadQueue/composables/damConfigState' import AssetCustomMetadataForm from '@/components/damImage/uploadQueue/components/AssetCustomMetadataForm.vue' import AssetImage from '@/components/damImage/uploadQueue/components/AssetImage.vue' -import AssetLinkExternal from '@/components/damImage/uploadQueue/components/AssetLinkExternal.vue' import AssetFileFailReasonChip from '@/components/damImage/uploadQueue/components/AssetFileFailReasonChip.vue' -import AuthorRemoteAutocompleteWithCached - from '@/components/damImage/uploadQueue/author/AuthorRemoteAutocompleteWithCached.vue' +import AuthorRemoteAutocompleteWithCached from '@/components/damImage/uploadQueue/author/AuthorRemoteAutocompleteWithCached.vue' import { ADamAssetMetadataValidationScopeSymbol } from '@/components/damImage/uploadQueue/composables/uploadValidations' -import KeywordRemoteAutocompleteWithCached - from '@/components/damImage/uploadQueue/keyword/KeywordRemoteAutocompleteWithCached.vue' +import KeywordRemoteAutocompleteWithCached from '@/components/damImage/uploadQueue/keyword/KeywordRemoteAutocompleteWithCached.vue' const props = withDefaults( defineProps<{ @@ -246,6 +243,14 @@ const showCancel = computed(() => {  ({{ prettyBytes(item.file.size) }}) + + + {{ t('common.damImage.asset.detail.info.status.duplicate') }} + + AxiosInstance) = un throw new Error('Unable to load dam ext system config. Incorrect response body.') } setDamConfigExtSystem(config, extSystemId) + damConfigExtSystem.value.image.authors.required = true + console.log(damConfigExtSystem.value) resolve(true) }) .catch((err) => {