Skip to content

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

[Bug] Select dataset filter bug (#965)

Giuseppe Macrì42ac712bc04b
diff --git a/examples/demo-app/src/store.js b/examples/demo-app/src/store.js
index fecafbb48..75dfa888f 100644
--- a/examples/demo-app/src/store.js
+++ b/examples/demo-app/src/store.js
@@ -54,7 +54,7 @@ if (window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) {
'@@kepler.gl/LAYER_HOVER'
]
})
-};
+}
*/
export default createStore(reducers, initialState, composeEnhancers(...enhancers));
diff --git a/src/components/filters/filter-panels/filter-panel-with-field-select.js b/src/components/filters/filter-panels/filter-panel-with-field-select.js
index 33aa6ce20..4e16c6622 100644
--- a/src/components/filters/filter-panels/filter-panel-with-field-select.js
+++ b/src/components/filters/filter-panels/filter-panel-with-field-select.js
@@ -44,7 +44,7 @@ function FieldPanelWithFieldSelectFactory(FilterPanelHeader, SourceDataSelector)
setFilter
]);
- const onSourceDataSelector = useCallback(value => setFilter(idx, 'dataId', value), [
+ const onSourceDataSelector = useCallback(value => setFilter(idx, 'dataId', [value]), [
idx,
setFilter
]);
diff --git a/src/components/side-panel.js b/src/components/side-panel.js
index 65c418cc6..2b233307a 100644
--- a/src/components/side-panel.js
+++ b/src/components/side-panel.js
@@ -88,8 +88,7 @@ export default function SidePanelFactory(
CustomPanels
) {
const customPanels = get(CustomPanels, ['defaultProps', 'panels']) || [];
- const getCustomPanelProps =
- get(CustomPanels, ['defaultProps', 'getProps']) || (() => ({}));
+ const getCustomPanelProps = get(CustomPanels, ['defaultProps', 'getProps']) || (() => ({}));
class SidePanel extends PureComponent {
static propTypes = {
@@ -142,20 +141,15 @@ export default function SidePanelFactory(
this.props.uiStateActions.openDeleteModal(key);
};
- _onClickExportImage = () =>
- this.props.uiStateActions.toggleModal(EXPORT_IMAGE_ID);
+ _onClickExportImage = () => this.props.uiStateActions.toggleModal(EXPORT_IMAGE_ID);
- _onClickExportData = () =>
- this.props.uiStateActions.toggleModal(EXPORT_DATA_ID);
+ _onClickExportData = () => this.props.uiStateActions.toggleModal(EXPORT_DATA_ID);
- _onClickExportMap = () =>
- this.props.uiStateActions.toggleModal(EXPORT_MAP_ID);
+ _onClickExportMap = () => this.props.uiStateActions.toggleModal(EXPORT_MAP_ID);
- _onClickSaveToStorage = () =>
- this.props.uiStateActions.toggleModal(SAVE_MAP_ID);
+ _onClickSaveToStorage = () => this.props.uiStateActions.toggleModal(SAVE_MAP_ID);
- _onClickShareMap = () =>
- this.props.uiStateActions.toggleModal(SHARE_MAP_ID);
+ _onClickShareMap = () => this.props.uiStateActions.toggleModal(SHARE_MAP_ID);
render() {
const {
@@ -240,14 +234,8 @@ export default function SidePanelFactory(
onExportData={this._onClickExportData}
onExportMap={this._onClickExportMap}
onSaveMap={this.props.onSaveMap}
- onSaveToStorage={
- availableProviders.hasStorage
- ? this._onClickSaveToStorage
- : null
- }
- onShareMap={
- availableProviders.hasShare ? this._onClickShareMap : null
- }
+ onSaveToStorage={availableProviders.hasStorage ? this._onClickSaveToStorage : null}
+ onShareMap={availableProviders.hasShare ? this._onClickShareMap : null}
/>
<PanelToggle
panels={panels}
@@ -300,7 +288,7 @@ export default function SidePanelFactory(
</div>
);
}
- };
+ }
return SidePanel;
}
diff --git a/src/components/side-panel/filter-panel/filter-panel.js b/src/components/side-panel/filter-panel/filter-panel.js
index 4f26f600c..97bfb659f 100644
--- a/src/components/side-panel/filter-panel/filter-panel.js
+++ b/src/components/side-panel/filter-panel/filter-panel.js
@@ -22,6 +22,7 @@ import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {createSelector} from 'reselect';
import styled from 'styled-components';
+import get from 'lodash.get';
import {ALL_FIELD_TYPES, FILTER_TYPES} from 'constants/default-settings';
import FilterPanelHeaderFactory from 'components/side-panel/filter-panel/filter-panel-header';
@@ -85,8 +86,14 @@ function FilterPanelFactory(
};
/* selectors */
- fieldsSelector = props =>
- (props.filter.dataId[0] && props.datasets[props.filter.dataId[0]].fields) || [];
+ fieldsSelector = props => {
+ const datasetId = props.filter.dataId[0];
+ if (!datasetId) {
+ return [];
+ }
+ return get(props, ['datasets', datasetId, 'fields'], []);
+ };
+
filterSelector = props => props.filters;
nameSelector = props => props.filter.name;
dataIdSelector = props => props.filter.dataId[0];
diff --git a/src/components/side-panel/panel-header.js b/src/components/side-panel/panel-header.js
index 09a2c8306..36d41fa02 100644
--- a/src/components/side-panel/panel-header.js
+++ b/src/components/side-panel/panel-header.js
@@ -98,11 +98,7 @@ const StyledToolbar = styled(Toolbar)`
`;
export const PanelAction = ({item, onClick}) => (
- <StyledPanelAction
- data-tip
- data-for={`${item.id}-action`}
- onClick={onClick}
- >
+ <StyledPanelAction data-tip data-for={`${item.id}-action`} onClick={onClick}>
{item.label ? <p>{item.label}</p> : null}
<a target={item.blank ? '_blank' : ''} href={item.href}>
<item.iconComponent height="20px" />
diff --git a/src/layers/aggregation-layer.js b/src/layers/aggregation-layer.js
index e1f2c62f9..b1a7270c2 100644
--- a/src/layers/aggregation-layer.js
+++ b/src/layers/aggregation-layer.js
@@ -33,10 +33,7 @@ export const pointPosResolver = ({lat, lng}) => `${lat.fieldIdx}-${lng.fieldIdx}
export const getValueAggrFunc = (field, aggregation) => {
return points => {
return field
- ? aggregate(
- points.map(p => p.data[field.tableFieldIndex - 1]),
- aggregation
- )
+ ? aggregate(points.map(p => p.data[field.tableFieldIndex - 1]), aggregation)
: points.length;
};
};
diff --git a/test/node/reducers/vis-state-test.js b/test/node/reducers/vis-state-test.js
index c5b99bbd7..0b67b91d6 100644
--- a/test/node/reducers/vis-state-test.js
+++ b/test/node/reducers/vis-state-test.js
@@ -26,27 +26,16 @@ import * as VisStateActions from 'actions/vis-state-actions';
import * as MapStateActions from 'actions/map-state-actions';
import reducer from 'reducers/vis-state';
-import {
- INITIAL_VIS_STATE,
- defaultAnimationConfig
-} from 'reducers/vis-state-updaters';
+import {INITIAL_VIS_STATE, defaultAnimationConfig} from 'reducers/vis-state-updaters';
import {getDefaultInteraction} from 'utils/interaction-utils';
-import {
- getDefaultFilter
-} from 'utils/filter-utils';
+import {getDefaultFilter} from 'utils/filter-utils';
import {createNewDataEntry} from 'utils/dataset-utils';
import {processCsvData, processGeojson} from 'processors/data-processor';
import {Layer, KeplerGlLayers} from 'layers';
import {EDITOR_MODES} from 'constants/default-settings';
-const {
- ArcLayer,
- PointLayer,
- GeojsonLayer,
- LineLayer,
- TripLayer
-} = KeplerGlLayers;
+const {ArcLayer, PointLayer, GeojsonLayer, LineLayer, TripLayer} = KeplerGlLayers;
// fixtures
import testData, {mergedTimeFilter, testFields, testAllData} from 'test/fixtures/test-csv-data';
@@ -78,11 +67,7 @@ import {
testCsvDataId,
testGeoJsonDataId
} from 'test/helpers/mock-state';
-import {
- LAYER_VIS_CONFIGS,
- DEFAULT_TEXT_LABEL,
- DEFAULT_COLOR_UI
-} from 'layers/layer-factory';
+import {LAYER_VIS_CONFIGS, DEFAULT_TEXT_LABEL, DEFAULT_COLOR_UI} from 'layers/layer-factory';
import {getNextColorMakerValue} from 'test/helpers/layer-utils';
import {StateWFilesFiltersLayerColor} from 'test/helpers/mock-state';
@@ -201,24 +186,13 @@ test('#visStateReducer', t => {
test('#visStateReducer -> ADD_FILTER', t => {
const dataId = 'kitten';
const newFilter = getDefaultFilter(dataId);
- const newReducer = reducer(
- {filters: [mockFilter]},
- VisStateActions.addFilter(dataId)
- );
+ const newReducer = reducer({filters: [mockFilter]}, VisStateActions.addFilter(dataId));
const expectedReducer = {filters: [mockFilter, newFilter]};
- t.equal(
- newReducer.filters.length,
- expectedReducer.filters.length,
- 'should add a default filter'
- );
+ t.equal(newReducer.filters.length, expectedReducer.filters.length, 'should add a default filter');
- t.deepEqual(
- newReducer.filters[0],
- expectedReducer.filters[0],
- 'should add a default filter'
- );
+ t.deepEqual(newReducer.filters[0], expectedReducer.filters[0], 'should add a default filter');
cmpFilters(t, newReducer.filters[1], expectedReducer.filters[1]);
t.end();
@@ -264,32 +238,20 @@ test('#visStateReducer -> ADD_LAYER.1', t => {
];
t.equal(newReducer.layers.length, 2, 'should have 2 layers');
- t.equal(
- newReducer.layers[1].config.isVisible,
- true,
- 'newLayer visibility should be set to true'
- );
+ t.equal(newReducer.layers[1].config.isVisible, true, 'newLayer visibility should be set to true');
t.equal(
newReducer.layers[1].config.isConfigActive,
true,
'newLayer isConfigActive should be set to true'
);
- t.equal(
- newReducer.layers[1].config.dataId,
- 'puppy',
- 'newLayer dataId should be set to default'
- );
+ t.equal(newReducer.layers[1].config.dataId, 'puppy', 'newLayer dataId should be set to default');
t.deepEqual(
newReducer.layerData,
[oldState.layerData[0], {}],
'newState should have empty layer datat'
);
t.deepEqual(newReducer.layerOrder, [0, 1], 'should add to layerOrder');
- t.deepEqual(
- newReducer.splitMaps,
- expectedSplitMaps,
- 'should add to SplitMaps'
- );
+ t.deepEqual(newReducer.splitMaps, expectedSplitMaps, 'should add to SplitMaps');
t.end();
});
@@ -305,15 +267,8 @@ test('#visStateReducer -> LAYER_TYPE_CHANGE.0', t => {
t.equal(oldState, nextState, 'should return state when no argument is given');
- const nextState2 = reducer(
- oldState,
- VisStateActions.layerTypeChange(layer, 'no_type')
- );
- t.equal(
- oldState,
- nextState2,
- 'should return state when pass a none existing type'
- );
+ const nextState2 = reducer(oldState, VisStateActions.layerTypeChange(layer, 'no_type'));
+ t.equal(oldState, nextState2, 'should return state when pass a none existing type');
t.end();
});
@@ -347,10 +302,7 @@ test('#visStateReducer -> LAYER_TYPE_CHANGE.1', t => {
]
};
- const nextState = reducer(
- oldState,
- VisStateActions.layerTypeChange(layer, 'point')
- );
+ const nextState = reducer(oldState, VisStateActions.layerTypeChange(layer, 'point'));
const newId = nextState.layers[1].id;
const expectedSplitMaps = [
{
@@ -405,11 +357,7 @@ test('#visStateReducer -> LAYER_TYPE_CHANGE.2', t => {
const stringField = testFields.find(f => f.type === 'string');
let nextState = reducer(
oldState,
- VisStateActions.layerVisualChannelConfigChange(
- pointLayer,
- {colorField: stringField},
- 'color'
- )
+ VisStateActions.layerVisualChannelConfigChange(pointLayer, {colorField: stringField}, 'color')
);
nextState = reducer(
nextState,
@@ -1850,10 +1798,7 @@ test('#visStateReducer -> setFilter.dynamicDomain & cpu', t => {
];
// receive data
- const initialState = reducer(
- INITIAL_VIS_STATE,
- VisStateActions.updateVisData(payload)
- );
+ const initialState = reducer(INITIAL_VIS_STATE, VisStateActions.updateVisData(payload));
const expectedLayer1 = new PointLayer({
isVisible: true,
@@ -2042,9 +1987,12 @@ test('#visStateReducer -> setFilter.dynamicDomain & cpu', t => {
{data: allData[21], index: 21, position: [31.2187021, 30.0614122, 0]},
{data: allData[22], index: 22, position: [31.2191059, 30.0612697, 0]}
],
- getPosition: () => {},
- getColor: () => {},
- getRadius: () => {}
+ getPosition: () => {
+ },
+ getColor: () => {
+ },
+ getRadius: () => {
+ }
};
t.deepEqual(
@@ -2058,7 +2006,7 @@ test('#visStateReducer -> setFilter.dynamicDomain & cpu', t => {
test('#visStateReducer -> SET_FILTER.name', t => {
const oldState = StateWFilters.visState;
- const oldFilter0 = oldState.filters[0]
+ const oldFilter0 = oldState.filters[0];
// change filter name from RATE to ZIP_CODE
const updated = reducer(
oldState,
@@ -2096,6 +2044,37 @@ test('#visStateReducer -> SET_FILTER.name', t => {
t.end();
});
+test('#visStateReducer -> SET_FILTER.dataId', t => {
+ const oldState = StateWFilters.visState;
+ let newState = reducer(oldState, VisStateActions.setFilter(1, 'dataId', testCsvDataId));
+
+ let newFilter = newState.filters[1];
+ let expectedFilter = {
+ ...getDefaultFilter(testCsvDataId),
+ id: newFilter.id
+ };
+
+ t.deepEqual(newFilter, expectedFilter, 'Should create a new filter using the provided dataId');
+
+ // Using an array of dataId
+ newState = reducer(newState, VisStateActions.setFilter(1, 'dataId', [testCsvDataId]));
+
+ newFilter = newState.filters[1];
+
+ expectedFilter = {
+ ...getDefaultFilter(testCsvDataId),
+ id: newFilter.id
+ };
+
+ t.deepEqual(
+ newFilter,
+ expectedFilter,
+ 'Should create a new filter using the provided list of dataId'
+ );
+
+ t.end();
+});
+
test('#visStateReducer -> setFilter.dynamicDomain & gpu', t => {
const {fields, rows} = processGeojson(CloneDeep(geojsonData));
const payload = [
@@ -2176,10 +2155,10 @@ test('#visStateReducer -> setFilter.dynamicDomain & gpu', t => {
fields: geojsonFields.map(f =>
f.name === 'TRIPS'
? {
- ...f,
- id: f.name,
- filterProps: geoJsonTripFilterProps
- }
+ ...f,
+ id: f.name,
+ filterProps: geoJsonTripFilterProps
+ }
: {...f, id: f.name}
),
gpuFilter: {
@@ -2350,22 +2329,22 @@ test('#visStateReducer -> setFilter.fixedDomain & DynamicDomain & gpu & cpu', t
fields: datasetSmoothie.fields.map(f =>
f.name === 'gps_data.utc_timestamp'
? {
- ...f,
- filterProps: {
- domain: [1474070995000, 1474072208000],
- step: 1000,
- mappedValue: expectedFilterTs.mappedValue,
- histogram: stateWidthTsFilter.filters[0].histogram,
- enlargedHistogram:
- stateWidthTsFilter.filters[0].enlargedHistogram,
- fieldType: 'timestamp',
- type: 'timeRange',
- enlarged: true,
- fixedDomain: true,
- value: [1474070995000, 1474072208000],
- gpu: true
- }
+ ...f,
+ filterProps: {
+ domain: [1474070995000, 1474072208000],
+ step: 1000,
+ mappedValue: expectedFilterTs.mappedValue,
+ histogram: stateWidthTsFilter.filters[0].histogram,
+ enlargedHistogram:
+ stateWidthTsFilter.filters[0].enlargedHistogram,
+ fieldType: 'timestamp',
+ type: 'timeRange',
+ enlarged: true,
+ fixedDomain: true,
+ value: [1474070995000, 1474072208000],
+ gpu: true
}
+ }
: f
),
filterRecord: {
@@ -2419,15 +2398,15 @@ test('#visStateReducer -> setFilter.fixedDomain & DynamicDomain & gpu & cpu', t
fields: stateWidthTsFilter.datasets.smoothie.fields.map(f =>
f.name === 'date'
? {
- ...f,
- filterProps: {
- domain: ['2016-09-23', '2016-09-24', '2016-10-10'],
- fieldType: 'date',
- type: 'multiSelect',
- value: [],
- gpu: false
- }
+ ...f,
+ filterProps: {
+ domain: ['2016-09-23', '2016-09-24', '2016-10-10'],
+ fieldType: 'date',
+ type: 'multiSelect',
+ value: [],
+ gpu: false
}
+ }
: f
),
gpuFilter: {
@@ -2455,11 +2434,7 @@ test('#visStateReducer -> setFilter.fixedDomain & DynamicDomain & gpu & cpu', t
filteredIndexForDomain: [7, 8, 9, 10, 11, 12, 17, 18, 19, 20, 21, 22]
};
- cmpDataset(
- t,
- expectedFilteredDataset,
- stateWidthTsAndNameFilter.datasets.smoothie
- );
+ cmpDataset(t, expectedFilteredDataset, stateWidthTsAndNameFilter.datasets.smoothie);
t.end();
});
@@ -4259,7 +4234,7 @@ test('#uiStateReducer -> TOGGLE_EDITOR_VISIBILITY', t => {
newState.editor.visible,
true,
'Should set editor visibility to true'
- );
+ );
t.end();
});