Skip to content

Fix custom accept error message not shown for unsupported file type in file input #1928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
farhaharoon0931-eng wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −2
Open

Fix custom accept error message not shown for unsupported file type in file input #1928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...root/content/forms/af/core-components-it/samples/fileinput/fileinputv4/basic/.content.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
jcr:title="File Input - 7"
sling:resourceType="core/fd/components/form/fileinput/v4/fileinput"
accept="[audio/*, video/*, image/*, text/*, application/pdf,.ifc]"
acceptMessage="This file type is not supported!"
fieldType="file-input"
readOnly="{Boolean}false"
name="fileinput7"
Expand Down
2 changes: 1 addition & 1 deletion ...apps/core/fd/components/form/fileinput/v4/fileinput/clientlibs/site/js/fileinputwidget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ if (typeof window.FileInputWidget === 'undefined') {
const messages = {
[this.invalidFeature.SIZE]: customMessages.maxFileSize || FormView.LanguageUtils.getTranslatedString(this.lang, "FileSizeGreater", [fileNames, this.options.maxFileSize]),
[this.invalidFeature.NAME]: customMessages.invalidFileName || FormView.LanguageUtils.getTranslatedString(this.lang, "FileNameInvalid", [fileNames]),
[this.invalidFeature.MIMETYPE]: customMessages.invalidMimeType || FormView.LanguageUtils.getTranslatedString(this.lang, "FileMimeTypeInvalid", [fileNames]),
[this.invalidFeature.MIMETYPE]: customMessages.accept || FormView.LanguageUtils.getTranslatedString(this.lang, "FileMimeTypeInvalid", [fileNames]),
[this.invalidFeature.SIZE_ZERO]: customMessages.zeroFileSize || FormView.LanguageUtils.getTranslatedString(this.lang, "FileSizeZero", [fileNames])
};
return messages[invalidFeature];
Expand Down
2 changes: 1 addition & 1 deletion ui.frontend/src/view/FormFileInputWidgetBase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ class FormFileInputWidgetBase {
const messages = {
[this.invalidFeature.SIZE]: customMessages.maxFileSize || FormView.LanguageUtils.getTranslatedString(this.lang, "FileSizeGreater", [fileName, this.options.maxFileSize]),
[this.invalidFeature.NAME]: customMessages.invalidFileName || FormView.LanguageUtils.getTranslatedString(this.lang, "FileNameInvalid", [fileName]),
[this.invalidFeature.MIMETYPE]: customMessages.invalidMimeType || FormView.LanguageUtils.getTranslatedString(this.lang, "FileMimeTypeInvalid", [fileName])
[this.invalidFeature.MIMETYPE]: customMessages.accept || FormView.LanguageUtils.getTranslatedString(this.lang, "FileMimeTypeInvalid", [fileName])
};

alert(messages[invalidFeature]);
Expand Down
10 changes: 10 additions & 0 deletions ui.tests/test-module/specs/fileinput/fileinputv4.runtime.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,16 @@ describe('Click on button tag (V-4)', () => {
});
});

it('should display a custom error message configured by the user for unsupported file type', () => {
const [id, fieldView] = Object.entries(formContainer._fields)[6];
const model = formContainer._model.getElement(id);
const fileInput = 'input[name=\'fileinput7\']';
cy.attachFile(fileInput, ['sample.afe']);
cy.on('window:alert', (alertText) => {
expect(alertText).to.equal(model.getState().constraintMessages.accept);
});
});

it('file when uploaded again should give actual size', () => {
let sampleFileNames = ['sample.svg'];
const fileInput = "input[name='fileinput2']";
Expand Down
Loading