From b100da112d601f62c1d3f2368296c5b5a6ae495c Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Fri, 12 Jan 2024 13:53:15 +0700 Subject: [PATCH] feat: block upload file replace other system file --- Services/client/src/components/FileForm.vue | 6 +++--- Services/client/src/components/FileFormWrapper.vue | 8 ++++---- Services/client/src/components/ListView.vue | 9 +-------- Services/client/src/components/UploadExistDialog.vue | 8 ++++---- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/Services/client/src/components/FileForm.vue b/Services/client/src/components/FileForm.vue index a444aef..a118870 100644 --- a/Services/client/src/components/FileForm.vue +++ b/Services/client/src/components/FileForm.vue @@ -10,7 +10,7 @@ const props = withDefaults( defineProps<{ open: boolean error: { - fileExistMetadata?: boolean + externalFileExist?: boolean fileExist?: boolean fileName2Long?: boolean } @@ -189,12 +189,12 @@ const file = ref() : 'เลือกไฟล์' " :error=" - !!error.fileExistMetadata || + !!error.externalFileExist || !!error.fileExist || !!error.fileName2Long " :error-message=" - error.fileExistMetadata + error.externalFileExist ? 'พบไฟล์ชื่อซ้ำในระบบอื่น' : error.fileExist ? 'พบไฟล์ชื่อซ้ำในระบบ ไฟล์ชื่อนี้ภายในระบบจะถูกเขียนทับ' diff --git a/Services/client/src/components/FileFormWrapper.vue b/Services/client/src/components/FileFormWrapper.vue index 0baf18e..9e35013 100644 --- a/Services/client/src/components/FileFormWrapper.vue +++ b/Services/client/src/components/FileFormWrapper.vue @@ -22,12 +22,12 @@ const fileFormData = ref<{ }>({}) const fileFormType = ref<'edit' | 'create'>('create') const fileFormError = ref<{ - fileExistMetadata?: boolean + externalFileExist?: boolean fileExist?: boolean fileName2Long?: boolean }>({}) const fileExistNotification = ref(false) -const errorState = ref<'fileExist' | 'fileExistMetadata'>('fileExist') +const errorState = ref<'fileExist' | 'externalFileExist'>('fileExist') const fileFormComponent = ref>() const fileNameLabel = ref() @@ -114,7 +114,7 @@ async function submitFileForm( if (fileInfo?.metadata && Object.keys(fileInfo.metadata).length > 0) { fileExistNotification.value = true - errorState.value = 'fileExistMetadata' + errorState.value = 'externalFileExist' return } @@ -178,7 +178,7 @@ async function submitFileForm( @reset="() => (fileFormError = {})" @filechange=" (name: string) => { - fileFormError.fileExistMetadata = checkFileExistMetadata(name) + fileFormError.externalFileExist = checkFileExistMetadata(name) ;(fileFormError.fileExist = checkFileExist(name, fileNameLabel)), (fileFormError.fileName2Long = checkFileName2Long( name, diff --git a/Services/client/src/components/ListView.vue b/Services/client/src/components/ListView.vue index 389ab42..9d54952 100644 --- a/Services/client/src/components/ListView.vue +++ b/Services/client/src/components/ListView.vue @@ -377,14 +377,7 @@ const onRowClick = ((_, row) => { @click.stop=" () => fileFormComponent?.triggerFileEdit( - { - title: data.row.title, - description: data.row.description, - keyword: data.row.keyword, - category: data.row.category, - author: data.row.author, - metadata: data.row.metadata, - }, + data.row, data.row.pathname, data.row.fileName, ) diff --git a/Services/client/src/components/UploadExistDialog.vue b/Services/client/src/components/UploadExistDialog.vue index a42b0e8..873a0a4 100644 --- a/Services/client/src/components/UploadExistDialog.vue +++ b/Services/client/src/components/UploadExistDialog.vue @@ -1,7 +1,7 @@