fixed uploaded attachment not removed

This commit is contained in:
Asif Takavala
2022-02-15 06:10:04 +00:00
committed by Mohit Panjwani
parent f34dac9d3f
commit 8ba84f68c7
9 changed files with 59 additions and 20 deletions

View File

@ -118,6 +118,7 @@ const { t } = useI18n()
let isSaving = ref(false)
let avatarFileBlob = ref(null)
let imgFiles = ref([])
const isAdminAvatarRemoved = ref(false)
if (userStore.currentUser.avatar) {
imgFiles.value.push({
@ -170,6 +171,7 @@ function onFileInputChange(fileName, file) {
function onFileInputRemove() {
avatarFileBlob.value = null
isAdminAvatarRemoved.value = true
}
async function updateUserData() {
@ -209,12 +211,17 @@ async function updateUserData() {
if (response.data.data) {
isSaving.value = false
if (avatarFileBlob.value) {
if (avatarFileBlob.value || isAdminAvatarRemoved.value) {
let avatarData = new FormData()
avatarData.append('admin_avatar', avatarFileBlob.value)
if (avatarFileBlob.value) {
avatarData.append('admin_avatar', avatarFileBlob.value)
}
avatarData.append('is_admin_avatar_removed', isAdminAvatarRemoved.value)
await userStore.uploadAvatar(avatarData)
avatarFileBlob.value = null
isAdminAvatarRemoved.value = false
}
userForm.password = ''

View File

@ -180,6 +180,7 @@ utils.mergeSettings(companyForm, {
let previewLogo = ref([])
let logoFileBlob = ref(null)
let logoFileName = ref(null)
const isCompanyLogoRemoved = ref(false)
if (companyForm.logo) {
previewLogo.value.push({
@ -218,6 +219,7 @@ function onFileInputChange(fileName, file, fileCount, fileList) {
function onFileInputRemove() {
logoFileBlob.value = null
isCompanyLogoRemoved.value = true
}
async function updateCompanyData() {
@ -232,18 +234,23 @@ async function updateCompanyData() {
const res = await companyStore.updateCompany(companyForm)
if (res.data.data) {
if (logoFileBlob.value) {
if (logoFileBlob.value || isCompanyLogoRemoved.value) {
let logoData = new FormData()
logoData.append(
'company_logo',
JSON.stringify({
name: logoFileName.value,
data: logoFileBlob.value,
})
)
if (logoFileBlob.value) {
logoData.append(
'company_logo',
JSON.stringify({
name: logoFileName.value,
data: logoFileBlob.value,
})
)
}
logoData.append('is_company_logo_removed', isCompanyLogoRemoved.value)
await companyStore.updateCompanyLogo(logoData)
logoFileBlob.value = null
isCompanyLogoRemoved.value = false
}
isSaving.value = false