vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Limit meme types on image fields (#36800)

Browse source 
* Revert "fix(file-upload): add support for blocking unsupported file types in file uploader (#36736)"

This reverts commit fe5072fa23.

* fix: Limit allowed MIME types for image fields

original and simpler version of #36736 that I overengineered.
This commit is contained in:
Ankush Menat 2026-02-06 16:40:02 +05:30 • committed by GitHub
parent 61cb4646c4
commit e30bfaf4e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 24 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
frappe/public/js/frappe/file_uploader/FileUploader.vue
View file

@ -284,7 +284,6 @@ const props = defineProps({
max_file_size: null, // 2048 -> 2KB
max_number_of_files: null,
allowed_file_types: [], // ['image/*', 'video/*', '.jpg', '.gif', '.pdf'],
blocked_file_types: [], // ['image/heic', 'image/tiff'],
crop_image_aspect_ratio: null, // 1, 16 / 9, 4 / 3, NaN (free)
}),
},
@ -473,7 +472,6 @@ function check_restrictions(file) {
let is_correct_type = true;
let valid_file_size = true;
let is_unsupported_file_type = check_unsupported_file_type(file);
if (allowed_file_types && allowed_file_types.length) {
is_correct_type = allowed_file_types.some((type) => {
@ -495,22 +493,12 @@ function check_restrictions(file) {
valid_file_size = file.size < max_file_size;
}
if (!is_correct_type || is_unsupported_file_type) {
if (!is_correct_type) {
console.warn("File skipped because of invalid file type", file);
if (is_unsupported_file_type) {
frappe.show_alert({
message: __('File "{0}" was skipped because of unsupported file type "{1}"', [
file.name,
file.type,
]),
indicator: "orange",
});
} else {
frappe.show_alert({
message: __('File "{0}" was skipped because of invalid file type', [file.name]),
indicator: "orange",
});
}
frappe.show_alert({
message: __('File "{0}" was skipped because of invalid file type', [file.name]),
indicator: "orange",
});
}
if (!valid_file_size) {
console.warn("File skipped because of invalid file size", file.size, file);
@ -523,22 +511,8 @@ function check_restrictions(file) {
});
}
return is_correct_type && valid_file_size && !is_unsupported_file_type;
return is_correct_type && valid_file_size;
}
function check_unsupported_file_type(file) {
let { blocked_file_types = [] } = props.restrictions;
return blocked_file_types.some((type) => {
if (type.includes("/")) {
if (!file.type) return false;
return file.type.match(type);
}
if (type[0] === ".") {
return file.name.toLowerCase().endsWith(type.toLowerCase());
}
});
}
function upload_files(dialog) {
if (show_file_browser.value) {
return upload_via_file_browser();

16
frappe/public/js/frappe/form/controls/attach.js
View file

@ -64,13 +64,15 @@ frappe.ui.form.ControlAttach = class ControlAttach extends frappe.ui.form.Contro
}
on_attach_doc_image() {
this.set_upload_options();
this.upload_options.restrictions.allowed_file_types = ["image/*"];
// file types like .heic/.tiff are not supported for preview directly in the browser, so we block the user from uploading them
this.upload_options.restrictions.blocked_file_types = [
"image/heic",
"image/heif",
"image/tiff",
"image/tif",
this.upload_options.restrictions.allowed_file_types = [
"image/jpeg",
"image/png",
"image/gif",
"image/webp",
"image/svg+xml",
"image/avif",
"image/bmp",
"image/x-icon",
];
this.file_uploader = new frappe.ui.FileUploader(this.upload_options);
}

16
frappe/public/js/frappe/form/controls/attach_image.js
View file

@ -20,13 +20,15 @@ frappe.ui.form.ControlAttachImage = class ControlAttachImage extends frappe.ui.f
}
set_upload_options() {
super.set_upload_options();
this.upload_options.restrictions.allowed_file_types = ["image/*"];
// file types like .heic/.tiff are not supported for preview directly in the browser, so we block the user from uploading them
this.upload_options.restrictions.blocked_file_types = [
"image/heic",
"image/heif",
"image/tiff",
"image/tif",
this.upload_options.restrictions.allowed_file_types = [
"image/jpeg",
"image/png",
"image/gif",
"image/webp",
"image/svg+xml",
"image/avif",
"image/bmp",
"image/x-icon",
];
}
};