Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[fix] Improved validation of field pairs suggestions for LayerColumnConfig (#2359)
Igor Dykhta7f9f211b9b92
diff --git a/src/components/src/common/field-selector.tsx b/src/components/src/common/field-selector.tsxindex 9460b5fdb..7f01a55f3 100644--- a/src/components/src/common/field-selector.tsx+++ b/src/components/src/common/field-selector.tsx@@ -72,6 +72,7 @@ export function FieldListItemFactoryFactory(FieldToken) {const SuggestedFieldHeader = () => <div>Suggested Field</div>;+export type MinimalField = {name: string; displayName: string; format: string; type?: string};type FieldType =| string| string[]diff --git a/src/components/src/side-panel/layer-panel/layer-column-config.tsx b/src/components/src/side-panel/layer-panel/layer-column-config.tsxindex 3c9328046..35bc30aec 100644--- a/src/components/src/side-panel/layer-panel/layer-column-config.tsx+++ b/src/components/src/side-panel/layer-panel/layer-column-config.tsx@@ -20,21 +20,31 @@import React, {useCallback, useMemo} from 'react';import styled from 'styled-components';++import {ColumnPairs, LayerColumns, LayerBaseConfig} from '@kepler.gl/layers';import {FormattedMessage} from '@kepler.gl/localization';-import {PanelLabel, SidePanelSection} from '../../common/styled-components';+import {FieldPair, Field} from '@kepler.gl/types';+import {toArray} from '@kepler.gl/utils';+import ColumnSelectorFactory from './column-selector';-import {ColumnPairs, Layer, LayerColumns, LayerBaseConfig} from '@kepler.gl/layers';-import {Field, FieldPair} from '@kepler.gl/types';+import {MinimalField} from '../../common/field-selector';+import {PanelLabel, SidePanelSection} from '../../common/styled-components';-type LayerColumnConfigProps = {+export type LayerColumnConfigProps<FieldOption extends MinimalField> = {+ columns: LayerColumns;+ fields: FieldOption[];+ assignColumnPairs: (key: string, pair: string) => LayerColumns;+ assignColumn: (key: string, field: FieldOption) => LayerColumns;+ updateLayerConfig: (newConfig: Partial<LayerBaseConfig>) => void;columnPairs?: ColumnPairs | null;fieldPairs?: FieldPair[];- columns: LayerColumns;columnLabels?: Record<string, string>;- fields: Field[];- updateLayerConfig: (newConfig: Partial<LayerBaseConfig>) => void;- assignColumn: Layer['assignColumn'];- assignColumnPairs: Layer['assignColumnPairs'];+};++export type EnhancedFieldPair = {+ name: string;+ type: 'point';+ pair: FieldPair['pair'];};const TopRow = styled.div`@@ -46,21 +56,28 @@ const TopRow = styled.div`* only provide suggested field pairs if there is a match,* otherwise the user can select a suggested field pair that will create invalid columns and a hard crash*/-function getFieldPairsSuggestionsForColumn(- enhancedFieldPairs,+function getValidFieldPairsSuggestionsForColumn(+ enhancedFieldPairs: EnhancedFieldPair[] | null,columnPairs: ColumnPairs | null | undefined,columnKey: string-) {- const matchingFieldPairs = enhancedFieldPairs?.filter(({pair}) =>- pair.hasOwnProperty(columnPairs?.[columnKey]?.fieldPairKey)- );- return matchingFieldPairs.length > 0 ? matchingFieldPairs : null;+): EnhancedFieldPair[] | null {+ if (enhancedFieldPairs && columnPairs?.[columnKey]) {+ const columnPair = columnPairs[columnKey];+ const matchingFieldPairs = enhancedFieldPairs.filter(({pair}) => {+ return toArray(columnPair.fieldPairKey).some(fieldPairKey =>+ pair.hasOwnProperty(fieldPairKey)+ );+ });+ return matchingFieldPairs.length > 0 ? matchingFieldPairs : null;+ } else {+ return null;+ }}LayerColumnConfigFactory.deps = [ColumnSelectorFactory];function LayerColumnConfigFactory(ColumnSelector: ReturnType<typeof ColumnSelectorFactory>) {- const LayerColumnConfig: React.FC<LayerColumnConfigProps> = ({+ const LayerColumnConfig: React.FC<LayerColumnConfigProps<Field>> = ({columnPairs,fieldPairs,columns,@@ -70,7 +87,7 @@ function LayerColumnConfigFactory(ColumnSelector: ReturnType<typeof ColumnSelectassignColumn,assignColumnPairs}) => {- const enhancedFieldPairs = useMemo(+ const enhancedFieldPairs: EnhancedFieldPair[] | null = useMemo(() =>columnPairs && fieldPairs? fieldPairs.map(fp => ({@@ -118,7 +135,11 @@ function LayerColumnConfigFactory(ColumnSelector: ReturnType<typeof ColumnSelectlabel={(columnLabels && columnLabels[key]) || key}key={key}allFields={fields}- fieldPairs={getFieldPairsSuggestionsForColumn(enhancedFieldPairs, columnPairs, key)}+ fieldPairs={getValidFieldPairsSuggestionsForColumn(+ enhancedFieldPairs,+ columnPairs,+ key+ )}onSelect={val => onUpdateColumn(key, val)}/>))}