Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Chore] Decouple table from dataset Id (#1337)
Shan Hef802f3934579
diff --git a/src/components/common/data-table/cell-size.js b/src/components/common/data-table/cell-size.jsindex 07a7ce6c4..40d0ed588 100644--- a/src/components/common/data-table/cell-size.js+++ b/src/components/common/data-table/cell-size.js@@ -34,7 +34,7 @@ export function renderedSize({numRowsToCalculate = 10,fontSize = 12,font = 'Lato',- cellPadding = 30,+ cellPadding = 40,maxCellSize = 400,maxHeaderSize = 150,minCellSize = 45,diff --git a/src/components/common/data-table/index.js b/src/components/common/data-table/index.jsindex a6f9b6034..d90884725 100644--- a/src/components/common/data-table/index.js+++ b/src/components/common/data-table/index.js@@ -112,14 +112,6 @@ export const Container = styled.div`overflow: hidden !important;}- .body-grid {- overflow: overlay !important;- }-- .pinned-grid {- overflow: overlay !important;- }-.even-row {background-color: ${props => props.theme.evenRowBackground};}@@ -197,10 +189,12 @@ export const Container = styled.div`height: 100%;overflow: hidden;flex-grow: 1;+.col-name {display: flex;align-items: center;justify-content: space-between;+ cursor: pointer;.col-name__left {display: flex;@@ -214,9 +208,6 @@ export const Container = styled.div`overflow: hidden;white-space: nowrap;}- .col-name__sort {- cursor: pointer;- }}}@@ -241,9 +232,9 @@ const columnWidthFunction = (columns, cellSizeCache, ghost) => ({index}) => {/** This is an accessor method used to generalize getting a cell from a data row*/-const getRowCell = ({rows, columns, column, colMeta, rowIndex, sortColumn, sortOrder}) => {+const getRowCell = ({rows, columns, column, colMeta, rowIndex, sortOrder}) => {const rowIdx = sortOrder && sortOrder.length ? get(sortOrder, rowIndex) : rowIndex;- const type = colMeta[column];+ const {type} = colMeta[column];return parseFieldValue(get(rows, [rowIdx, columns.indexOf(column)], 'Err'), type);};@@ -304,6 +295,7 @@ export const TableSection = ({}}</AutoSizer>);+DataTableFactory.deps = [FieldTokenFactory];function DataTableFactory(FieldToken) {class DataTable extends Component {@@ -367,6 +359,7 @@ function DataTableFactory(FieldToken) {pinnedColumns,unpinnedColumns);+return {cellSizeCache,ghost@@ -394,16 +387,15 @@ function DataTableFactory(FieldToken) {colMeta,sortColumn,sortTableColumn,- unsortColumn,pinTableColumn,- copyTableColumn,- dataId+ copyTableColumn} = props;const column = columns[columnIndex];const isGhost = column.ghost;const isSorted = sortColumn[column];const firstCell = columnIndex === 0;+return (<divclassName={classnames('header-cell', {@@ -414,9 +406,9 @@ function DataTableFactory(FieldToken) {key={key}style={style}onClick={e => {- e.shiftKey ? sortTableColumn(dataId, column) : null;+ e.shiftKey ? sortTableColumn(column) : null;}}- onDoubleClick={() => sortTableColumn(dataId, column)}+ onDoubleClick={() => sortTableColumn(column)}title={column}>{isGhost ? (@@ -426,11 +418,8 @@ function DataTableFactory(FieldToken) {<section className="details"><div className="col-name"><div className="col-name__left">- <div className="col-name__name">{column}</div>- <Button- className="col-name__sort"- onClick={() => sortTableColumn(dataId, column)}- >+ <div className="col-name__name">{colMeta[column].name}</div>+ <Button className="col-name__sort" onClick={() => sortTableColumn(column)}>{isSorted ? (isSorted === SORT_ORDER.ASCENDING ? (<ArrowUp height="14px" />@@ -445,22 +434,21 @@ function DataTableFactory(FieldToken) {</Button></div>- <FieldToken type={colMeta[column]} />+ <FieldToken type={colMeta[column].type} /></section><section className="options"><OptionDropdownisOpened={moreOptionsColumn === column}- type={colMeta[column]}+ type={colMeta[column].type}column={column}toggleMoreOptions={toggleMoreOptions}- sortTableColumn={mode => sortTableColumn(dataId, column, mode)}+ sortTableColumn={mode => sortTableColumn(column, mode)}sortMode={sortColumn && sortColumn[column]}- pinTableColumn={() => pinTableColumn(dataId, column)}- copyTableColumn={() => copyTableColumn(dataId, column)}+ pinTableColumn={() => pinTableColumn(column)}+ copyTableColumn={() => copyTableColumn(column)}isSorted={isSorted}isPinned={isPinned}- unsortColumn={unsortColumn}/></section></>@@ -478,7 +466,7 @@ function DataTableFactory(FieldToken) {const isGhost = column.ghost;const rowCell = isGhost ? '' : getRowCell({...props, column, rowIndex});- const type = isGhost ? null : colMeta[column];+ const type = isGhost ? null : colMeta[column].type;const endCell = columnIndex === columns.length - 1;const firstCell = columnIndex === 0;@@ -507,6 +495,7 @@ function DataTableFactory(FieldToken) {return cell;};};+render() {const {rows, pinnedColumns, theme = {}, fixedWidth, fixedHeight} = this.props;const unpinnedColumns = this.unpinnedColumns(this.props);diff --git a/src/components/index.js b/src/components/index.jsindex 3d51d5ad4..29e2f35b5 100644--- a/src/components/index.js+++ b/src/components/index.js@@ -145,7 +145,7 @@ export {default as FieldSelectorFactory} from './common/field-selector';export {default as Modal, ModalFooter, ModalTitle} from './common/modal';export {default as AppLogo} from './common/logo';export {default as Switch} from './common/switch';-export {default as Checkbox} from 'components/common/checkbox';+export {default as Checkbox} from './common/checkbox';export {default as LoadingSpinner} from './common/loading-spinner';export {default as LoadingDialog} from './modals/loading-dialog';export {default as FieldTokenFactory} from './common/field-token';@@ -154,7 +154,9 @@ export {default as ProgressBar} from './common/progress-bar';export {default as FileUploadProgress} from './common/file-uploader/file-upload-progress';export {default as Slider} from './common/slider/slider';export {DatasetSquare} from './common/styled-components';-export {default as ActionPanel, ActionPanelItem} from 'components/common/action-panel';+export {default as ActionPanel, ActionPanelItem} from './common/action-panel';+export {default as DataTableFactory} from './common/data-table';+export {default as CanvasHack} from './common/data-table/canvas';// side pane componentsexport {default as LayerTypeSelectorFactory} from './side-panel/layer-panel/layer-type-selector';@@ -176,7 +178,7 @@ export {} from './side-panel/layer-panel/layer-configurator';// map components-export {default as MapLegend} from 'components/map/map-legend'+export {default as MapLegend} from 'components/map/map-legend';export * from './common/styled-components';diff --git a/src/components/modals/data-table-modal.js b/src/components/modals/data-table-modal.jsindex c91266f5b..0b35841eb 100644--- a/src/components/modals/data-table-modal.js+++ b/src/components/modals/data-table-modal.js@@ -96,18 +96,22 @@ function DataTableModalFactory(DataTable) {columns = createSelector(this.fields, fields => fields.map(f => f.name));colMeta = createSelector(this.fields, fields =>fields.reduce(- (acc, {name, type}) => ({+ (acc, {name, displayName, type}) => ({...acc,- [name]: type+ [name]: {+ name: displayName || name,+ type+ }}),{}));+cellSizeCache = createSelector(this.dataId, this.datasets, (dataId, datasets) => {- if (!this.props.datasets[dataId]) {+ if (!datasets[dataId]) {return {};}- const {fields, allData} = this.props.datasets[dataId];+ const {fields, allData} = datasets[dataId];let showCalculate = null;if (!this.datasetCellSizeCache[dataId]) {@@ -148,6 +152,21 @@ function DataTableModalFactory(DataTable) {return cellSizeCache;});+ copyTableColumn = column => {+ const {dataId, copyTableColumn} = this.props;+ copyTableColumn(dataId, column);+ };++ pinTableColumn = column => {+ const {dataId, pinTableColumn} = this.props;+ pinTableColumn(dataId, column);+ };++ sortTableColumn = (column, mode) => {+ const {dataId, sortTableColumn} = this.props;+ sortTableColumn(dataId, column, mode);+ };+render() {const {datasets, dataId, showDatasetTable, showTab} = this.props;if (!datasets || !dataId) {@@ -172,7 +191,6 @@ function DataTableModalFactory(DataTable) {{datasets[dataId] ? (<DataTablekey={dataId}- dataId={dataId}columns={columns}colMeta={colMeta}cellSizeCache={cellSizeCache}@@ -180,9 +198,9 @@ function DataTableModalFactory(DataTable) {pinnedColumns={activeDataset.pinnedColumns}sortOrder={activeDataset.sortOrder}sortColumn={activeDataset.sortColumn}- copyTableColumn={this.props.copyTableColumn}- pinTableColumn={this.props.pinTableColumn}- sortTableColumn={this.props.sortTableColumn}+ copyTableColumn={this.copyTableColumn}+ pinTableColumn={this.pinTableColumn}+ sortTableColumn={this.sortTableColumn}/>) : null}</TableContainer>diff --git a/src/constants/index.js b/src/constants/index.jsindex ee565040b..8548be001 100644--- a/src/constants/index.js+++ b/src/constants/index.js@@ -62,7 +62,8 @@ export {ANIMATION_WINDOW,DEFAULT_TIME_FORMAT,SPEED_CONTROL_RANGE,- RESOLUTIONS+ RESOLUTIONS,+ SORT_ORDER} from './default-settings';export {BUG_REPORT_LINK, USER_GUIDE_DOC} from './user-guides';diff --git a/src/utils/dataset-utils.js b/src/utils/dataset-utils.jsindex 8a6d762ac..777174c05 100644--- a/src/utils/dataset-utils.js+++ b/src/utils/dataset-utils.js@@ -213,3 +213,4 @@ export function sortDatasetByColumn(dataset, column, mode) {sortOrder};}+diff --git a/test/browser/components/modals/data-table-modal-test.js b/test/browser/components/modals/data-table-modal-test.jsindex 0e05327f0..1024e0f3f 100644--- a/test/browser/components/modals/data-table-modal-test.js+++ b/test/browser/components/modals/data-table-modal-test.js@@ -159,17 +159,17 @@ test('Components -> DataTableModal.render: csv 1', t => {];const expectedColMeta = {- 'gps_data.utc_timestamp': 'timestamp',- 'gps_data.lat': 'real',- 'gps_data.lng': 'real',- 'gps_data.types': 'string',- epoch: 'timestamp',- has_result: 'boolean',- id: 'integer',- time: 'timestamp',- begintrip_ts_utc: 'timestamp',- begintrip_ts_local: 'timestamp',- date: 'date'+ 'gps_data.utc_timestamp': {name: 'gps_data.utc_timestamp', type: 'timestamp'},+ 'gps_data.lat': {name: 'gps_data.lat', type: 'real'},+ 'gps_data.lng': {name: 'gps_data.lng', type: 'real'},+ 'gps_data.types': {name: 'gps_data.types', type: 'string'},+ epoch: {name: 'epoch', type: 'timestamp'},+ has_result: {name: 'has_result', type: 'boolean'},+ id: {name: 'id', type: 'integer'},+ time: {name: 'time', type: 'timestamp'},+ begintrip_ts_utc: {name: 'begintrip_ts_utc', type: 'timestamp'},+ begintrip_ts_local: {name: 'begintrip_ts_local', type: 'timestamp'},+ date: {name: 'date', type: 'date'}};t.deepEqual(props.columns, expectedColumns, 'DataTable should have the correct props.columns');@@ -390,7 +390,7 @@ test('Components -> DataTableModal -> render DataTable: sort and pin', t => {const wrapper2 = mountWithTheme(<DataTable {...enriched} />);const componentInstance = wrapper2.find('DataTable').instance();const result = componentInstance.getCellSizeCache();- // manully setting the state and update the component+ // manually setting the state and update the componentcomponentInstance.setState(result);wrapper2.update();@@ -407,11 +407,13 @@ test('Components -> DataTableModal -> render DataTable: sort and pin', t => {'begintrip_ts_local','date'];+t.equal(wrapper2.find('.header-cell').length,testFields.length,`should render ${testFields.length} headers`);+t.ok(wrapper2.find('.header-cell')@@ -419,6 +421,7 @@ test('Components -> DataTableModal -> render DataTable: sort and pin', t => {.hasClass('pinned-header-cell'),'should assign pinned-header-cell class');+t.ok(wrapper2.find('.header-cell')@@ -426,6 +429,7 @@ test('Components -> DataTableModal -> render DataTable: sort and pin', t => {.hasClass('first-cell'),'should assign first-cell class');+new Array(testFields.length).fill(0).forEach((d, i) => {t.equal(wrapper2@@ -450,6 +454,54 @@ test('Components -> DataTableModal -> render DataTable: sort and pin', t => {t.end();});+test('Components -> DatableModal -> sort/pin and copy should be called with the right params', t => {+ const initialState = CloneDeep(StateWFiles.visState);+ const copyTableColumn = sinon.spy();+ const pinTableColumn = sinon.spy();+ const sortTableColumn = sinon.spy();+ const column = 'gps_data.lat';++ const wrapper = mountWithTheme(+ <DataTableModal+ datasets={initialState.datasets}+ dataId={testCsvDataId}+ copyTableColumn={copyTableColumn}+ pinTableColumn={pinTableColumn}+ sortTableColumn={sortTableColumn}+ />+ );++ const {+ sortTableColumn: testSortColumn,+ pinTableColumn: testPinColumn,+ copyTableColumn: testCopyColumn+ } = wrapper.find('DataTable').props();++ testSortColumn(column);+ testPinColumn(column);+ testCopyColumn(column);++ t.equal(+ sortTableColumn.calledWith(testCsvDataId, column),+ true,+ 'should call sortTableColumn with dataId and column gps_data.lat'+ );++ t.equal(+ pinTableColumn.calledWith(testCsvDataId, column),+ true,+ 'should call pinTableColumn with dataId and column gps_data.lat'+ );++ t.equal(+ copyTableColumn.calledWith(testCsvDataId, column),+ true,+ 'should call copyTableColumn with dataId and column gps_data.lat'+ );++ t.end();+});+test('Components -> cellSize -> renderedSize', t => {prepareMockCanvas();@@ -477,9 +529,9 @@ test('Components -> cellSize -> renderedSize', t => {.props();const expected = {- _geojson: {row: 400, header: 91},- 'income level of people over 65': {row: 75, header: 150},- engagement: {row: 117, header: 110}+ _geojson: {row: 400, header: 96},+ 'income level of people over 65': {row: 85, header: 150},+ engagement: {row: 127, header: 115}};t.deepEqual(