Skip to content

Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.

fix(file-upload): accept uppercase file extensions (#3824)

Igor Dykhta8d37071f2290
diff --git a/src/components/src/common/file-uploader/file-upload.tsx b/src/components/src/common/file-uploader/file-upload.tsx
index 6454ab518..8eefbfa38 100644
--- a/src/components/src/common/file-uploader/file-upload.tsx
+++ b/src/components/src/common/file-uploader/file-upload.tsx
@@ -363,7 +363,8 @@ function FileUploadFactory() {
_isValidFileType = filename => {
const {fileExtensions = []} = this.props;
- const fileExt = fileExtensions.find(ext => filename.endsWith(ext));
+ const normalizedFilename = filename.toLowerCase();
+ const fileExt = fileExtensions.find(ext => normalizedFilename.endsWith(ext.toLowerCase()));
return Boolean(fileExt);
};
diff --git a/test/browser/components/common/file-uploader-test.js b/test/browser/components/common/file-uploader-test.js
index e3d10899c..0158b9797 100644
--- a/test/browser/components/common/file-uploader-test.js
+++ b/test/browser/components/common/file-uploader-test.js
@@ -67,6 +67,65 @@ test('Components -> FileUpload.onDrop', t => {
t.end();
});
+test('Components -> FileUpload.onDrop accepts uppercase file extensions', t => {
+ const mockFiles = [{type: '', name: 'features.GEOJSON'}];
+ const onFileUpload = sinon.spy();
+ const wrapper = mountWithTheme(
+ <IntlWrapper>
+ <FileUpload onFileUpload={onFileUpload} fileExtensions={['geojson']} />
+ </IntlWrapper>
+ );
+
+ wrapper
+ .find('.file-uploader__file-drop')
+ .at(0)
+ .simulate('drop', {
+ stopPropagation: () => {},
+ dataTransfer: {
+ types: ['Files'],
+ files: mockFiles
+ }
+ });
+
+ t.ok(onFileUpload.calledOnce, 'uppercase extension should be uploaded once');
+ t.ok(onFileUpload.calledWith(mockFiles), 'uppercase extension should be uploaded');
+ t.deepEqual(
+ wrapper.find(FileUpload).children().first().state().errorFiles,
+ [],
+ 'uppercase extension should not be marked unsupported'
+ );
+ t.end();
+});
+
+test('Components -> FileUpload.onDrop rejects whitespace-only file extensions', t => {
+ const mockFiles = [{type: 'text/plain', name: 'notes.txt'}];
+ const onFileUpload = sinon.spy();
+ const wrapper = mountWithTheme(
+ <IntlWrapper>
+ <FileUpload onFileUpload={onFileUpload} fileExtensions={[' ', 'geojson']} />
+ </IntlWrapper>
+ );
+
+ wrapper
+ .find('.file-uploader__file-drop')
+ .at(0)
+ .simulate('drop', {
+ stopPropagation: () => {},
+ dataTransfer: {
+ types: ['Files'],
+ files: mockFiles
+ }
+ });
+
+ t.notOk(onFileUpload.called, 'unsupported extension should not be uploaded');
+ t.deepEqual(
+ wrapper.find(FileUpload).children().first().state().errorFiles,
+ ['notes.txt'],
+ 'unsupported extension should be marked unsupported'
+ );
+ t.end();
+});
+
test('Components -> FileUpload.onDrop -> render loading msg', t => {
const mockFiles = [{type: 'text/csv', name: 'tst-file.csv'}];
const onFileUpload = sinon.spy(arg => {