Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
Add prop to disable file extension checking (#1195)
Ib Green43511e6b76ca
diff --git a/src/components/common/file-uploader/file-upload.d.ts b/src/components/common/file-uploader/file-upload.d.tsindex 0345af589..4855a58ec 100644--- a/src/components/common/file-uploader/file-upload.d.ts+++ b/src/components/common/file-uploader/file-upload.d.ts@@ -11,6 +11,8 @@ export type FileUploadProps = {fileFormatNames?: string[];/** A list of typically 3 letter extensions (without '.') for file matching */fileExtensions?: string[];+ /** Set to true if app wants to do its own file filtering */+ disableExtensionFilter?: boolean;};export const WarningMsg: React.Component;diff --git a/src/components/common/file-uploader/file-upload.js b/src/components/common/file-uploader/file-upload.jsindex 072b22ba2..e7b5f606d 100644--- a/src/components/common/file-uploader/file-upload.js+++ b/src/components/common/file-uploader/file-upload.js@@ -184,11 +184,13 @@ function FileUploadFactory() {const files = [...fileList].filter(Boolean);+ const {disableExtensionFilter = false} = this.props;+// TODO - move this code out of the componentconst filesToLoad = [];const errorFiles = [];for (const file of files) {- if (this._isValidFileType(file.name)) {+ if (disableExtensionFilter || this._isValidFileType(file.name)) {filesToLoad.push(file);} else {errorFiles.push(file.name);diff --git a/src/components/modal-container.js b/src/components/modal-container.jsindex 492f279ea..ef934805d 100644--- a/src/components/modal-container.js+++ b/src/components/modal-container.js@@ -61,23 +61,7 @@ import {} from 'constants/default-settings';import {EXPORT_MAP_FORMATS} from 'constants/default-settings';import KeyEvent from 'constants/keyevent';--// File.type is not reliable if the OS does not have a-// registered mapping for the extension.-// NOTE: Shapefiles must be in a compressed format since-// it requires multiple files to be present.-const DEFAULT_FILE_EXTENSIONS = ['csv', 'json', 'geojson'];-const DEFAULT_FILE_FORMATS = ['CSV', 'Json', 'GeoJSON'];--const getFileFormatNames = createSelector(- state => state.loaders,- loaders => [...DEFAULT_FILE_FORMATS, ...loaders.map(loader => loader.name)]-);--const getFileExtensions = createSelector(- state => state.loaders,- loaders => [...DEFAULT_FILE_EXTENSIONS, ...loaders.flatMap(loader => loader.extensions)]-);+import {getFileFormatNames, getFileExtensions} from '../reducers/vis-state-selectors';const DataTableModalStyle = css`top: 80px;diff --git a/src/components/modals/load-data-modal.d.ts b/src/components/modals/load-data-modal.d.tsindex dcc54b2e5..f97173174 100644--- a/src/components/modals/load-data-modal.d.ts+++ b/src/components/modals/load-data-modal.d.ts@@ -16,6 +16,8 @@ export type LoadDataModalProps = {fileFormatNames: string[];/** A list of typically 3 letter extensions (without '.') for file matching */fileExtensions: string[];+ /** Set to true if app wants to do its own file filtering */+ disableExtensionFilter?: boolean;};export function LoadDataModalFactory(diff --git a/src/reducers/vis-state-selectors.js b/src/reducers/vis-state-selectors.jsnew file mode 100644index 000000000..7a3b5c322--- /dev/null+++ b/src/reducers/vis-state-selectors.js@@ -0,0 +1,15 @@+import {createSelector} from 'reselect';++// NOTE: default formats must match file-handler.js+const DEFAULT_FILE_EXTENSIONS = ['csv', 'json', 'geojson'];+const DEFAULT_FILE_FORMATS = ['CSV', 'Json', 'GeoJSON'];++export const getFileFormatNames = createSelector(+ state => state.loaders,+ loaders => [...DEFAULT_FILE_FORMATS, ...loaders.map(loader => loader.name)]+);++export const getFileExtensions = createSelector(+ state => state.loaders,+ loaders => [...DEFAULT_FILE_EXTENSIONS, ...loaders.flatMap(loader => loader.extensions)]+);