Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Bug] fix pin table column overide dataset (#1625)
Shan He6fb00fa09213
diff --git a/package.json b/package.jsonindex 884ae23b5..b230ca146 100644--- a/package.json+++ b/package.json@@ -283,6 +283,7 @@"Giuseppe Macri <[email protected]>"],"volta": {- "node": "12.19.0"+ "node": "12.19.0",+ "yarn": "1.22.17"}}diff --git a/src/processors/data-processor.js b/src/processors/data-processor.jsindex e5bf3a9e9..ad21de4e0 100644--- a/src/processors/data-processor.js+++ b/src/processors/data-processor.js@@ -439,9 +439,10 @@ export function processRowObject(rawData) {return null;} else if (!rawData.length) {// data is empty- return {- fields: [], rows: []- }+ return {+ fields: [],+ rows: []+ };}const keys = Object.keys(rawData[0]);diff --git a/src/reducers/vis-state-updaters.js b/src/reducers/vis-state-updaters.jsindex 6f3efca80..d29c3f65d 100644--- a/src/reducers/vis-state-updaters.js+++ b/src/reducers/vis-state-updaters.js@@ -56,7 +56,11 @@ import {} from 'utils/filter-utils';import {assignGpuChannel, setFilterGpuMode} from 'utils/gpu-filter-utils';import {createNewDataEntry} from 'utils/dataset-utils';-import {sortDatasetByColumn, copyTableAndUpdate} from 'utils/table-utils/kepler-table';+import {+ pinTableColumns,+ sortDatasetByColumn,+ copyTableAndUpdate+} from 'utils/table-utils/kepler-table';import {set, toArray, arrayInsert, generateHashId} from 'utils/utils';import {calculateLayerData, findDefaultLayer} from 'utils/layer-utils';@@ -2066,20 +2070,9 @@ export function pinTableColumnUpdater(state, {dataId, column}) {if (!dataset) {return state;}- const field = dataset.fields.find(f => f.name === column);- if (!field) {- return state;- }-- let pinnedColumns;- if (Array.isArray(dataset.pinnedColumns) && dataset.pinnedColumns.includes(field.name)) {- // unpin it- pinnedColumns = dataset.pinnedColumns.filter(co => co !== field.name);- } else {- pinnedColumns = (dataset.pinnedColumns || []).concat(field.name);- }+ const newDataset = pinTableColumns(dataset, column);- return set(['datasets', dataId, 'pinnedColumns'], pinnedColumns, state);+ return set(['datasets', dataId], newDataset, state);}/**diff --git a/src/utils/table-utils/kepler-table.d.ts b/src/utils/table-utils/kepler-table.d.tsindex 74d496aff..f88286780 100644--- a/src/utils/table-utils/kepler-table.d.ts+++ b/src/utils/table-utils/kepler-table.d.ts@@ -69,7 +69,7 @@ export class KeplerTable {supportedFilterTypes?: ProtoDataset['supportedFilterTypes'];});type?: string;- label?: string;+ label: string;color: RGBColor;// fields and data@@ -95,22 +95,33 @@ export class KeplerTable {sortOrder?: number[] | null;pinnedColumns?: string[];- supportedFilterTypes?: string[];+ supportedFilterTypes: string[] | undefined;// table-injected metadata- metadata?: object;+ metadata: object;// methodsgetColumnField(columnName: string): Field | undefined;getColumnFieldIdx(columnName: string): number;- getColumnDomain(columnName: string): any[];-+ getColumnFilterDomain(field: Field): FieldDomain;+ getColumnLayerDomain(field: Field, scaleType: string): number[] | string[] | [number, number];getValue(columnName: string, rowIdx: number): any;updateColumnField(fieldIdx: number, newField: Field): void;updateTableColor(newColor: RGBColor): void;getColumnFilterProps(fieldName: string): Field['filterProps'] | null | undefined;filterTable(filters: Filter[], layers: Layer[], opt?: FilterDatasetOpt): KeplerTable;filterTableCPU(filters: Filter[], layers: Layer[]): KeplerTable;++ // private methods+ _assetField(fieldName: string, condition: any): void;}+export function copyTable<T extends {}>(original: T): T;+export function copyTableAndUpdate<T extends {}>(original: T, options: Partial<T>): T;+export function getFieldValueAccessor<+ F extends {+ type: Field['type'];+ format: Field['format'];+ }+>(f: F, i: number): FieldValueAccessor;+export function pinTableColumns(dataset: KeplerTable, column: string): KeplerTable;export default KeplerTable;-export function copyTableAndUpdate(original: KeplerTable, options: {})\ No newline at end of filediff --git a/src/utils/table-utils/kepler-table.js b/src/utils/table-utils/kepler-table.jsindex beea54190..ffb3286f9 100644--- a/src/utils/table-utils/kepler-table.js+++ b/src/utils/table-utils/kepler-table.js@@ -469,14 +469,36 @@ export function sortDatasetByColumn(dataset, column, mode) {return dataset;}+/**+ * @type {typeof import('./kepler-table').pinTableColumns}+ */+export function pinTableColumns(dataset, column) {+ const field = dataset.getColumnField(column);+ if (!field) {+ return dataset;+ }++ let pinnedColumns;+ if (Array.isArray(dataset.pinnedColumns) && dataset.pinnedColumns.includes(field.name)) {+ // unpin it+ pinnedColumns = dataset.pinnedColumns.filter(co => co !== field.name);+ } else {+ pinnedColumns = (dataset.pinnedColumns || []).concat(field.name);+ }++ // @ts-ignore+ return copyTableAndUpdate(dataset, {pinnedColumns});+}+/**+ *+ * @type {typeof import('./kepler-table').copyTable}+ */export function copyTable(original) {return Object.assign(Object.create(Object.getPrototypeOf(original)), original);}/*** @type {typeof import('./kepler-table').copyTableAndUpdate}- * @param {KeplerTable} original- * @param {*} options* @returns*/export function copyTableAndUpdate(original, options = {}) {diff --git a/test/node/reducers/vis-state-test.js b/test/node/reducers/vis-state-test.jsindex 6a7905347..52d70bb23 100644--- a/test/node/reducers/vis-state-test.js+++ b/test/node/reducers/vis-state-test.js@@ -4714,6 +4714,8 @@ test('#visStateReducer -> SORT_TABLE_COLUMN', t => {{'gps_data.lat': 'DESCENDING'},'should correctly sort');+ assertDatasetIsTable(t, nextState5.datasets[testCsvDataId]);+t.end();});@@ -4752,6 +4754,7 @@ test('#visStateReducer -> PIN_TABLE_COLUMN', t => {const addedKeys = newKeys.filter(k => !Object.keys(previousDataset1).includes(k));t.deepEqual(addedKeys, ['pinnedColumns'], 'should add pinnedColumns to dataset');+ assertDatasetIsTable(t, nextState1.datasets[testCsvDataId]);t.deepEqual(nextState1.datasets[testCsvDataId].pinnedColumns,@@ -4764,6 +4767,7 @@ test('#visStateReducer -> PIN_TABLE_COLUMN', t => {nextState1,VisStateActions.pinTableColumn(testCsvDataId, 'gps_data.lat'));+ assertDatasetIsTable(t, nextState2.datasets[testCsvDataId]);t.deepEqual(nextState2.datasets[testCsvDataId].pinnedColumns,