Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Bug] Don't merge domain when update filter name (#841)
Shan He76e35a92482a
diff --git a/src/reducers/vis-state-merger.js b/src/reducers/vis-state-merger.jsindex a46076640..a625649be 100644--- a/src/reducers/vis-state-merger.js+++ b/src/reducers/vis-state-merger.js@@ -31,7 +31,7 @@ import {import {getInitialMapLayersForSplitMap} from 'utils/split-map-utils';import {LAYER_BLENDINGS} from 'constants/default-settings';-import {mergeFilterProps} from '../utils/filter-utils';+import {mergeFilterDomainStep} from '../utils/filter-utils';/*** Merge loaded filters with current state, if no fields or data are loaded@@ -70,7 +70,7 @@ export function mergeFilters(state, filtersToMerge) {// merge filter propsfilter: acc.filter ? {...acc.filter,- ...mergeFilterProps(acc, updatedFilter)+ ...mergeFilterDomainStep(acc, updatedFilter)} : updatedFilter,applyToDatasets: [diff --git a/src/reducers/vis-state-updaters.js b/src/reducers/vis-state-updaters.jsindex 66579e100..f3b34837d 100644--- a/src/reducers/vis-state-updaters.js+++ b/src/reducers/vis-state-updaters.js@@ -545,8 +545,14 @@ export function setFilterUpdater(state, action) {// we are supporting the current functionality// TODO: Next PR for UI filter name will only update filter name but it won't have side effects// we are gonna use pair of datasets and fieldIdx to update the filter- const datasetId = newFilter.dataId[valueIndex]- const {filter: updatedFilter, dataset: newDataset} = applyFilterFieldName(newFilter, state.datasets[datasetId], value, valueIndex);+ const datasetId = newFilter.dataId[valueIndex];+ const {filter: updatedFilter, dataset: newDataset} = applyFilterFieldName(+ newFilter,+ state.datasets[datasetId],+ value,+ valueIndex,+ {mergeDomain: false}+ );if (!updatedFilter) {return state;}@@ -584,13 +590,18 @@ export function setFilterUpdater(state, action) {// if we are currently setting a prop that only requires to filter the current// dataset we will pass only the current dataset to applyFiltersToDatasets and// updateAllLayerDomainData otherwise we pass the all list of datasets as defined in dataId- const datasetIdsToFilter = LIMITED_FILTER_EFFECT_PROPS[prop] ?- [datasetIds[valueIndex]] : datasetIds;+ const datasetIdsToFilter = LIMITED_FILTER_EFFECT_PROPS[prop]+ ? [datasetIds[valueIndex]]+ : datasetIds;// filter datanewState = {...newState,- datasets: applyFiltersToDatasets(datasetIdsToFilter, newState.datasets, newState.filters)+ datasets: applyFiltersToDatasets(+ datasetIdsToFilter,+ newState.datasets,+ newState.filters+ )};// dataId is an array@@ -647,9 +658,9 @@ export const addFilterUpdater = (state, action) =>!action.dataId? state: {- ...state,- filters: [...state.filters, getDefaultFilter(action.dataId)]- };+ ...state,+ filters: [...state.filters, getDefaultFilter(action.dataId)]+ };/*** Set layer color palette ui state@@ -659,11 +670,14 @@ export const addFilterUpdater = (state, action) =>* @param {Object} action.prop* @param {Object} action.newConfig*/-export const layerColorUIChangeUpdater = (state, {oldLayer, prop, newConfig}) => {+export const layerColorUIChangeUpdater = (+ state,+ {oldLayer, prop, newConfig}+) => {const newLayer = oldLayer.updateLayerColorUI(prop, newConfig);return {...state,- layers: state.layers.map(l => l.id === oldLayer.id ? newLayer : l)+ layers: state.layers.map(l => (l.id === oldLayer.id ? newLayer : l))};};@@ -906,7 +920,9 @@ export const removeDatasetUpdater = (state, action) => {);// remove filters- const filters = state.filters.filter(filter => !filter.dataId.includes(datasetKey));+ const filters = state.filters.filter(+ filter => !filter.dataId.includes(datasetKey)+ );// update interactionConfiglet {interactionConfig} = state;@@ -1084,11 +1100,11 @@ export const mouseMoveUpdater = (state, {evt}) => {export const toggleSplitMapUpdater = (state, action) =>state.splitMaps && state.splitMaps.length === 0? {- ...state,- // maybe we should use an array to store state for a single map as well- // if current maps length is equal to 0 it means that we are about to split the view- splitMaps: computeSplitMapLayers(state.layers)- }+ ...state,+ // maybe we should use an array to store state for a single map as well+ // if current maps length is equal to 0 it means that we are about to split the view+ splitMaps: computeSplitMapLayers(state.layers)+ }: closeSpecificMapAtIndex(state, action);/**@@ -1391,9 +1407,9 @@ export function updateAllLayerDomainData(state, dataId, newFilter) {newFilter && newFilter.fixedDomain? oldLayer: oldLayer.updateLayerDomain(- state.datasets[oldLayer.config.dataId],- newFilter- );+ state.datasets[oldLayer.config.dataId],+ newFilter+ );const {layerData, layer} = calculateLayerData(newLayer,diff --git a/src/utils/filter-utils.js b/src/utils/filter-utils.jsindex c8944176b..e8e4cd851 100644--- a/src/utils/filter-utils.js+++ b/src/utils/filter-utils.js@@ -177,7 +177,7 @@ export function validateFilterWithData(dataset, filter) {const fieldName = initializeFilter.name[filterDatasetIndex];const {filter: updatedFilter, dataset: updatedDataset} =- applyFilterFieldName(initializeFilter, dataset, fieldName, filterDatasetIndex);+ applyFilterFieldName(initializeFilter, dataset, fieldName, filterDatasetIndex, {mergeDomain: true});if (!updatedFilter) {return failed;@@ -701,7 +701,7 @@ export function applyFiltersToDatasets(datasetIds, datasets, filters) {* @param fieldName* @return {object} {filter, datasets}*/-export function applyFilterFieldName(filter, dataset, fieldName, filterDatasetIndex = 0) {+export function applyFilterFieldName(filter, dataset, fieldName, filterDatasetIndex = 0, {mergeDomain = false} = {}) {// using filterDatasetIndex we can filter only the specified datasetconst {fields, allData} = dataset;@@ -724,7 +724,7 @@ export function applyFilterFieldName(filter, dataset, fieldName, filterDatasetInconst filterProps = field.hasOwnProperty('filterProps') ? field.filterProps : getFilterProps(allData, field);const filterWithProps = {- ...mergeFilterProps(newFilter, filterProps),+ ...(mergeDomain ? mergeFilterDomainStep(newFilter, filterProps) : {...newFilter, ...filterProps}),name: Object.assign([].concat(filter.name), {[filterDatasetIndex]: field.name}),fieldIdx: Object.assign([].concat(filter.fieldIdx), {[filterDatasetIndex]: field.tableFieldIndex - 1})};@@ -754,9 +754,9 @@ export function applyFilterFieldName(filter, dataset, fieldName, filterDatasetIn* @return {*}*//* eslint-disable complexity */-export function mergeFilterProps(filter, filterProps) {+export function mergeFilterDomainStep(filter, filterProps) {if (!filter) {- return filterProps;+ return null;}if (!filterProps) {@@ -764,8 +764,7 @@ export function mergeFilterProps(filter, filterProps) {}if (- !filterProps- || (filter.fieldType && filter.fieldType !== filterProps.fieldType)+ (filter.fieldType && filter.fieldType !== filterProps.fieldType)|| !filterProps.domain) {return filter;diff --git a/test/node/reducers/vis-state-test.js b/test/node/reducers/vis-state-test.jsindex 1658ae3b8..c876c84ad 100644--- a/test/node/reducers/vis-state-test.js+++ b/test/node/reducers/vis-state-test.js@@ -2026,6 +2026,44 @@ test('#visStateReducer -> SET_FILTER (processCsvData)', t => {t.end();});+test('#visStateReducer -> SET_FILTER.name', t => {+ const oldState = StateWFilters.visState;+ const oldFilter0 = oldState.filters[0]+ // change filter name from RATE to ZIP_CODE+ const updated = reducer(+ oldState,+ VisStateActions.setFilter(1, 'name', 'ZIP_CODE', 0)+ );++ const expectedFilter0 = oldFilter0;+ const expectedFilter1 = {+ dataId: ['ieukmgne'],+ freeze: true,+ id: 'RATE-1',+ fixedDomain: false,+ enlarged: false,+ isAnimating: false,+ speed: 1,+ name: ['ZIP_CODE'],+ type: 'range',+ fieldIdx: [2],+ domain: [94105, 94111],+ value: [94105, 94111],+ plotType: 'histogram',+ yAxis: null,+ interval: null,+ fieldType: 'integer',+ step: 0.01,+ histogram: [],+ enlargedHistogram: 'dont test me',+ typeOptions: ['range']+ };++ cmpFilters(t, [expectedFilter0, expectedFilter1], updated.filters);++ t.end();+});+test('#visStateReducer -> SET_FILTER (processGeojson)', t => {const {fields, rows} = processGeojson(CloneDeep(geojsonData));const payload = [