From 989e05544fc29ff942695713e926ee530d2eb1ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Kube=C5=A1?= Date: Mon, 17 Oct 2022 15:36:30 +0200 Subject: [PATCH] feat: Prevent pasting file name + fix comparing string and number --- app/javascript/shared/helpers/FileHelper.js | 6 +----- app/javascript/shared/helpers/specs/FileHelper.spec.js | 2 +- app/javascript/widget/components/ChatAttachment.vue | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/javascript/shared/helpers/FileHelper.js b/app/javascript/shared/helpers/FileHelper.js index d9ca9f943..e58f52f16 100644 --- a/app/javascript/shared/helpers/FileHelper.js +++ b/app/javascript/shared/helpers/FileHelper.js @@ -11,11 +11,7 @@ export const formatBytes = (bytes, decimals = 2) => { }; export const fileSizeInMegaBytes = bytes => { - if (bytes === 0) { - return 0; - } - const sizeInMB = (bytes / (1024 * 1024)).toFixed(2); - return sizeInMB; + return bytes / (1024 * 1024); }; export const checkFileSizeLimit = (file, maximumUploadLimit) => { diff --git a/app/javascript/shared/helpers/specs/FileHelper.spec.js b/app/javascript/shared/helpers/specs/FileHelper.spec.js index a0d1ac52f..750eab52c 100644 --- a/app/javascript/shared/helpers/specs/FileHelper.spec.js +++ b/app/javascript/shared/helpers/specs/FileHelper.spec.js @@ -24,7 +24,7 @@ describe('#File Helpers', () => { expect(fileSizeInMegaBytes(0)).toBe(0); }); it('should return 19.07 if 20000000 is passed', () => { - expect(fileSizeInMegaBytes(20000000)).toBe('19.07'); + expect(fileSizeInMegaBytes(20000000)).toBeCloseTo(19.07, 2); }); }); describe('checkFileSizeLimit', () => { diff --git a/app/javascript/widget/components/ChatAttachment.vue b/app/javascript/widget/components/ChatAttachment.vue index 638b08378..bcf2e0ffa 100755 --- a/app/javascript/widget/components/ChatAttachment.vue +++ b/app/javascript/widget/components/ChatAttachment.vue @@ -60,6 +60,7 @@ export default { const items = (e.clipboardData || e.originalEvent.clipboardData).items; items.forEach(item => { if (item.kind === 'file') { + e.preventDefault(); const file = item.getAsFile(); this.$refs.upload.add(file); }