Skip to content

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

[Bug] Fix provider preview image during map save and share flow (#1243)

Shan He42670d89bb5a
diff --git a/.eslintrc b/.eslintrc
index c8395e3ee..23a0e30d7 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,7 +4,8 @@
"uber-es2015",
"prettier",
"plugin:prettier/recommended",
- "prettier/react"
+ "prettier/react",
+ "plugin:react-hooks/recommended"
],
"env": {
"es6": true,
diff --git a/examples/demo-app/src/cloud-providers/dropbox/dropbox-provider.js b/examples/demo-app/src/cloud-providers/dropbox/dropbox-provider.js
index cd99cbb57..9df5cee10 100644
--- a/examples/demo-app/src/cloud-providers/dropbox/dropbox-provider.js
+++ b/examples/demo-app/src/cloud-providers/dropbox/dropbox-provider.js
@@ -46,6 +46,11 @@ function parseQueryString(query) {
return params;
}
+function isConfigFile(err) {
+ const summary = err.error && err.error.error_summary;
+ return typeof summary === 'string' && Boolean(summary.match(/path\/conflict\/file\//g));
+}
+
export default class DropboxProvider extends Provider {
constructor(clientId, appName) {
super({name: NAME, displayName: DISPLAY_NAME, icon: DropboxIcon});
@@ -214,14 +219,20 @@ export default class DropboxProvider extends Provider {
const fileName = `${name}.json`;
const fileContent = map;
// FileWriteMode: Selects what to do if the file already exists.
- const mode = options.overwrite ? 'overwrite' : 'add';
-
- const metadata = await this._dropbox.filesUpload({
- path: `${this._path}/${fileName}`,
- contents: JSON.stringify(fileContent),
- mode
- });
-
+ // Always overwrite if sharing
+ const mode = options.overwrite || isPublic ? 'overwrite' : 'add';
+ let metadata;
+ try {
+ metadata = await this._dropbox.filesUpload({
+ path: `${this._path}/${fileName}`,
+ contents: JSON.stringify(fileContent),
+ mode
+ });
+ } catch (err) {
+ if (isConfigFile(err)) {
+ throw this.getFileConflictError();
+ }
+ }
// save a thumbnail image
thumbnail &&
(await this._dropbox.filesUpload({
@@ -361,25 +372,30 @@ export default class DropboxProvider extends Provider {
* @returns {Promise<DropboxTypes.sharing.FileLinkMetadataReference | DropboxTypes.sharing.FolderLinkMetadataReference | DropboxTypes.sharing.SharedLinkMetadataReference>}
*/
_shareFile(metadata) {
+ const shareArgs = {
+ path: metadata.path_display || metadata.path_lower
+ };
+
return this._dropbox
- .sharingCreateSharedLinkWithSettings({
- path: metadata.path_display || metadata.path_lower
+ .sharingListSharedLinks(shareArgs)
+ .then(({links} = {}) => {
+ if (links && links.length) {
+ return links[0];
+ }
+ return this._dropbox.sharingCreateSharedLinkWithSettings(shareArgs);
})
- .then(
+ .then(result => {
// Update URL to avoid CORS issue
// Unfortunately this is not the ideal scenario but it will make sure people
// can share dropbox urls with users without the dropbox account (publish on twitter, facebook)
- result => {
- // save share link
- this._shareUrl = this._overrideUrl(result.url);
-
- return {
- // the full url to be displayed
- shareUrl: this.getShareUrl(true),
- folderLink: this._folderLink
- };
- }
- );
+ this._shareUrl = this._overrideUrl(result.url);
+
+ return {
+ // the full url to be displayed
+ shareUrl: this.getShareUrl(true),
+ folderLink: this._folderLink
+ };
+ });
}
/**
diff --git a/package.json b/package.json
index 4e913a646..5d7c69051 100644
--- a/package.json
+++ b/package.json
@@ -199,6 +199,7 @@
"eslint-plugin-babel": "^5.3.0",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-react": "^7.13.0",
+ "eslint-plugin-react-hooks": "^4.1.0",
"gl": "^4.2.2",
"jest": "^25.1.0",
"jest-image-snapshot": "^2.12.0",
diff --git a/src/actions/index.d.ts b/src/actions/index.d.ts
index c29660429..dd7c0eddb 100644
--- a/src/actions/index.d.ts
+++ b/src/actions/index.d.ts
@@ -7,6 +7,7 @@ export * from './ui-state-actions';
export * from './map-state-actions';
export * from './map-style-actions';
export * from './identity-actions';
+export * from './provider-actions';
// TODO - Add typescript defs for these functions
// Dispatch
diff --git a/src/actions/ui-state-actions.d.ts b/src/actions/ui-state-actions.d.ts
index ee21bc7e4..6db5415d6 100644
--- a/src/actions/ui-state-actions.d.ts
+++ b/src/actions/ui-state-actions.d.ts
@@ -185,14 +185,6 @@ export function setExportHTMLMapMode(
mode: string
): Merge<SetExportHTMLMapModeUpdaterAction, {type: ActionTypes.SET_EXPORT_MAP_HTML_MODE}>;
-/** START_SAVE_STORAGE */
-export type StartSaveStorageUpdaterAction = {
- payload: boolean;
-}
-export function startSaveStorage(
- mapSaved: string
-): Merge<StartSaveStorageUpdaterAction, {type: ActionTypes.START_SAVE_STORAGE}>
-
/** SET_LOCALE */
export type SetLocaleUpdaterAction = {
payload: {locale: string};
diff --git a/src/actions/ui-state-actions.js b/src/actions/ui-state-actions.js
index cc4a3de43..a2807a24b 100644
--- a/src/actions/ui-state-actions.js
+++ b/src/actions/ui-state-actions.js
@@ -152,13 +152,6 @@ export const setExportImageError = createAction(ActionTypes.SET_EXPORT_IMAGE_ERR
*/
export const cleanupExportImage = createAction(ActionTypes.CLEANUP_EXPORT_IMAGE);
-/**
- * Start saving storage flow
- * @memberof uiStateActions
- * @type {typeof import('./ui-state-actions').startSaveStorage}
- */
-export const startSaveStorage = createAction(ActionTypes.START_SAVE_STORAGE);
-
/**
* Set selected dataset for export
* @memberof uiStateActions
diff --git a/src/cloud-providers/index.d.ts b/src/cloud-providers/index.d.ts
index 85937061c..429203cc5 100644
--- a/src/cloud-providers/index.d.ts
+++ b/src/cloud-providers/index.d.ts
@@ -43,3 +43,5 @@ export class Provider {
listMaps(): Promise<MapListItem>;
downloadMap(param: any): Promose<{map: MapData; format: string}>;
}
+
+export const FILE_CONFLICT_MSG: string;
diff --git a/src/cloud-providers/index.js b/src/cloud-providers/index.js
index e7d1d64c3..f3f34a0df 100644
--- a/src/cloud-providers/index.js
+++ b/src/cloud-providers/index.js
@@ -18,4 +18,4 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-export {default as Provider} from './provider';
+export {default as Provider, FILE_CONFLICT_MSG} from './provider';
diff --git a/src/cloud-providers/provider.js b/src/cloud-providers/provider.js
index ef62a31c6..90a627477 100644
--- a/src/cloud-providers/provider.js
+++ b/src/cloud-providers/provider.js
@@ -24,7 +24,7 @@ const NAME = 'cloud-provider';
const DISPLAY_NAME = 'Cloud Provider';
const THUMBNAIL = {width: 300, height: 200};
const ICON = Upload;
-
+export const FILE_CONFLICT_MSG = 'file_conflict';
/**
* The default provider class
* @param {object} props
@@ -108,6 +108,13 @@ export default class Provider {
return '';
}
+ /**
+ * This return a standard error that will trigger the overwrite map modal
+ */
+ getFileConflictError() {
+ return new Error(FILE_CONFLICT_MSG);
+ }
+
/**
* This method will be called when user click the login button in the cloud provider tile.
* Upon login success, `onCloudLoginSuccess` has to be called to notify kepler.gl UI
diff --git a/src/components/common/info-helper.js b/src/components/common/info-helper.js
index 757ef6ab2..8387ce1ed 100644
--- a/src/components/common/info-helper.js
+++ b/src/components/common/info-helper.js
@@ -48,26 +48,30 @@ const propTypes = {
containerClass: PropTypes.string
};
-const InfoHelper = ({description, property, containerClass, id}) => (
- <StyledInfoHelper className={`info-helper ${containerClass || ''}`} data-tip data-for={id}>
- <Docs height="16px" />
- <Tooltip id={id} effect="solid">
- <div className="info-helper__content">
- {description && (
- <FormattedMessage
- id={description}
- values={{
- property: useIntl().formatMessage({
- id: property ? `property.${camelize(property)}` : 'misc.empty'
- })
- }}
- />
- )}
- </div>
- </Tooltip>
- </StyledInfoHelper>
-);
+const InfoHelper = ({description, property, containerClass, id}) => {
+ // TODO: move intl out
+ const intl = useIntl();
+ return (
+ <StyledInfoHelper className={`info-helper ${containerClass || ''}`} data-tip data-for={id}>
+ <Docs height="16px" />
+ <Tooltip id={id} effect="solid">
+ <div className="info-helper__content">
+ {description && (
+ <FormattedMessage
+ id={description}
+ values={{
+ property: intl.formatMessage({
+ id: property ? `property.${camelize(property)}` : 'misc.empty'
+ })
+ }}
+ />
+ )}
+ </div>
+ </Tooltip>
+ </StyledInfoHelper>
+ );
+};
InfoHelper.propTypes = propTypes;
export default InfoHelper;
diff --git a/src/components/filters/filter-panels/polygon-filter-panel.js b/src/components/filters/filter-panels/polygon-filter-panel.js
index 639a55502..8376a8dc2 100644
--- a/src/components/filters/filter-panels/polygon-filter-panel.js
+++ b/src/components/filters/filter-panels/polygon-filter-panel.js
@@ -37,18 +37,15 @@ function PolygonFilterPanelFactory(FilterPanelHeader, PolygonFilter) {
idx,
datasets,
layers,
- layerData,
allAvailableFields,
filter,
- isAnyFilterAnimating,
- enlargeFilter,
removeFilter,
setFilter,
toggleFilterFeature
}) => {
const filterDatasets = useMemo(() => filter.dataId.map(d => datasets[d]), [filter, datasets]);
- const onSetLayers = useCallback(value => setFilter(idx, 'layerId', value), [setFilter]);
+ const onSetLayers = useCallback(value => setFilter(idx, 'layerId', value), [setFilter, idx]);
const isVisible = get(filter, ['value', 'properties', 'isVisible'], true);
const featureType = get(filter, ['value', 'properties', 'renderType'], true);
diff --git a/src/components/filters/filter-panels/time-range-filter-panel.js b/src/components/filters/filter-panels/time-range-filter-panel.js
index c713a8ded..0b16e052b 100644
--- a/src/components/filters/filter-panels/time-range-filter-panel.js
+++ b/src/components/filters/filter-panels/time-range-filter-panel.js
@@ -55,7 +55,7 @@ function TimeRangeFilterPanelFactory(FieldPanelWithFieldSelect, TimeRangeFilter)
active: filter.enlarged
}
],
- [filter.id, filter.enlargeFilter, enlargeFilter]
+ [filter.id, filter.enlarged, enlargeFilter]
);
return (
diff --git a/src/components/filters/polygon-filter.js b/src/components/filters/polygon-filter.js
index c2754be30..e093f23b4 100644
--- a/src/components/filters/polygon-filter.js
+++ b/src/components/filters/polygon-filter.js
@@ -33,7 +33,7 @@ function PolygonFilterFactory() {
newLayers => {
return setLayers(newLayers.map(l => l.id));
},
- [layers, setLayers]
+ [setLayers]
);
const selectedLayers = useMemo(() => layers.filter(l => filter.layerId.includes(l.id)), [
diff --git a/src/components/geocoder/geocoder.js b/src/components/geocoder/geocoder.js
index d6a5c7ae1..e7fca553b 100644
--- a/src/components/geocoder/geocoder.js
+++ b/src/components/geocoder/geocoder.js
@@ -125,14 +125,14 @@ const GeoCoder = ({
}
}, timeout);
},
- [client, results, setResults, setShowResults]
+ [client, limit, timeout, setResults, setShowResults]
);
const onBlur = useCallback(() => {
setTimeout(() => {
setShowResults(false);
}, timeout);
- }, [setShowResults]);
+ }, [setShowResults, timeout]);
const onFocus = useCallback(() => setShowResults(true), [setShowResults]);
@@ -186,7 +186,7 @@ const GeoCoder = ({
break;
}
},
- [results, selectedIndex, setSelectedIndex]
+ [results, selectedIndex, setSelectedIndex, onItemSelected]
);
return (
diff --git a/src/components/kepler-gl.js b/src/components/kepler-gl.js
index 58638481e..3c8243ea7 100644
--- a/src/components/kepler-gl.js
+++ b/src/components/kepler-gl.js
@@ -348,7 +348,6 @@ function KeplerGlFactory(
));
const isExportingImage = uiState.exportImage.exporting;
-
const theme = this.availableThemeSelector(this.props);
const localeMessages = this.localeMessagesSelector(this.props);
diff --git a/src/components/modal-container.js b/src/components/modal-container.js
index 3923aca68..e0b4d5abf 100644
--- a/src/components/modal-container.js
+++ b/src/components/modal-container.js
@@ -264,7 +264,6 @@ export default function ModalContainerFactory(
uiStateActions,
providerState
} = this.props;
-
const {currentModal, datasetKeyToRemove} = uiState;
const {datasets, layers, editingDataset} = visState;
@@ -456,6 +455,8 @@ export default function ModalContainerFactory(
onSetMapInfo={visStateActions.setMapInfo}
cloudProviders={this.providerWithStorage(this.props)}
onSetCloudProvider={this.props.providerActions.setCloudProvider}
+ cleanupExportImage={uiStateActions.cleanupExportImage}
+ onUpdateImageSetting={uiStateActions.setExportImageSetting}
/>
);
modalProps = {
@@ -467,7 +468,7 @@ export default function ModalContainerFactory(
confirmButton: {
large: true,
disabled:
- uiState.exportImage.exporting ||
+ uiState.exportImage.processing ||
!isValidMapInfo(visState.mapInfo) ||
!providerState.currentProvider,
children: 'modal.button.save'
@@ -482,6 +483,7 @@ export default function ModalContainerFactory(
title={get(visState, ['mapInfo', 'title'])}
onSetCloudProvider={this.props.providerActions.setCloudProvider}
onUpdateImageSetting={uiStateActions.setExportImageSetting}
+ cleanupExportImage={uiStateActions.cleanupExportImage}
/>
);
modalProps = {
@@ -494,7 +496,7 @@ export default function ModalContainerFactory(
large: true,
children: 'Yes',
disabled:
- uiState.exportImage.exporting ||
+ uiState.exportImage.processing ||
!isValidMapInfo(visState.mapInfo) ||
!providerState.currentProvider
}
@@ -504,10 +506,11 @@ export default function ModalContainerFactory(
template = (
<ShareMapModal
{...providerState}
- isReady={!uiState.exportImage.exporting}
+ isReady={!uiState.exportImage.processing}
cloudProviders={this.providerWithShare(this.props)}
onExport={this._onShareMapUrl}
onSetCloudProvider={this.props.providerActions.setCloudProvider}
+ cleanupExportImage={uiStateActions.cleanupExportImage}
onUpdateImageSetting={uiStateActions.setExportImageSetting}
/>
);
diff --git a/src/components/modals/export-image-modal.d.ts b/src/components/modals/export-image-modal.d.ts
new file mode 100644
index 000000000..39adff841
--- /dev/null
+++ b/src/components/modals/export-image-modal.d.ts
@@ -0,0 +1,17 @@
+import React from 'react';
+import {setExportImageSetting, cleanupExportImage} from '../../actions';
+import {ExportImage} from '../../reducers';
+import {WithIntlProps} from 'react-intl';
+
+export type ExportImageModalProps = WithIntlProps<{
+ exportImage: ExportImage;
+ mapW: number;
+ mapH: number;
+ onUpdateImageSetting: typeof setExportImageSetting;
+ cleanupExportImage: typeof cleanupExportImage;
+}>;
+
+export const ExportImageModal: React.FunctionComponent<ExportImageModalProps>;
+function ExportImageModalFactory(): React.FunctionComponent<ExportImageModalProps>;
+
+export default ExportImageModalFactory;
diff --git a/src/components/modals/export-image-modal.js b/src/components/modals/export-image-modal.js
index 610f5abd0..32f804e64 100644
--- a/src/components/modals/export-image-modal.js
+++ b/src/components/modals/export-image-modal.js
@@ -18,8 +18,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-import React, {Component} from 'react';
-import PropTypes from 'prop-types';
+import React, {useEffect} from 'react';
import styled from 'styled-components';
import ImagePreview from 'components/common/image-preview';
@@ -30,6 +29,8 @@ import Switch from 'components/common/switch';
import {injectIntl} from 'react-intl';
import {FormattedMessage} from 'localization';
+/** @typedef {import('./export-image-modal').ExportImageModalProps} ExportImageModalProps */
+
const ImageOptionList = styled.div`
display: flex;
flex-direction: column;
@@ -55,93 +56,81 @@ const ImageOptionList = styled.div`
`;
const ExportImageModalFactory = () => {
- class ExportImageModal extends Component {
- static propTypes = {
- mapW: PropTypes.number.isRequired,
- mapH: PropTypes.number.isRequired,
- exportImage: PropTypes.object.isRequired,
- // callbacks
- onUpdateImageSetting: PropTypes.func.isRequired
- };
-
- componentDidUpdate() {
- this._updateMapDim();
- }
+ /**
+ * @type {React.FunctionComponent<ExportImageModalProps>}
+ */
+ const ExportImageModal = ({exportImage, onUpdateImageSetting, cleanupExportImage, intl}) => {
+ const {mapH, mapW, legend, ratio, resolution} = exportImage;
+ useEffect(() => {
+ onUpdateImageSetting({
+ exporting: true
+ });
+ return cleanupExportImage;
+ }, [onUpdateImageSetting, cleanupExportImage]);
- componentWillUnmount() {
- this.props.onUpdateImageSetting({exporting: false});
- }
-
- _updateMapDim() {
- const {exportImage, mapH, mapW} = this.props;
+ useEffect(() => {
if (mapH !== exportImage.mapH || mapW !== exportImage.mapW) {
- this.props.onUpdateImageSetting({
+ onUpdateImageSetting({
mapH,
- mapW,
- legend: false
+ mapW
});
}
- }
+ }, [mapH, mapW, exportImage, onUpdateImageSetting]);
- render() {
- const {exportImage, onUpdateImageSetting, intl} = this.props;
- const {legend, ratio, resolution} = exportImage;
-
- return (
- <StyledModalContent className="export-image-modal">
- <ImageOptionList>
- <div className="image-option-section">
- <div className="image-option-section-title">
- <FormattedMessage id={'modal.exportImage.ratioTitle'} />
- </div>
- <FormattedMessage id={'modal.exportImage.ratioDescription'} />
- <div className="button-list">
- {EXPORT_IMG_RATIO_OPTIONS.filter(op => !op.hidden).map(op => (
- <SelectionButton
- key={op.id}
- selected={ratio === op.id}
- onClick={() => onUpdateImageSetting({ratio: op.id})}
- >
- <FormattedMessage id={op.label} />
- </SelectionButton>
- ))}
- </div>
+ return (
+ <StyledModalContent className="export-image-modal">
+ <ImageOptionList>
+ <div className="image-option-section">
+ <div className="image-option-section-title">
+ <FormattedMessage id={'modal.exportImage.ratioTitle'} />
</div>
- <div className="image-option-section">
- <div className="image-option-section-title">
- <FormattedMessage id={'modal.exportImage.resolutionTitle'} />
- </div>
- <FormattedMessage id={'modal.exportImage.resolutionDescription'} />
- <div className="button-list">
- {EXPORT_IMG_RESOLUTION_OPTIONS.map(op => (
- <SelectionButton
- key={op.id}
- selected={resolution === op.id}
- onClick={() => op.available && onUpdateImageSetting({resolution: op.id})}
- >
- {op.label}
- </SelectionButton>
- ))}
- </div>
+ <FormattedMessage id={'modal.exportImage.ratioDescription'} />
+ <div className="button-list">
+ {EXPORT_IMG_RATIO_OPTIONS.filter(op => !op.hidden).map(op => (
+ <SelectionButton
+ key={op.id}
+ selected={ratio === op.id}
+ onClick={() => onUpdateImageSetting({ratio: op.id})}
+ >
+ <FormattedMessage id={op.label} />
+ </SelectionButton>
+ ))}
</div>
- <div className="image-option-section">
- <div className="image-option-section-title">
- <FormattedMessage id={'modal.exportImage.mapLegendTitle'} />
- </div>
- <Switch
- type="checkbox"
- id="add-map-legend"
- checked={legend}
- label={intl.formatMessage({id: 'modal.exportImage.mapLegendAdd'})}
- onChange={() => onUpdateImageSetting({legend: !legend})}
- />
+ </div>
+ <div className="image-option-section">
+ <div className="image-option-section-title">
+ <FormattedMessage id={'modal.exportImage.resolutionTitle'} />
</div>
- </ImageOptionList>
- <ImagePreview exportImage={exportImage} />
- </StyledModalContent>
- );
- }
- }
+ <FormattedMessage id={'modal.exportImage.resolutionDescription'} />
+ <div className="button-list">
+ {EXPORT_IMG_RESOLUTION_OPTIONS.map(op => (
+ <SelectionButton
+ key={op.id}
+ selected={resolution === op.id}
+ onClick={() => op.available && onUpdateImageSetting({resolution: op.id})}
+ >
+ {op.label}
+ </SelectionButton>
+ ))}
+ </div>
+ </div>
+ <div className="image-option-section">
+ <div className="image-option-section-title">
+ <FormattedMessage id={'modal.exportImage.mapLegendTitle'} />
+ </div>
+ <Switch
+ type="checkbox"
+ id="add-map-legend"
+ checked={legend}
+ label={intl.formatMessage({id: 'modal.exportImage.mapLegendAdd'})}
+ onChange={() => onUpdateImageSetting({legend: !legend})}
+ />
+ </div>
+ </ImageOptionList>
+ <ImagePreview exportImage={exportImage} />
+ </StyledModalContent>
+ );
+ };
return injectIntl(ExportImageModal);
};
diff --git a/src/components/modals/image-modal-container.d.ts b/src/components/modals/image-modal-container.d.ts
new file mode 100644
index 000000000..869420fd8
--- /dev/null
+++ b/src/components/modals/image-modal-container.d.ts
@@ -0,0 +1,13 @@
+import React from 'react';
+import {setExportImageSetting, cleanupExportImage} from '../../actions';
+import {Provider} from '../../cloud-providers';
+
+export type ImageModalContainerProps = {
+ cloudProviders?: Provider[];
+ currentProvider?: string;
+ onUpdateImageSetting: typeof setExportImageSetting;
+ cleanupExportImage: typeof cleanupExportImage;
+};
+
+export const ImageModalContainer: React.FunctionComponent<ImageModalContainerProps>;
+export default ImageModalContainer;
diff --git a/src/components/modals/image-modal-container.js b/src/components/modals/image-modal-container.js
index bd0d450b8..abe914ccc 100644
--- a/src/components/modals/image-modal-container.js
+++ b/src/components/modals/image-modal-container.js
@@ -18,66 +18,60 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-import React, {Component} from 'react';
-import PropTypes from 'prop-types';
+import React, {useEffect} from 'react';
import get from 'lodash.get';
import {MAP_THUMBNAIL_DIMENSION, EXPORT_IMG_RATIOS} from 'constants/default-settings';
+/** @typedef {import('./image-modal-container').ImageModalContainerProps} ImageModalContainerProps */
+
/**
* A wrapper component in modals contain a image preview of the map with cloud providers
* It sets export image size based on provider thumbnail size
- * @component
+ * @type {React.FunctionComponent<ImageModalContainerProps>}
*/
-export default class ImageModalContainer extends Component {
- static propTypes = {
- onUpdateImageSetting: PropTypes.func.isRequired,
- cloudProviders: PropTypes.arrayOf(PropTypes.object),
- currentProvider: PropTypes.string
- };
-
- static defaultProps = {
- cloudProviders: [],
- currentProvider: null
- };
-
- componentDidMount() {
- this._updateThumbSize(true);
- }
-
- componentDidUpdate(prevProps) {
- // set thumbnail size if provider changes
- if (this.props.currentProvider !== prevProps.currentProvider && this.props.currentProvider) {
- this._updateThumbSize();
- }
- }
-
- componentWillUnmount() {
- this.props.onUpdateImageSetting({exporting: false});
- }
+const ImageModalContainer = ({
+ onUpdateImageSetting,
+ cleanupExportImage,
+ cloudProviders,
+ currentProvider,
+ children
+}) => {
+ useEffect(() => {
+ onUpdateImageSetting({exporting: true});
+ return () => {
+ cleanupExportImage();
+ };
+ }, [onUpdateImageSetting, cleanupExportImage]);
- _updateThumbSize(initialMount) {
- if (this.props.currentProvider && this.props.cloudProviders.length) {
- const provider = this.props.cloudProviders.find(p => p.name === this.props.currentProvider);
+ useEffect(() => {
+ if (currentProvider && cloudProviders.length) {
+ const provider = cloudProviders.find(p => p.name === currentProvider);
if (provider && provider.thumbnail) {
- this.props.onUpdateImageSetting({
+ onUpdateImageSetting({
mapW: get(provider, ['thumbnail', 'width']) || MAP_THUMBNAIL_DIMENSION.width,
mapH: get(provider, ['thumbnail', 'height']) || MAP_THUMBNAIL_DIMENSION.height,
ratio: EXPORT_IMG_RATIOS.CUSTOM,
legend: false
});
}
- } else if (initialMount) {
- this.props.onUpdateImageSetting({
+ } else {
+ onUpdateImageSetting({
mapW: MAP_THUMBNAIL_DIMENSION.width,
mapH: MAP_THUMBNAIL_DIMENSION.height,
- ratio: EXPORT_IMG_RATIOS.CUSTOM
+ ratio: EXPORT_IMG_RATIOS.CUSTOM,
+ legend: false
});
}
- }
+ }, [currentProvider, cloudProviders, onUpdateImageSetting]);
+
+ return <>{children}</>;
+};
+
+ImageModalContainer.defaultProps = {
+ cloudProviders: [],
+ currentProvider: null
+};
- render() {
- return <>{this.props.children}</>;
- }
-}
+export default ImageModalContainer;
diff --git a/src/components/modals/overwrite-map-modal.d.ts b/src/components/modals/overwrite-map-modal.d.ts
new file mode 100644
index 000000000..75d99e4f0
--- /dev/null
+++ b/src/components/modals/overwrite-map-modal.d.ts
@@ -0,0 +1,18 @@
+import React from 'react';
+import {Provider} from '../../cloud-providers';
+import {setExportImageSetting, cleanupExportImage} from '../../actions';
+
+export type OverwriteMapModalProps = {
+ mapSaved: string;
+ title: string;
+ cloudProviders: Provider[];
+ isProviderLoading: boolean;
+ currentProvider: string;
+
+ // callbacks
+ onUpdateImageSetting: typeof setExportImageSetting;
+ cleanupExportImage: typeof cleanupExportImage;
+};
+
+function OverwriteMapModalFactory(): React.FunctionComponent<OverwriteMapModal>;
+export default OverwriteMapModalFactory;
diff --git a/src/components/modals/overwrite-map-modal.js b/src/components/modals/overwrite-map-modal.js
index b9c42eb03..3a130c9ed 100644
--- a/src/components/modals/overwrite-map-modal.js
+++ b/src/components/modals/overwrite-map-modal.js
@@ -25,6 +25,8 @@ import {UploadAnimation} from './status-panel';
import ImageModalContainer from './image-modal-container';
import {FormattedMessage} from 'localization';
+/** @typedef {import('./overwrite-map-modal').OverwriteMapModalProps} OverwriteMapModalProps */
+
const StyledMsg = styled.div`
margin-top: 24px;
font-size: 14px;
@@ -45,6 +47,9 @@ const StyledOverwriteMapModal = styled(CenterVerticalFlexbox)`
`;
const OverwriteMapModalFactory = () => {
+ /**
+ * @type {React.FunctionComponent<OverwriteMapModalProps>}
+ */
const OverwriteMapModal = ({
mapSaved,
title,
@@ -52,7 +57,7 @@ const OverwriteMapModalFactory = () => {
cloudProviders,
isProviderLoading,
onUpdateImageSetting,
- onSetCloudProvider
+ cleanupExportImage
}) => {
const provider = cloudProviders.find(cp => cp.name === currentProvider);
return (
@@ -60,7 +65,7 @@ const OverwriteMapModalFactory = () => {
currentProvider={currentProvider}
cloudProviders={cloudProviders}
onUpdateImageSetting={onUpdateImageSetting}
- onSetCloudProvider={onSetCloudProvider}
+ cleanupExportImage={cleanupExportImage}
>
<StyledOverwriteMapModal className="overwrite-map-modal">
{isProviderLoading ? (
@@ -76,7 +81,7 @@ const OverwriteMapModalFactory = () => {
{provider && provider.icon ? <provider.icon height="64px" /> : null}
</StyledIcon>
<StyledMsg className="overwrite-map-msg">
- <StyledTitle>{title}</StyledTitle>
+ <StyledTitle>{title} </StyledTitle>
<FormattedMessage id={'modal.overwriteMap.alreadyExists'} values={{mapSaved}} />
</StyledMsg>
</>
@@ -89,5 +94,4 @@ const OverwriteMapModalFactory = () => {
};
export const OverwriteMapModal = OverwriteMapModalFactory();
-
export default OverwriteMapModalFactory;
diff --git a/src/components/modals/save-map-modal.d.ts b/src/components/modals/save-map-modal.d.ts
new file mode 100644
index 000000000..96f5d2039
--- /dev/null
+++ b/src/components/modals/save-map-modal.d.ts
@@ -0,0 +1,33 @@
+import React from 'react';
+import {Provider} from '../../cloud-providers';
+import {MapInfo, ExportImage} from '../../reducers';
+import {
+ setCloudProvider,
+ setExportImageSetting,
+ cleanupExportImage,
+ setMapInfo
+} from '../../actions';
+
+type CharacterLimits = {
+ title: number;
+ description: number;
+};
+
+export type SaveMapModalProps = {
+ mapInfo: MapInfo;
+ exportImage: ExportImage;
+ cloudProviders: Provider[];
+ isProviderLoading: boolean;
+ currentProvider: string;
+ providerError?: any;
+ characterLimits?: CharacterLimits;
+
+ // callbacks
+ onSetCloudProvider: typeof setCloudProvider;
+ onUpdateImageSetting: typeof setExportImageSetting;
+ cleanupExportImage: typeof cleanupExportImage;
+ onSetMapInfo: typeof setMapInfo;
+};
+
+function LoadDataModalFactory(): React.FunctionComponent<SaveMapModalProps>;
+export default LoadDataModalFactory;
diff --git a/src/components/modals/save-map-modal.js b/src/components/modals/save-map-modal.js
index 867eacf0f..fc9dabb72 100644
--- a/src/components/modals/save-map-modal.js
+++ b/src/components/modals/save-map-modal.js
@@ -18,13 +18,11 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-import React, {Component} from 'react';
-import PropTypes from 'prop-types';
+import React from 'react';
import styled from 'styled-components';
import CloudTile from './cloud-tile';
import ImageModalContainer from './image-modal-container';
import ProviderModalContainer from './provider-modal-container';
-
import StatusPanel, {UploadAnimation} from './status-panel';
import {MAP_THUMBNAIL_DIMENSION, MAP_INFO_CHARACTER} from 'constants/default-settings';
@@ -40,6 +38,8 @@ import {
import ImagePreview from 'components/common/image-preview';
import {FormattedMessage} from 'localization';
+/** @typedef {import('./save-map-modal').SaveMapModalProps} SaveMapModalProps */
+
const StyledSaveMapModal = styled.div.attrs({
className: 'save-map-modal'
})`
@@ -120,141 +120,125 @@ export const MapInfoPanel = ({
);
function SaveMapModalFactory() {
- class SaveMapModal extends Component {
- static propTypes = {
- exportImage: PropTypes.object.isRequired,
- mapInfo: PropTypes.object.isRequired,
- isProviderLoading: PropTypes.bool.isRequired,
- thumbWidth: PropTypes.number,
- thumbHeight: PropTypes.number,
- characterLimits: PropTypes.object,
- cloudProviders: PropTypes.arrayOf(PropTypes.object),
- currentProvider: PropTypes.string,
- onSetMapInfo: PropTypes.func.isRequired,
- onSetCloudProvider: PropTypes.func.isRequired,
- onUpdateImageSetting: PropTypes.func.isRequired
- };
-
- static defaultProps = {
- characterLimits: MAP_INFO_CHARACTER,
- cloudProviders: [],
- currentProvider: null,
- providerError: null,
- isProviderLoading: false,
- onSetCloudProvider: nop,
- onUpdateImageSetting: nop
- };
-
- _onChangeInput = (key, e) => {
- const {
- target: {value}
- } = e;
- this.props.onSetMapInfo({[key]: value});
+ /**
+ * @type {React.FunctionComponent<SaveMapModalProps>}
+ */
+ const SaveMapModal = ({
+ mapInfo,
+ exportImage,
+ characterLimits = {},
+ cloudProviders,
+ isProviderLoading,
+ currentProvider,
+ providerError,
+ onSetCloudProvider,
+ onUpdateImageSetting,
+ cleanupExportImage,
+ onSetMapInfo
+ }) => {
+ const onChangeInput = (key, {target: {value}}) => {
+ onSetMapInfo({[key]: value});
};
+ const provider = currentProvider ? cloudProviders.find(p => p.name === currentProvider) : null;
- render() {
- const {
- mapInfo,
- exportImage,
- characterLimits = {},
- cloudProviders,
- isProviderLoading,
- currentProvider,
- providerError,
- onSetCloudProvider,
- onUpdateImageSetting
- } = this.props;
- const provider = currentProvider
- ? cloudProviders.find(p => p.name === currentProvider)
- : null;
-
- return (
- <ProviderModalContainer
- onSetCloudProvider={onSetCloudProvider}
- cloudProviders={cloudProviders}
+ return (
+ <ProviderModalContainer
+ onSetCloudProvider={onSetCloudProvider}
+ cloudProviders={cloudProviders}
+ currentProvider={currentProvider}
+ >
+ <ImageModalContainer
currentProvider={currentProvider}
+ cloudProviders={cloudProviders}
+ onUpdateImageSetting={onUpdateImageSetting}
+ cleanupExportImage={cleanupExportImage}
>
- <ImageModalContainer
- currentProvider={currentProvider}
- cloudProviders={cloudProviders}
- onUpdateImageSetting={onUpdateImageSetting}
- >
- <StyledSaveMapModal>
- <StyledModalContent className="save-map-modal-content">
- <StyledExportSection disabled={isProviderLoading}>
- <div className="description">
- <div className="title">
- <FormattedMessage id={'modal.saveMap.title'} />
- </div>
- <div className="subtitle">
- <FormattedMessage id={'modal.saveMap.subtitle'} />
- </div>
+ <StyledSaveMapModal>
+ <StyledModalContent className="save-map-modal-content">
+ <StyledExportSection disabled={isProviderLoading}>
+ <div className="description">
+ <div className="title">
+ <FormattedMessage id={'modal.saveMap.title'} />
</div>
- <div className="selection">
- {cloudProviders.map(cloudProvider => (
- <CloudTile
- key={cloudProvider.name}
- onSelect={() => onSetCloudProvider(cloudProvider.name)}
- onSetCloudProvider={onSetCloudProvider}
- cloudProvider={cloudProvider}
- isSelected={cloudProvider.name === currentProvider}
- isConnected={Boolean(
- cloudProvider.getAccessToken && cloudProvider.getAccessToken()
- )}
- />
- ))}
+ <div className="subtitle">
+ <FormattedMessage id={'modal.saveMap.subtitle'} />
</div>
- </StyledExportSection>
- {provider && provider.getManagementUrl && (
- <StyledExportSection style={{margin: '2px 0'}}>
- <div className="description" />
- <div className="selection">
- <a
- key={1}
- href={provider.getManagementUrl()}
- target="_blank"
- rel="noopener noreferrer"
- style={{textDecoration: 'underline'}}
- >
- Go to your Kepler.gl {provider.displayName} page
- </a>
- </div>
- </StyledExportSection>
- )}
- <StyledExportSection>
- <div className="description image-preview-panel">
- <ImagePreview
- exportImage={exportImage}
- width={MAP_THUMBNAIL_DIMENSION.width}
- showDimension={false}
+ </div>
+ <div className="selection">
+ {cloudProviders.map(cloudProvider => (
+ <CloudTile
+ key={cloudProvider.name}
+ onSelect={() => onSetCloudProvider(cloudProvider.name)}
+ onSetCloudProvider={onSetCloudProvider}
+ cloudProvider={cloudProvider}
+ isSelected={cloudProvider.name === currentProvider}
+ isConnected={Boolean(
+ cloudProvider.getAccessToken && cloudProvider.getAccessToken()
+ )}
/>
+ ))}
+ </div>
+ </StyledExportSection>
+ {provider && provider.getManagementUrl && (
+ <StyledExportSection style={{margin: '2px 0'}}>
+ <div className="description" />
+ <div className="selection">
+ <a
+ key={1}
+ href={provider.getManagementUrl()}
+ target="_blank"
+ rel="noopener noreferrer"
+ style={{textDecoration: 'underline'}}
+ >
+ Go to your Kepler.gl {provider.displayName} page
+ </a>
</div>
- {isProviderLoading ? (
- <div className="selection map-saving-animation">
- <UploadAnimation icon={provider && provider.icon} />
- </div>
- ) : (
- <MapInfoPanel
- mapInfo={mapInfo}
- characterLimits={characterLimits}
- onChangeInput={this._onChangeInput}
- />
- )}
</StyledExportSection>
- {providerError ? (
- <StatusPanel
- isLoading={false}
- error={providerError}
- providerIcon={provider && provider.icon}
+ )}
+ <StyledExportSection>
+ <div className="description image-preview-panel">
+ <ImagePreview
+ exportImage={exportImage}
+ width={MAP_THUMBNAIL_DIMENSION.width}
+ showDimension={false}
/>
- ) : null}
- </StyledModalContent>
- </StyledSaveMapModal>
- </ImageModalContainer>
- </ProviderModalContainer>
- );
- }
- }
+ </div>
+ {isProviderLoading ? (
+ <div className="selection map-saving-animation">
+ <UploadAnimation icon={provider && provider.icon} />
+ </div>
+ ) : (
+ <MapInfoPanel
+ mapInfo={mapInfo}
+ characterLimits={characterLimits}
+ onChangeInput={onChangeInput}
+ />
+ )}
+ </StyledExportSection>
+ {providerError ? (
+ <StatusPanel
+ isLoading={false}
+ error={providerError}
+ providerIcon={provider && provider.icon}
+ />
+ ) : null}
+ </StyledModalContent>
+ </StyledSaveMapModal>
+ </ImageModalContainer>
+ </ProviderModalContainer>
+ );
+ };
+
+ SaveMapModal.defaultProps = {
+ characterLimits: MAP_INFO_CHARACTER,
+ cloudProviders: [],
+ currentProvider: null,
+ providerError: null,
+ isProviderLoading: false,
+ onSetCloudProvider: nop,
+ onUpdateImageSetting: nop
+ };
+
return SaveMapModal;
}
diff --git a/src/components/modals/share-map-modal.js b/src/components/modals/share-map-modal.js
index b0df1881f..2c9d3170d 100644
--- a/src/components/modals/share-map-modal.js
+++ b/src/components/modals/share-map-modal.js
@@ -18,7 +18,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-import React, {useState, Component} from 'react';
+import React, {useState} from 'react';
import styled, {ThemeProvider} from 'styled-components';
import {CopyToClipboard} from 'react-copy-to-clipboard';
import {themeLT} from 'styles/base';
@@ -85,127 +85,124 @@ const StyledInnerDiv = styled.div`
`;
export default function ShareMapUrlModalFactory() {
- class ShareMapUrlModal extends Component {
- static defaultProps = {
- isProviderLoading: false,
- onExport: nop,
- cloudProviders: [],
- currentProvider: null,
- providerError: null,
- successInfo: {},
- onSetCloudProvider: nop,
- onUpdateImageSetting: nop
- };
+ const ShareMapUrlModal = ({
+ isProviderLoading,
+ isReady,
+ onExport,
+ cloudProviders,
+ currentProvider,
+ providerError,
+ successInfo,
+ onSetCloudProvider,
+ onUpdateImageSetting,
+ cleanupExportImage
+ }) => {
+ const {shareUrl, folderLink} = successInfo;
+ const provider = currentProvider ? cloudProviders.find(p => p.name === currentProvider) : null;
- render() {
- const {
- isProviderLoading,
- isReady,
- onExport,
- cloudProviders,
- currentProvider,
- providerError,
- successInfo,
- onSetCloudProvider,
- onUpdateImageSetting
- } = this.props;
- const {shareUrl, folderLink} = successInfo;
- const provider = currentProvider
- ? cloudProviders.find(p => p.name === currentProvider)
- : null;
-
- return (
- <ThemeProvider theme={themeLT}>
- <ProviderModalContainer
- onSetCloudProvider={onSetCloudProvider}
- cloudProviders={cloudProviders}
+ return (
+ <ThemeProvider theme={themeLT}>
+ <ProviderModalContainer
+ onSetCloudProvider={onSetCloudProvider}
+ cloudProviders={cloudProviders}
+ currentProvider={currentProvider}
+ >
+ <ImageModalContainer
currentProvider={currentProvider}
+ cloudProviders={cloudProviders}
+ onUpdateImageSetting={onUpdateImageSetting}
+ cleanupExportImage={cleanupExportImage}
>
- <ImageModalContainer
- currentProvider={currentProvider}
- cloudProviders={cloudProviders}
- onUpdateImageSetting={onUpdateImageSetting}
- >
- <StyledShareMapModal className="export-cloud-modal">
- <StyledInnerDiv>
- <StyledExportSection>
- <div className="description">
- <div className="title">
- <FormattedMessage id={'modal.shareMap.shareUriTitle'} />
- </div>
- <div className="subtitle">
- <FormattedMessage id={'modal.shareMap.shareUriSubtitle'} />
- </div>
+ <StyledShareMapModal className="export-cloud-modal">
+ <StyledInnerDiv>
+ <StyledExportSection>
+ <div className="description">
+ <div className="title">
+ <FormattedMessage id={'modal.shareMap.shareUriTitle'} />
</div>
- <div className="selection">
- <div className="title warning">
- <FormattedMessage id={'modal.shareMap.shareDisclaimer'} />
- </div>
+ <div className="subtitle">
+ <FormattedMessage id={'modal.shareMap.shareUriSubtitle'} />
</div>
- </StyledExportSection>
- <StyledExportSection disabled={isProviderLoading}>
+ </div>
+ <div className="selection">
+ <div className="title warning">
+ <FormattedMessage id={'modal.shareMap.shareDisclaimer'} />
+ </div>
+ </div>
+ </StyledExportSection>
+ <StyledExportSection disabled={isProviderLoading}>
+ <div className="description">
+ <div className="title">
+ <FormattedMessage id={'modal.shareMap.cloudTitle'} />
+ </div>
+ <div className="subtitle">
+ <FormattedMessage id={'modal.shareMap.cloudSubtitle'} />
+ </div>
+ </div>
+ <div className="selection">
+ {cloudProviders.map(cloudProvider => (
+ <CloudTile
+ key={cloudProvider.name}
+ onSelect={() => onExport(cloudProvider)}
+ onSetCloudProvider={onSetCloudProvider}
+ cloudProvider={cloudProvider}
+ actionName="Upload"
+ isSelected={cloudProvider.name === currentProvider}
+ isConnected={Boolean(cloudProvider.getAccessToken())}
+ isReady={isReady}
+ />
+ ))}
+ </div>
+ </StyledExportSection>
+ {isProviderLoading || providerError ? (
+ <StatusPanel
+ isLoading={isProviderLoading}
+ error={providerError}
+ providerIcon={provider && provider.icon}
+ />
+ ) : null}
+ {shareUrl && (
+ <StyledExportSection>
<div className="description">
- <div className="title">
- <FormattedMessage id={'modal.shareMap.cloudTitle'} />
- </div>
- <div className="subtitle">
- <FormattedMessage id={'modal.shareMap.cloudSubtitle'} />
- </div>
+ <div className="title">Share Url</div>
</div>
<div className="selection">
- {cloudProviders.map(cloudProvider => (
- <CloudTile
- key={cloudProvider.name}
- onSelect={() => onExport(cloudProvider)}
- onSetCloudProvider={onSetCloudProvider}
- cloudProvider={cloudProvider}
- actionName="Upload"
- isSelected={cloudProvider.name === currentProvider}
- isConnected={Boolean(cloudProvider.getAccessToken())}
- isReady={isReady}
- />
- ))}
+ <SharingUrl key={0} url={shareUrl} />
+ {provider && folderLink && (
+ <a
+ key={1}
+ href={folderLink}
+ target="_blank"
+ rel="noopener noreferrer"
+ style={{textDecoration: 'underline'}}
+ >
+ <FormattedMessage
+ id={'modal.shareMap.gotoPage'}
+ values={{currentProvider}}
+ />
+ </a>
+ )}
</div>
</StyledExportSection>
- {isProviderLoading || providerError ? (
- <StatusPanel
- isLoading={isProviderLoading}
- error={providerError}
- providerIcon={provider && provider.icon}
- />
- ) : null}
- {shareUrl && (
- <StyledExportSection>
- <div className="description">
- <div className="title">Share Url</div>
- </div>
- <div className="selection">
- <SharingUrl key={0} url={shareUrl} />
- {provider && folderLink && (
- <a
- key={1}
- href={folderLink}
- target="_blank"
- rel="noopener noreferrer"
- style={{textDecoration: 'underline'}}
- >
- <FormattedMessage
- id={'modal.shareMap.gotoPage'}
- values={{currentProvider}}
- />
- </a>
- )}
- </div>
- </StyledExportSection>
- )}
- </StyledInnerDiv>
- </StyledShareMapModal>
- </ImageModalContainer>
- </ProviderModalContainer>
- </ThemeProvider>
- );
- }
- }
+ )}
+ </StyledInnerDiv>
+ </StyledShareMapModal>
+ </ImageModalContainer>
+ </ProviderModalContainer>
+ </ThemeProvider>
+ );
+ };
+
+ ShareMapUrlModal.defaultProps = {
+ isProviderLoading: false,
+ onExport: nop,
+ cloudProviders: [],
+ currentProvider: null,
+ providerError: null,
+ successInfo: {},
+ onSetCloudProvider: nop,
+ onUpdateImageSetting: nop
+ };
return ShareMapUrlModal;
}
diff --git a/src/components/plot-container.js b/src/components/plot-container.js
index ed44ce15f..2e8b160f2 100644
--- a/src/components/plot-container.js
+++ b/src/components/plot-container.js
@@ -54,7 +54,8 @@ PlotContainerFactory.deps = [MapContainerFactory];
// Remove mapbox logo in exported map, because it contains non-ascii characters
const StyledPlotContainer = styled.div`
.mapboxgl-ctrl-bottom-left,
- .mapboxgl-ctrl-bottom-right {
+ .mapboxgl-ctrl-bottom-right,
+ .mapbox-attribution-container {
display: none;
}
@@ -142,7 +143,9 @@ export default function PlotContainerFactory(MapContainer) {
.then(this.props.setExportImageDataUri)
.catch(err => {
this.props.setExportImageError(err);
- this.props.addNotification(exportImageError({err}));
+ if (this.props.enableErrorNotification) {
+ this.props.addNotification(exportImageError({err}));
+ }
});
}
};
diff --git a/src/components/side-panel.js b/src/components/side-panel.js
index 1b440a9b1..365c60525 100644
--- a/src/components/side-panel.js
+++ b/src/components/side-panel.js
@@ -40,7 +40,10 @@ import {
EXPORT_DATA_ID,
EXPORT_MAP_ID,
SHARE_MAP_ID,
- SIDEBAR_PANELS
+ SIDEBAR_PANELS,
+ OVERWRITE_MAP_ID,
+ SAVE_MAP_ID,
+ EXPORT_IMAGE_ID
} from 'constants/default-settings';
const SidePanelContent = styled.div`
@@ -147,20 +150,22 @@ export default function SidePanelFactory(
this.props.uiStateActions.openDeleteModal(key);
};
- _onClickExportImage = () => this.props.uiStateActions.startExportingImage();
+ _onClickExportImage = () => this.props.uiStateActions.toggleModal(EXPORT_IMAGE_ID);
_onClickExportData = () => this.props.uiStateActions.toggleModal(EXPORT_DATA_ID);
_onClickExportMap = () => this.props.uiStateActions.toggleModal(EXPORT_MAP_ID);
- _onClickSaveToStorage = () => this.props.uiStateActions.startSaveStorage(this.props.mapSaved);
+ _onClickSaveToStorage = () =>
+ this.props.uiStateActions.toggleModal(this.props.mapSaved ? OVERWRITE_MAP_ID : SAVE_MAP_ID);
_onClickSaveAsToStorage = () => {
// add (copy) to file name
this.props.visStateActions.setMapInfo({
title: `${this.props.mapInfo.title || 'Kepler.gl'} (Copy)`
});
- this.props.uiStateActions.startSaveStorage(false);
+
+ this.props.uiStateActions.toggleModal(SAVE_MAP_ID);
};
_onClickShareMap = () => this.props.uiStateActions.toggleModal(SHARE_MAP_ID);
diff --git a/src/reducers/provider-state-updaters.js b/src/reducers/provider-state-updaters.js
index e922a7b96..1aeb572e8 100644
--- a/src/reducers/provider-state-updaters.js
+++ b/src/reducers/provider-state-updaters.js
@@ -43,9 +43,12 @@ import {addDataToMap} from 'actions/actions';
import {
DEFAULT_NOTIFICATION_TYPES,
DEFAULT_NOTIFICATION_TOPICS,
- DATASET_FORMATS
+ DATASET_FORMATS,
+ OVERWRITE_MAP_ID
} from 'constants/default-settings';
import {toArray} from 'utils/utils';
+import {FILE_CONFLICT_MSG} from 'cloud-providers';
+import {DATASET_HANDLERS} from 'processors/data-processor';
export const INITIAL_PROVIDER_STATE = {
isProviderLoading: false,
@@ -56,7 +59,6 @@ export const INITIAL_PROVIDER_STATE = {
mapSaved: null,
visualizations: []
};
-import {DATASET_HANDLERS} from 'processors/data-processor';
function createActionTask(action, payload) {
if (typeof action === 'function') {
@@ -179,12 +181,18 @@ export const postSaveLoadSuccessUpdater = (state, action) => {
*/
export const exportFileErrorUpdater = (state, action) => {
const {error, provider, onError} = action.payload;
+
const newState = {
...state,
- isProviderLoading: false,
- providerError: getError(error)
+ isProviderLoading: false
};
+ if (isFileConflict(error)) {
+ newState.mapSaved = provider.name;
+ return withTask(newState, [ACTION_TASK().map(_ => toggleModal(OVERWRITE_MAP_ID))]);
+ }
+
+ newState.providerError = getError(error);
const task = createActionTask(onError, {error, provider});
return task ? withTask(newState, task) : newState;
@@ -217,6 +225,10 @@ export const loadCloudMapUpdater = (state, action) => {
return withTask(newState, uploadFileTask);
};
+function isFileConflict(error) {
+ return error && error.message === FILE_CONFLICT_MSG;
+}
+
function checkLoadMapResponseError(response) {
if (!response || !isPlainObject(response)) {
return new Error('Load map response is empty');
diff --git a/src/reducers/ui-state-updaters.d.ts b/src/reducers/ui-state-updaters.d.ts
index c96f38965..313cefe0a 100644
--- a/src/reducers/ui-state-updaters.d.ts
+++ b/src/reducers/ui-state-updaters.d.ts
@@ -178,10 +178,6 @@ export function setLocaleUpdater(
state: UiState,
action: UiStateActions.SetLocaleUpdaterAction
): UiState;
-export function startSaveStorage(
- state: UiState,
- action: UiStateActions.StartSaveStorage
-): UiState
export function loadFilesUpdater(state: UiState, action: LoadFilesUpdaterAction): UiState;
export function loadFilesErrUpdater(state: UiState, action: LoadFilesErrUpdaterAction): UiState;
diff --git a/src/reducers/ui-state-updaters.js b/src/reducers/ui-state-updaters.js
index af6add373..4349cacf2 100644
--- a/src/reducers/ui-state-updaters.js
+++ b/src/reducers/ui-state-updaters.js
@@ -33,8 +33,6 @@ import {LOCALE_CODES} from 'localization/locales';
import {createNotification, errorNotification} from 'utils/notifications-utils';
import {calculateExportImageSize} from 'utils/export-utils';
import {payload_, apply_, compose_} from './composer-helpers';
-import {EXPORT_IMAGE_ID} from '../constants';
-import {OVERWRITE_MAP_ID, SAVE_MAP_ID} from '../constants/default-settings';
export const DEFAULT_ACTIVE_SIDE_PANEL = 'layer';
export const DEFAULT_MODAL = ADD_DATA_ID;
@@ -424,7 +422,7 @@ export const setExportImageErrorUpdater = (state, {payload: error}) => ({
...state,
exportImage: {
...state.exportImage,
- exporting: false,
+ processing: false,
error
}
});
@@ -442,6 +440,7 @@ export const cleanupExportImageUpdater = state => ({
exporting: false,
imageDataUri: '',
error: false,
+ processing: false,
center: false
}
});
@@ -463,8 +462,7 @@ export const startExportingImageUpdater = (state, {payload: options = {}}) => {
return compose_([
cleanupExportImageUpdater,
- apply_(setExportImageSettingUpdater, payload_(imageSettings)),
- apply_(toggleModalUpdater, payload_(EXPORT_IMAGE_ID))
+ apply_(setExportImageSettingUpdater, payload_(imageSettings))
])(state);
};
@@ -721,19 +719,3 @@ export const setLocaleUpdater = (state, {payload: {locale}}) => ({
...state,
locale
});
-
-/**
- * Start saving storage flow
- * @memberof uiStateUpdaters
- * @param state
- * @param mapSaved
- * @returns {UiState}
- * @type {typeof import('./ui-state-updaters').startSaveStorage}
- */
-export const startSaveStorage = (state, {payload: mapSaved}) => {
- return compose_([
- cleanupExportImageUpdater,
- apply_(setExportImageSettingUpdater, payload_({exporting: true})),
- apply_(toggleModalUpdater, payload_(mapSaved ? OVERWRITE_MAP_ID : SAVE_MAP_ID))
- ])(state);
-};
diff --git a/src/reducers/ui-state.js b/src/reducers/ui-state.js
index d400e0a5b..1d940a616 100644
--- a/src/reducers/ui-state.js
+++ b/src/reducers/ui-state.js
@@ -56,9 +56,7 @@ const actionHandler = {
[ActionTypes.LOAD_FILES_ERR]: uiStateUpdaters.loadFilesErrUpdater,
[ActionTypes.TOGGLE_SPLIT_MAP]: uiStateUpdaters.toggleSplitMapUpdater,
- [ActionTypes.SET_LOCALE]: uiStateUpdaters.setLocaleUpdater,
-
- [ActionTypes.START_SAVE_STORAGE]: uiStateUpdaters.startSaveStorage
+ [ActionTypes.SET_LOCALE]: uiStateUpdaters.setLocaleUpdater
};
/* Reducer */
diff --git a/test/browser/components/modals/save-map-modal-test.js b/test/browser/components/modals/save-map-modal-test.js
index 371715b8d..ec3c5959c 100644
--- a/test/browser/components/modals/save-map-modal-test.js
+++ b/test/browser/components/modals/save-map-modal-test.js
@@ -48,10 +48,10 @@ test('Components -> SaveMapModal.mount', t => {
</IntlWrapper>
);
}, 'Show not fail without props');
- t.ok(onUpdateImageSetting.calledOnce, 'should call onUpdateImageSetting when mount');
+ t.ok(onUpdateImageSetting.calledTwice, 'should call onUpdateImageSetting twice when mount');
t.deepEqual(
onUpdateImageSetting.args,
- [[{mapW: 100, mapH: 60, ratio: 'CUSTOM', legend: false}]],
+ [[{exporting: true}], [{mapW: 100, mapH: 60, ratio: 'CUSTOM', legend: false}]],
'should call onUpdateImageSetting when mount'
);
t.ok(onSetCloudProvider.notCalled, 'should not call onSetCloudProvider when mount');
diff --git a/test/browser/components/side-panel/side-panel-test.js b/test/browser/components/side-panel/side-panel-test.js
index 3a5f725be..e798d110c 100644
--- a/test/browser/components/side-panel/side-panel-test.js
+++ b/test/browser/components/side-panel/side-panel-test.js
@@ -55,7 +55,7 @@ const SaveExportDropdown = appInjector.get(SaveExportDropdownFactory);
import {InitialState} from 'test/helpers/mock-state';
// Constants
-import {EXPORT_DATA_ID, EXPORT_MAP_ID} from 'constants/default-settings';
+import {EXPORT_DATA_ID, EXPORT_MAP_ID, EXPORT_IMAGE_ID} from 'constants/default-settings';
// default props from initial state
const defaultProps = {
@@ -358,7 +358,7 @@ test('Components -> SidePanel -> PanelHeader -> ExportDropDown', t => {
.at(0)
.find('.toolbar-item')
.simulate('click');
- t.ok(startExportingImage.calledOnce, 'Should call startExportingImage with no params');
+ t.ok(toggleModal.calledWith(EXPORT_IMAGE_ID), 'Should call toggleModal with EXPORT_IMAGE_ID');
// export data
t.equal(
diff --git a/test/node/reducers/ui-state-test.js b/test/node/reducers/ui-state-test.js
index 985abaa3e..71355bc3f 100644
--- a/test/node/reducers/ui-state-test.js
+++ b/test/node/reducers/ui-state-test.js
@@ -30,8 +30,7 @@ import {
setExportDataType,
setExportFiltered,
addNotification,
- startExportingImage,
- startSaveStorage
+ startExportingImage
} from 'actions/ui-state-actions';
import {loadFiles, loadFilesErr} from 'actions/vis-state-actions';
import {keplerGlInit} from 'actions/actions';
@@ -41,9 +40,7 @@ import {
EXPORT_DATA_TYPE,
RESOLUTIONS,
DEFAULT_NOTIFICATION_TOPICS,
- DEFAULT_NOTIFICATION_TYPES,
- EXPORT_IMAGE_ID,
- SAVE_MAP_ID
+ DEFAULT_NOTIFICATION_TYPES
} from 'constants/default-settings';
import {removeNotification} from 'actions/ui-state-actions';
@@ -153,7 +150,6 @@ test('#uiStateReducer -> START_EXPORTING_IMAGE', t => {
const expectedState = {
...INITIAL_UI_STATE,
- currentModal: EXPORT_IMAGE_ID,
exportImage: {
...INITIAL_UI_STATE.exportImage,
exporting: true
@@ -315,20 +311,3 @@ test('#uiStateReducer -> LOAD_FILES_ERR', t => {
t.end();
});
-
-test('#uiStateReducer -> START_SAVE_STORAGE', t => {
- const newReducer = reducer(INITIAL_UI_STATE, startSaveStorage(''));
-
- const expectedState = {
- ...INITIAL_UI_STATE,
- currentModal: SAVE_MAP_ID,
- exportImage: {
- ...INITIAL_UI_STATE.exportImage,
- exporting: true
- }
- };
-
- t.deepEqual(newReducer, expectedState, 'should set exporting to true and modal to export image');
-
- t.end();
-});
diff --git a/tsconfig.json b/tsconfig.json
index d5e34034f..97183b6e8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,7 +21,10 @@
"strict": true,
"resolveJsonModule": true,
"isolatedModules": true,
- "baseUrl": "./src"
+ "baseUrl": "./src",
+ "paths": {
+ "*": ["*"]
+ }
},
"paths": {
"actions": "src/actions",
diff --git a/yarn.lock b/yarn.lock
index fa112e09a..91deab480 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5195,6 +5195,11 @@ eslint-plugin-prettier@^3.1.2:
dependencies:
prettier-linter-helpers "^1.0.0"
+eslint-plugin-react-hooks@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.1.0.tgz#6323fbd5e650e84b2987ba76370523a60f4e7925"
+ integrity sha512-36zilUcDwDReiORXmcmTc6rRumu9JIM3WjSvV0nclHoUQ0CNrX866EwONvLR/UqaeqFutbAnVu8PEmctdo2SRQ==
+
eslint-plugin-react@^6.7.1:
version "6.10.3"
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz#c5435beb06774e12c7db2f6abaddcbf900cd3f78"