Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Chores] Fixed security vulnerabilities and added new factories (#1294)
Giuseppe Macrì9a13ce685f6b
diff --git a/.travis.yml b/.travis.ymlindex ba51ddb74..a7ed995fa 100644--- a/.travis.yml+++ b/.travis.yml@@ -30,5 +30,4 @@ after_success:script:- npm run lint- npm run coveralls- - fossacache: yarndiff --git a/package.json b/package.jsonindex da0c458e4..0f78cd6de 100644--- a/package.json+++ b/package.json@@ -239,16 +239,19 @@"webpack-stats-plugin": "^0.2.1"},"resolutions": {- "lodash": "4.17.19",- "dot-prop": "5.1.1",- "minimist": "1.2.3",- "jpeg-js": "0.4.0","@loaders.gl/core": "^2.3.0-alpha.9","@loaders.gl/csv": "^2.3.0-alpha.9","@loaders.gl/gltf": "^2.3.0-alpha.9","@loaders.gl/json": "^2.3.0-alpha.9","@loaders.gl/loader-utils": "^2.3.0-alpha.9",- "@loaders.gl/polyfills": "^2.3.0-alpha.9"+ "@loaders.gl/polyfills": "^2.3.0-alpha.9",+ "dot-prop": "5.1.1",+ "kind-of": "6.0.3",+ "jpeg-js": "0.4.0",+ "lodash": "4.17.19",+ "minimist": "1.2.3",+ "node-fetch": "2.6.1",+ "tough-cookie": "2.3.0"},"peerDependencies": {"react": "^16.3",diff --git a/src/components/index.js b/src/components/index.jsindex 5d4b468db..51ad3367e 100644--- a/src/components/index.js+++ b/src/components/index.js@@ -55,7 +55,7 @@ export {default as LayerPanelFactory} from './side-panel/layer-panel/layer-panelexport {default as LayerPanelHeaderFactory} from './side-panel/layer-panel/layer-panel-header';export {default as LayerConfiguratorFactory} from './side-panel/layer-panel/layer-configurator';export {default as TextLabelPanelFactory} from './side-panel/layer-panel/text-label-panel';-export {LayerConfigGroupLabelFactory} from './side-panel/layer-panel/layer-config-group';+export {default as LayerConfigGroupLabelFactory} from './side-panel/layer-panel/layer-config-group';export {default as SourceDataCatalogFactory} from './side-panel/common/source-data-catalog';export {default as SourceDataSelectorFactory} from './side-panel/common/source-data-selector';@@ -153,8 +153,11 @@ export {DatasetSquare} from './common/styled-components';export {default as ActionPanel, ActionPanelItem} from 'components/common/action-panel';// side pane components-export {default as LayerTypeSelector} from './side-panel/layer-panel/layer-type-selector';+export {default as LayerTypeSelectorFactory} from './side-panel/layer-panel/layer-type-selector';+export {default as LayerTypeDropdownListFactory} from './side-panel/layer-panel/layer-type-dropdown-list';+export {default as LayerTypeListItemFactory} from './side-panel/layer-panel/layer-type-list-item';export {ConfigGroupCollapsibleContent} from './side-panel/layer-panel/layer-config-group';+export {default as ColumnSelectorFactory} from './side-panel/layer-panel/column-selector';export {default as FilterPanelHeaderFactory} from './side-panel/filter-panel/filter-panel-header';export {default as StyledDropdownSelect} from './common/item-selector/item-selector';export {diff --git a/src/components/side-panel/layer-panel/column-selector.js b/src/components/side-panel/layer-panel/column-selector.jsnew file mode 100644index 000000000..bcde75fbb--- /dev/null+++ b/src/components/side-panel/layer-panel/column-selector.js@@ -0,0 +1,68 @@+// Copyright (c) 2020 Uber Technologies, Inc.+//+// Permission is hereby granted, free of charge, to any person obtaining a copy+// of this software and associated documentation files (the "Software"), to deal+// in the Software without restriction, including without limitation the rights+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell+// copies of the Software, and to permit persons to whom the Software is+// furnished to do so, subject to the following conditions:+//+// The above copyright notice and this permission notice shall be included in+// all copies or substantial portions of the Software.+//+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN+// THE SOFTWARE.++import React from 'react';+import styled from 'styled-components';+import {FormattedMessage} from 'localization';+import {PanelLabel} from '../..';+import FieldSelectorFactory from 'components/common/field-selector';+import {validateColumn} from 'reducers/vis-state-merger';++const ColumnRow = styled.div`+ display: flex;+ margin-bottom: 8px;+ align-items: center;+`;++const ColumnName = styled.div`+ width: 25%;+`;++const ColumnSelect = styled.div`+ width: 75%;+`;++ColumnSelectorFactory.deps = [FieldSelectorFactory];++function ColumnSelectorFactory(FieldSelector) {+ const ColumnSelector = ({column, columns, label, allFields, onSelect, fieldPairs}) => (+ <ColumnRow className="layer-config__column__selector">+ <ColumnName className="layer-config__column__name">+ <PanelLabel>+ <FormattedMessage id={`columns.${label}`} />+ </PanelLabel>+ {!column.optional ? <PanelLabel>{` *`}</PanelLabel> : null}+ </ColumnName>+ <ColumnSelect className="layer-config__column__select">+ <FieldSelector+ suggested={fieldPairs}+ error={!validateColumn(column, columns, allFields)}+ fields={allFields}+ value={column.value}+ erasable={Boolean(column.optional)}+ onSelect={onSelect}+ />+ </ColumnSelect>+ </ColumnRow>+ );+ return ColumnSelector;+}++export default ColumnSelectorFactory;diff --git a/src/components/side-panel/layer-panel/layer-column-config.js b/src/components/side-panel/layer-panel/layer-column-config.jsindex e02287c7a..ab975a9bb 100644--- a/src/components/side-panel/layer-panel/layer-column-config.js+++ b/src/components/side-panel/layer-panel/layer-column-config.js@@ -18,132 +18,96 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import React, {Component} from 'react';+import React, {useCallback, useMemo} from 'react';import PropTypes from 'prop-types';import styled from 'styled-components';import {FormattedMessage} from 'localization';-import {createSelector} from 'reselect';-import {PanelLabel, SidePanelSection} from 'components/common/styled-components';-import FieldSelectorFactory from 'components/common/field-selector';-import {validateColumn} from 'reducers/vis-state-merger';+import ColumnSelectorFactory from './column-selector';const TopRow = styled.div`display: flex;justify-content: space-between;`;+LayerColumnConfigFactory.deps = [ColumnSelectorFactory];-function LayerColumnConfigFactory(ColumnSelector) {- class LayerColumnConfig extends Component {- static propTypes = {- columns: PropTypes.object.isRequired,- fields: PropTypes.arrayOf(PropTypes.any).isRequired,- assignColumnPairs: PropTypes.func.isRequired,- assignColumn: PropTypes.func.isRequired,- updateLayerConfig: PropTypes.func.isRequired,- columnPairs: PropTypes.object,- fieldPairs: PropTypes.arrayOf(PropTypes.any),- columnLabels: PropTypes.object- };- columnPairs = props => props.columnPairs;- fieldPairs = props => props.fieldPairs;- fieldPairsSelector = createSelector(- this.columnPairs,- this.fieldPairs,- (columnPairs, fieldPairs) =>+function LayerColumnConfigFactory(ColumnSelector) {+ const LayerColumnConfig = ({+ columnPairs,+ fieldPairs,+ columns,+ columnLabels,+ fields,+ updateLayerConfig,+ assignColumn,+ assignColumnPairs+ }) => {+ const enhancedFieldPairs = useMemo(+ () =>columnPairs && fieldPairs? fieldPairs.map(fp => ({name: fp.defaultName,type: 'point',pair: fp.pair}))- : null+ : null,+ [columnPairs, fieldPairs]);- _updateColumn(key, value) {- const {columnPairs, assignColumnPairs, assignColumn} = this.props;+ const onUpdateColumn = useCallback(+ (key, value) => {+ const assignedColumns =+ value && value.pair && columnPairs+ ? assignColumnPairs(key, value.pair)+ : assignColumn(key, value);- const columns =- value && value.pair && columnPairs- ? assignColumnPairs(key, value.pair)- : assignColumn(key, value);-- this.props.updateLayerConfig({columns});- }+ updateLayerConfig({columns: assignedColumns});+ },+ [updateLayerConfig, columnPairs, assignColumnPairs, assignColumn]+ );- render() {- const {columns, columnLabels, fields} = this.props;+ return (+ <div>+ <SidePanelSection>+ <div className="layer-config__column">+ <TopRow>+ <PanelLabel>+ <FormattedMessage id={'columns.title'} />+ </PanelLabel>+ <PanelLabel>+ <FormattedMessage id="layer.required" />+ </PanelLabel>+ </TopRow>+ {Object.keys(columns).map(key => (+ <ColumnSelector+ column={columns[key]}+ columns={columns}+ label={(columnLabels && columnLabels[key]) || key}+ key={key}+ allFields={fields}+ fieldPairs={enhancedFieldPairs}+ onSelect={val => onUpdateColumn(key, val)}+ />+ ))}+ </div>+ </SidePanelSection>+ </div>+ );+ };- const fieldPairs = this.fieldPairsSelector(this.props);+ LayerColumnConfig.propTypes = {+ columns: PropTypes.object.isRequired,+ fields: PropTypes.arrayOf(PropTypes.any).isRequired,+ assignColumnPairs: PropTypes.func.isRequired,+ assignColumn: PropTypes.func.isRequired,+ updateLayerConfig: PropTypes.func.isRequired,+ columnPairs: PropTypes.object,+ fieldPairs: PropTypes.arrayOf(PropTypes.any),+ columnLabels: PropTypes.object+ };- return (- <div>- <SidePanelSection>- <div className="layer-config__column">- <TopRow>- <PanelLabel>- <FormattedMessage id={'columns.title'} />- </PanelLabel>- <PanelLabel>- <FormattedMessage id="layer.required" />- </PanelLabel>- </TopRow>- {Object.keys(columns).map(key => (- <ColumnSelector- column={columns[key]}- columns={columns}- label={(columnLabels && columnLabels[key]) || key}- key={key}- allFields={fields}- fieldPairs={fieldPairs}- onSelect={val => this._updateColumn(key, val)}- />- ))}- </div>- </SidePanelSection>- </div>- );- }- }return LayerColumnConfig;}-ColumnSelectorFactory.deps = [FieldSelectorFactory];-function ColumnSelectorFactory(FieldSelector) {- const ColumnSelector = ({column, columns, label, allFields, onSelect, fieldPairs}) => (- <ColumnRow className="layer-config__column__selector">- <ColumnName className="layer-config__column__name">- <PanelLabel>- <FormattedMessage id={`columns.${label}`} />- </PanelLabel>- {!column.optional ? <PanelLabel>{` *`}</PanelLabel> : null}- </ColumnName>- <ColumnSelect className="layer-config__column__select">- <FieldSelector- suggested={fieldPairs}- error={!validateColumn(column, columns, allFields)}- fields={allFields}- value={column.value}- erasable={Boolean(column.optional)}- onSelect={onSelect}- />- </ColumnSelect>- </ColumnRow>- );- return ColumnSelector;-}--const ColumnRow = styled.div`- display: flex;- margin-bottom: 8px;- align-items: center;-`;--const ColumnName = styled.div`- width: 25%;-`;-const ColumnSelect = styled.div`- width: 75%;-`;export default LayerColumnConfigFactory;diff --git a/src/components/side-panel/layer-panel/layer-config-group.js b/src/components/side-panel/layer-panel/layer-config-group.jsindex cb919482d..c7efd2026 100644--- a/src/components/side-panel/layer-panel/layer-config-group.js+++ b/src/components/side-panel/layer-panel/layer-config-group.js@@ -101,6 +101,7 @@ const ConfigGroupContent = styled.div``;LayerConfigGroupLabelFactory.deps = [InfoHelperFactory];+export function LayerConfigGroupLabelFactory(InfoHelper) {const StyledLayerConfigGroupLabel = styled.div`border-left: ${props => props.theme.layerConfigGroupLabelBorderLeft} solid@@ -135,6 +136,7 @@ export function LayerConfigGroupLabelFactory(InfoHelper) {}LayerConfigGroupFactory.deps = [LayerConfigGroupLabelFactory];+function LayerConfigGroupFactory(LayerConfigGroupLabel) {class LayerConfigGroup extends Component {static defaultProps = {diff --git a/src/components/side-panel/layer-panel/layer-configurator.js b/src/components/side-panel/layer-panel/layer-configurator.jsindex 952f444ae..35c76e3d2 100644--- a/src/components/side-panel/layer-panel/layer-configurator.js+++ b/src/components/side-panel/layer-panel/layer-configurator.js@@ -29,7 +29,7 @@ import ItemSelector from 'components/common/item-selector/item-selector';import VisConfigByFieldSelectorFactory from './vis-config-by-field-selector';import LayerColumnConfigFactory from './layer-column-config';-import LayerTypeSelector from './layer-type-selector';+import LayerTypeSelectorFactory from './layer-type-selector';import DimensionScaleSelector from './dimension-scale-selector';import ColorSelector from './color-selector';import SourceDataSelectorFactory from 'components/side-panel/common/source-data-selector';@@ -87,7 +87,8 @@ LayerConfiguratorFactory.deps = [TextLabelPanelFactory,LayerConfigGroupFactory,ChannelByValueSelectorFactory,- LayerColumnConfigFactory+ LayerColumnConfigFactory,+ LayerTypeSelectorFactory];export default function LayerConfiguratorFactory(@@ -96,7 +97,8 @@ export default function LayerConfiguratorFactory(TextLabelPanel,LayerConfigGroup,ChannelByValueSelector,- LayerColumnConfig+ LayerColumnConfig,+ LayerTypeSelector) {class LayerConfigurator extends Component {static propTypes = {diff --git a/src/components/side-panel/layer-panel/layer-type-dropdown-list.js b/src/components/side-panel/layer-panel/layer-type-dropdown-list.jsnew file mode 100644index 000000000..f51bebac2--- /dev/null+++ b/src/components/side-panel/layer-panel/layer-type-dropdown-list.js@@ -0,0 +1,105 @@+// Copyright (c) 2020 Uber Technologies, Inc.+//+// Permission is hereby granted, free of charge, to any person obtaining a copy+// of this software and associated documentation files (the "Software"), to deal+// in the Software without restriction, including without limitation the rights+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell+// copies of the Software, and to permit persons to whom the Software is+// furnished to do so, subject to the following conditions:+//+// The above copyright notice and this permission notice shall be included in+// all copies or substantial portions of the Software.+//+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN+// THE SOFTWARE.++import React, {useCallback} from 'react';+import styled from 'styled-components';+import classNames from 'classnames';+import {classList} from '../../common/item-selector/dropdown-list';++const DropdownListWrapper = styled.div`+ ${props => props.theme.dropdownList};+ background-color: ${props => props.theme.dropdownListBgd};+ border-top: 1px solid ${props => props.theme.dropdownListBorderTop};+ display: flex;+ flex-wrap: wrap;+ align-items: flex-start;+ padding: ${props => props.theme.layerTypeIconPdL}px 0 0 ${props => props.theme.layerTypeIconPdL}px;+`;++const StyledDropdownListItem = styled.div`+ padding-bottom: ${props => props.theme.layerTypeIconPdL}px;+ padding-right: ${props => props.theme.layerTypeIconPdL}px;++ &.disabled {+ pointer-events: none;+ opacity: 0.3;+ }++ &.selected {+ .layer-type-selector__item__icon {+ border: 1px solid #caf2f4;+ }+ }++ :hover,+ &.selected {+ cursor: pointer;+ .layer-type-selector__item__icon {+ color: ${props => props.theme.activeColor};+ }++ .layer-type-selector__item__label {+ color: ${props => props.theme.textColor};+ }+ }+`;++export function LayerTypeDropdownListFactory() {+ const LayerTypeDropdownList = ({+ onOptionSelected,+ options,+ selectedItems,+ selectionIndex,+ customListItemComponent+ }) => {+ const onSelectOption = useCallback(+ (e, value) => {+ e.preventDefault();+ onOptionSelected(value, e);+ },+ [onOptionSelected]+ );++ const Component = customListItemComponent;++ return (+ <DropdownListWrapper className={classList.list}>+ {options.map((value, i) => (+ <StyledDropdownListItem+ className={classNames('layer-type-selector__item', {+ selected: selectedItems.find(it => it.id === value.id),+ hover: selectionIndex === i,+ disabled: value.disabled+ })}+ key={`${value.id}_${i}`}+ onMouseDown={e => onSelectOption(e, value)}+ onClick={e => onSelectOption(e, value)}+ >+ <Component value={value} isTile />+ </StyledDropdownListItem>+ ))}+ </DropdownListWrapper>+ );+ };++ return LayerTypeDropdownList;+}++export default LayerTypeDropdownListFactory;diff --git a/src/components/side-panel/layer-panel/layer-type-list-item.js b/src/components/side-panel/layer-panel/layer-type-list-item.jsnew file mode 100644index 000000000..d9c37a5e2--- /dev/null+++ b/src/components/side-panel/layer-panel/layer-type-list-item.js@@ -0,0 +1,83 @@+// Copyright (c) 2020 Uber Technologies, Inc.+//+// Permission is hereby granted, free of charge, to any person obtaining a copy+// of this software and associated documentation files (the "Software"), to deal+// in the Software without restriction, including without limitation the rights+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell+// copies of the Software, and to permit persons to whom the Software is+// furnished to do so, subject to the following conditions:+//+// The above copyright notice and this permission notice shall be included in+// all copies or substantial portions of the Software.+//+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN+// THE SOFTWARE.++import React from 'react';+import styled from 'styled-components';+import {CLOUDFRONT} from 'constants/default-settings';+import classNames from 'classnames';+import {FormattedMessage} from 'localization';++const ITEM_SIZE = {+ large: 50,+ small: 28+};++const StyledListItem = styled.div`+ &.list {+ display: flex;+ align-items: center;++ .layer-type-selector__item__icon {+ color: ${props => props.theme.activeColor};+ background-size: ${props => props.theme.layerTypeIconSizeSM}px+ ${props => props.theme.layerTypeIconSizeSM}px;+ margin-right: 12px;+ }+ }++ .layer-type-selector__item__icon {+ color: ${props => props.theme.labelColor};+ display: flex;+ background-image: url(${`${CLOUDFRONT}/kepler.gl-layer-icon-bg.png`});+ background-size: ${props => props.theme.layerTypeIconSizeL}px+ ${props => props.theme.layerTypeIconSizeL}px;+ }++ .layer-type-selector__item__label {+ text-transform: capitalize;+ font-size: 12px;+ text-align: center;+ color: ${props => props.theme.selectColor};+ }+`;++export function LayerTypeListItemFactory() {+ const LayerTypeListItem = ({value, isTile}) => (+ <StyledListItem+ className={classNames('layer-type-selector__item__inner', {+ list: !isTile+ })}+ >+ <div className="layer-type-selector__item__icon">+ <value.icon height={`${isTile ? ITEM_SIZE.large : ITEM_SIZE.small}px`} />+ </div>+ <div className="layer-type-selector__item__label">+ <FormattedMessage+ id={`layer.type.${value.label.toLowerCase()}`}+ defaultMessage={value.label}+ />+ </div>+ </StyledListItem>+ );++ return LayerTypeListItem;+}++export default LayerTypeListItemFactory;diff --git a/src/components/side-panel/layer-panel/layer-type-selector.js b/src/components/side-panel/layer-panel/layer-type-selector.jsindex 712b46aab..db7a526ad 100644--- a/src/components/side-panel/layer-panel/layer-type-selector.js+++ b/src/components/side-panel/layer-panel/layer-type-selector.js@@ -20,130 +20,13 @@import React, {useMemo} from 'react';import PropTypes from 'prop-types';-import classNames from 'classnames';import styled, {withTheme} from 'styled-components';-import {classList} from 'components/common/item-selector/dropdown-list';+import LayerTypeDropdownListFactory from './layer-type-dropdown-list';+import LayerTypeListItemFactory from './layer-type-list-item';import ItemSelector from 'components/common/item-selector/item-selector';-import {CLOUDFRONT} from 'constants/default-settings';import {SidePanelSection} from 'components/common/styled-components';-import {FormattedMessage} from 'localization';--const ITEM_SIZE = {- large: 50,- small: 28-};--const StyledDropdownListItem = styled.div`- padding-bottom: ${props => props.theme.layerTypeIconPdL}px;- padding-right: ${props => props.theme.layerTypeIconPdL}px;-- &.disabled {- pointer-events: none;- opacity: 0.3;- }-- &.selected {- .layer-type-selector__item__icon {- border: 1px solid #caf2f4;- }- }-- :hover,- &.selected {- cursor: pointer;- .layer-type-selector__item__icon {- color: ${props => props.theme.activeColor};- }-- .layer-type-selector__item__label {- color: ${props => props.theme.textColor};- }- }-`;--const StyledListItem = styled.div`- &.list {- display: flex;- align-items: center;-- .layer-type-selector__item__icon {- color: ${props => props.theme.activeColor};- background-size: ${props => props.theme.layerTypeIconSizeSM}px- ${props => props.theme.layerTypeIconSizeSM}px;- margin-right: 12px;- }- }-- .layer-type-selector__item__icon {- color: ${props => props.theme.labelColor};- display: flex;- background-image: url(${`${CLOUDFRONT}/kepler.gl-layer-icon-bg.png`});- background-size: ${props => props.theme.layerTypeIconSizeL}px- ${props => props.theme.layerTypeIconSizeL}px;- }-- .layer-type-selector__item__label {- text-transform: capitalize;- font-size: 12px;- text-align: center;- color: ${props => props.theme.selectColor};- }-`;--const DropdownListWrapper = styled.div`- ${props => props.theme.dropdownList};- background-color: ${props => props.theme.dropdownListBgd};- border-top: 1px solid ${props => props.theme.dropdownListBorderTop};- display: flex;- flex-wrap: wrap;- align-items: flex-start;- padding: ${props => props.theme.layerTypeIconPdL}px 0 0 ${props => props.theme.layerTypeIconPdL}px;-`;--const LayerTypeListItem = ({value, isTile}) => (- <StyledListItem- className={classNames('layer-type-selector__item__inner', {- list: !isTile- })}- >- <div className="layer-type-selector__item__icon">- <value.icon height={`${isTile ? ITEM_SIZE.large : ITEM_SIZE.small}px`} />- </div>- <div className="layer-type-selector__item__label">- <FormattedMessage- id={`layer.type.${value.label.toLowerCase()}`}- defaultMessage={value.label}- />- </div>- </StyledListItem>-);--const LayerTypeDropdownList = props => (- <DropdownListWrapper className={classList.list}>- {props.options.map((value, i) => (- <StyledDropdownListItem- className={classNames('layer-type-selector__item', {- selected: props.selectedItems.find(it => it.id === value.id),- hover: props.selectionIndex === i,- disabled: value.disabled- })}- key={`${value.id}_${i}`}- onMouseDown={e => {- e.preventDefault();- props.onOptionSelected(value, e);- }}- onClick={e => {- e.preventDefault();- props.onOptionSelected(value, e);- }}- >- <props.customListItemComponent value={value} isTile />- </StyledDropdownListItem>- ))}- </DropdownListWrapper>-);const propTypes = {layer: PropTypes.object.isRequired,@@ -155,36 +38,52 @@ const StyledLayerTypeSelector = styled.div`padding: 4px 10px 4px 2px;}`;-const LayerTypeSelector = ({layer, layerTypeOptions, onSelect, datasets}) => {- const hasData = Boolean(Object.keys(datasets).length);- const typeOptions = useMemo(- () =>- layerTypeOptions.map(op => ({- ...op,- disabled: !hasData && op.requireData !== false- })),- [hasData, layerTypeOptions]- );- return (- <SidePanelSection>- <StyledLayerTypeSelector className="layer-config__type">- <ItemSelector- selectedItems={typeOptions.find(op => op.id === layer.type)}- options={typeOptions}- multiSelect={false}- placeholder="placeholder.selectType"- onChange={onSelect}- getOptionValue={op => op.id}- filterOption="label"- displayOption={op => op.label}- DropDownLineItemRenderComponent={LayerTypeListItem}- DropDownRenderComponent={LayerTypeDropdownList}- />- </StyledLayerTypeSelector>- </SidePanelSection>- );-};--LayerTypeSelector.propTypes = propTypes;-export default withTheme(LayerTypeSelector);+LayerTypeSelectorFactory.deps = [LayerTypeListItemFactory, LayerTypeDropdownListFactory];++const getDisplayOption = op => op.label;+const getOptionValue = op => op.id;++function LayerTypeSelectorFactory(LayerTypeListItem, LayerTypeDropdownList) {+ const LayerTypeSelector = ({layer, layerTypeOptions, onSelect, datasets}) => {+ const hasData = useMemo(() => Boolean(Object.keys(datasets).length), [datasets]);+ const typeOptions = useMemo(+ () =>+ layerTypeOptions.map(op => ({+ ...op,+ disabled: !hasData && op.requireData !== false+ })),+ [hasData, layerTypeOptions]+ );++ const selectedItems = useMemo(() => typeOptions.find(op => op.id === layer.type), [+ typeOptions,+ layer.type+ ]);++ return (+ <SidePanelSection>+ <StyledLayerTypeSelector className="layer-config__type">+ <ItemSelector+ selectedItems={selectedItems}+ options={typeOptions}+ multiSelect={false}+ placeholder="placeholder.selectType"+ onChange={onSelect}+ getOptionValue={getOptionValue}+ filterOption="label"+ displayOption={getDisplayOption}+ DropDownLineItemRenderComponent={LayerTypeListItem}+ DropDownRenderComponent={LayerTypeDropdownList}+ />+ </StyledLayerTypeSelector>+ </SidePanelSection>+ );+ };++ LayerTypeSelector.propTypes = propTypes;++ return withTheme(LayerTypeSelector);+}++export default LayerTypeSelectorFactory;diff --git a/src/constants/index.js b/src/constants/index.jsindex ecdceef93..09eff24b5 100644--- a/src/constants/index.js+++ b/src/constants/index.js@@ -62,7 +62,8 @@ export {FPS,ANIMATION_TYPE,DEFAULT_TIME_FORMAT,- SPEED_CONTROL_RANGE+ SPEED_CONTROL_RANGE,+ RESOLUTIONS} from './default-settings';export {BUG_REPORT_LINK, USER_GUIDE_DOC} from './user-guides';diff --git a/src/utils/export-utils.js b/src/utils/export-utils.jsindex 5b5e78f85..40410c7ed 100644--- a/src/utils/export-utils.js+++ b/src/utils/export-utils.js@@ -57,16 +57,14 @@ export function isMSEdge(window) {return Boolean(window.navigator && window.navigator.msSaveOrOpenBlob);}-export function getScaleFromImageSize(imageW, imageH, mapW, mapH) {+export function getScaleFromImageSize(imageW = 0, imageH = 0, mapW = 0, mapH = 0) {if ([imageW, imageH, mapW, mapH].some(d => d <= 0)) {return 1;}const base = imageW / imageH > 1 ? imageW : imageH;const mapBase = imageW / imageH > 1 ? mapW : mapH;- const scale = base / mapBase;-- return scale;+ return base / mapBase;}export function calculateExportImageSize({mapW, mapH, ratio, resolution}) {diff --git a/test/node/utils/export-utils-test.js b/test/node/utils/export-utils-test.jsindex 1840eefc3..d1aa37801 100644--- a/test/node/utils/export-utils-test.js+++ b/test/node/utils/export-utils-test.js@@ -22,12 +22,20 @@ import test from 'tape';import {registerEntry} from 'actions/identity-actions';import keplerGlReducer from 'reducers';-import {getMapJSON, exportToJsonString, getScaleFromImageSize, isMSEdge} from 'utils/export-utils';+import {+ getMapJSON,+ exportToJsonString,+ getScaleFromImageSize,+ isMSEdge,+ calculateExportImageSize+ // dataURItoBlob+} from 'utils/export-utils';+import {EXPORT_IMG_RATIOS, RESOLUTIONS} from '../../../src/constants';test('exportUtils -> ExportJson', t => {const state = keplerGlReducer(undefined, registerEntry({id: 'test'})).test;const body = exportToJsonString(getMapJSON(state));-+ getScaleFromImageSize;t.equal(typeof body, 'string', 'Should validate the type of body to be a string');t.doesNotThrow(() => {@@ -43,6 +51,87 @@ test('exportUtils -> getScaleFromImageSize', t => {0.5714285714285714,'Should compute the right scale');++ t.equal(+ getScaleFromImageSize(800, 600, 1400),+ 1,+ 'Should return 1 because we are not passing mapH'+ );++ t.equal(getScaleFromImageSize(800, 600, 1400, -1), 1, 'Should return 1 because mapH is negative');++ t.equal(getScaleFromImageSize(800, 600, 1400, 0), 1, 'Should return 1 because mapH is 0');++ t.end();+});++test('exportUtils -> calculateExportImageSize', t => {+ t.deepEqual(+ calculateExportImageSize({+ mapW: 1400,+ mapH: 990,+ ratio: EXPORT_IMG_RATIOS.SCREEN,+ resolution: RESOLUTIONS.ONE_X+ }),+ {scale: 1, imageW: 1400, imageH: 990},+ 'Should calculate the correct export image size'+ );++ t.equal(+ calculateExportImageSize({+ mapW: -1,+ mapH: 990,+ ratio: EXPORT_IMG_RATIOS.SCREEN,+ resolution: RESOLUTIONS.ONE_X+ }),+ null,+ 'Should return null because mapW is negative'+ );++ t.equal(+ calculateExportImageSize({+ mapW: 1440,+ mapH: -1,+ ratio: EXPORT_IMG_RATIOS.SCREEN,+ resolution: RESOLUTIONS.ONE_X+ }),+ null,+ 'Should return null because mapH is negative'+ );++ t.deepEqual(+ calculateExportImageSize({+ mapW: 1440,+ mapH: 990,+ ratio: EXPORT_IMG_RATIOS.CUSTOM,+ resolution: RESOLUTIONS.ONE_X+ }),+ {scale: undefined, imageW: 1440, imageH: 990},+ 'Should return scale null because of custom ratio'+ );++ t.deepEqual(+ calculateExportImageSize({+ mapW: 1440,+ mapH: 990,+ ratio: 'not-valid',+ resolution: RESOLUTIONS.ONE_X+ }),+ {scale: 1, imageW: 1440, imageH: 1080},+ 'Should return a correct valid with a non valid ratio param'+ );++ t.deepEqual(+ calculateExportImageSize({+ mapW: 1440,+ mapH: 990,+ ratio: EXPORT_IMG_RATIOS.SCREEN,+ resolution: 'not-valid'+ }),+ {scale: 1, imageW: 1440, imageH: 990},+ 'Should return a correct valid with a non valid resolution param'+ );+t.end();});@@ -60,3 +149,8 @@ test('exportUtils -> isMSEdge', t => {);t.end();});++test('exportUtils -> exportToJsonString', t => {+ t.equal(exportToJsonString({test: 1}), '{"test":1}', 'Should convert object to string');+ t.end();+});diff --git a/yarn.lock b/yarn.lockindex f61d96595..58dbd6b5b 100644--- a/yarn.lock+++ b/yarn.lock@@ -5299,13 +5299,6 @@ encodeurl@~1.0.2:resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=-encoding@^0.1.11:- version "0.1.12"- resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"- integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=- dependencies:- iconv-lite "~0.4.13"-end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:version "1.4.4"resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"@@ -7274,7 +7267,7 @@ human-signals@^1.1.1:resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==[email protected], [email protected], iconv-lite@^0.4.24, iconv-lite@~0.4.13:[email protected], [email protected], iconv-lite@^0.4.24:version "0.4.24"resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==@@ -7851,7 +7844,7 @@ is-ssh@^1.3.0:dependencies:protocols "^1.1.0"-is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:+is-stream@^1.0.0, is-stream@^1.1.0:version "1.1.0"resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=@@ -8723,33 +8716,7 @@ killable@^1.0.1:resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==-kind-of@^2.0.1:- version "2.0.1"- resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5"- integrity sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=- dependencies:- is-buffer "^1.0.2"--kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:- version "3.2.2"- resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"- integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=- dependencies:- is-buffer "^1.1.5"--kind-of@^4.0.0:- version "4.0.0"- resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"- integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=- dependencies:- is-buffer "^1.1.5"--kind-of@^5.0.0:- version "5.1.0"- resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"- integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==--kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:[email protected], kind-of@^2.0.1, kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^4.0.0, kind-of@^5.0.0, kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:version "6.0.3"resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==@@ -9858,13 +9825,10 @@ node-environment-flags@^1.0.5:object.getownpropertydescriptors "^2.0.3"semver "^5.7.0"-node-fetch@^1.0.1:- version "1.7.3"- resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"- integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==- dependencies:- encoding "^0.1.11"- is-stream "^1.0.1"[email protected], node-fetch@^1.0.1:+ version "2.6.1"+ resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"+ integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==version "0.9.0"@@ -11172,11 +11136,6 @@ pseudomap@^1.0.2:resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=-psl@^1.1.24, psl@^1.1.28:- version "1.7.0"- resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"- integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==-public-encrypt@^4.0.0:version "4.0.3"resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"@@ -11219,7 +11178,7 @@ [email protected]:resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=-punycode@^1.2.4, punycode@^1.3.2, punycode@^1.4.1:+punycode@^1.2.4, punycode@^1.3.2:version "1.4.1"resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=@@ -13997,30 +13956,10 @@ [email protected]:resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==-tough-cookie@^2.3.3, tough-cookie@~2.5.0:- version "2.5.0"- resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"- integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==- dependencies:- psl "^1.1.28"- punycode "^2.1.1"--tough-cookie@^3.0.1:- version "3.0.1"- resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"- integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==- dependencies:- ip-regex "^2.1.0"- psl "^1.1.28"- punycode "^2.1.1"--tough-cookie@~2.4.3:- version "2.4.3"- resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"- integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==- dependencies:- psl "^1.1.24"- punycode "^1.4.1"[email protected], tough-cookie@^2.3.3, tough-cookie@^3.0.1, tough-cookie@~2.4.3, tough-cookie@~2.5.0:+ version "2.3.0"+ resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.0.tgz#38f67cc4fc1b3acd9f8643b92aa3cf138e4acbfc"+ integrity sha1-OPZ8xPwbOs2fhkO5KqPPE45Ky/w=tr46@^1.0.1:version "1.0.1"