mirror of
https://github.com/lingble/chatwoot.git
synced 2025-11-01 03:27:52 +00:00
f801c1928d
# Pull Request Template ## Description This PR fixes the handling of attachments and file limits in reply modes: * Applies **default file size and type limits** for private notes * **Resets attachments** automatically when switching reply modes ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? ### Loom video https://www.loom.com/share/abad3e6a0383405ea5f31314c1494f2f?sid=38715fd0-e305-4a9b-8f4d-fc6a6e5c0833 ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [x] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
91 lines
2.3 KiB
JavaScript
91 lines
2.3 KiB
JavaScript
import { mapGetters } from 'vuex';
|
|
import { useAlert } from 'dashboard/composables';
|
|
import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
|
|
import { getMaxUploadSizeByChannel } from '@chatwoot/utils';
|
|
import { DirectUpload } from 'activestorage';
|
|
import { MAXIMUM_FILE_UPLOAD_SIZE } from 'shared/constants/messages';
|
|
|
|
export default {
|
|
computed: {
|
|
...mapGetters({
|
|
accountId: 'getCurrentAccountId',
|
|
}),
|
|
},
|
|
|
|
methods: {
|
|
maxSizeFor(mime) {
|
|
// Use default file size limit for private notes
|
|
if (this.isOnPrivateNote) {
|
|
return MAXIMUM_FILE_UPLOAD_SIZE;
|
|
}
|
|
|
|
return getMaxUploadSizeByChannel({
|
|
channelType: this.inbox?.channel_type,
|
|
medium: this.inbox?.medium, // e.g. 'sms' | 'whatsapp'
|
|
mime, // e.g. 'image/png'
|
|
});
|
|
},
|
|
alertOverLimit(maxSizeMB) {
|
|
useAlert(
|
|
this.$t('CONVERSATION.FILE_SIZE_LIMIT', {
|
|
MAXIMUM_SUPPORTED_FILE_UPLOAD_SIZE: maxSizeMB,
|
|
})
|
|
);
|
|
},
|
|
onFileUpload(file) {
|
|
if (this.globalConfig.directUploadsEnabled) {
|
|
this.onDirectFileUpload(file);
|
|
} else {
|
|
this.onIndirectFileUpload(file);
|
|
}
|
|
},
|
|
|
|
onDirectFileUpload(file) {
|
|
if (!file) return;
|
|
|
|
const mime = file.file?.type || file.type;
|
|
const maxSizeMB = this.maxSizeFor(mime);
|
|
|
|
if (!checkFileSizeLimit(file, maxSizeMB)) {
|
|
this.alertOverLimit(maxSizeMB);
|
|
return;
|
|
}
|
|
|
|
const upload = new DirectUpload(
|
|
file.file,
|
|
`/api/v1/accounts/${this.accountId}/conversations/${this.currentChat.id}/direct_uploads`,
|
|
{
|
|
directUploadWillCreateBlobWithXHR: xhr => {
|
|
xhr.setRequestHeader(
|
|
'api_access_token',
|
|
this.currentUser.access_token
|
|
);
|
|
},
|
|
}
|
|
);
|
|
|
|
upload.create((error, blob) => {
|
|
if (error) {
|
|
useAlert(error);
|
|
} else {
|
|
this.attachFile({ file, blob });
|
|
}
|
|
});
|
|
},
|
|
|
|
onIndirectFileUpload(file) {
|
|
if (!file) return;
|
|
|
|
const mime = file.file?.type || file.type;
|
|
const maxSizeMB = this.maxSizeFor(mime);
|
|
|
|
if (!checkFileSizeLimit(file, maxSizeMB)) {
|
|
this.alertOverLimit(maxSizeMB);
|
|
return;
|
|
}
|
|
|
|
this.attachFile({ file });
|
|
},
|
|
},
|
|
};
|