[sqllab] table refactor #2587
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,190 @@ | ||
| import { List } from 'immutable'; | ||
| import React, { PropTypes, PureComponent } from 'react'; | ||
| import { | ||
| Column, | ||
| Table, | ||
| SortDirection, | ||
| SortIndicator, | ||
| } from 'react-virtualized'; | ||
| import { getTextWidth } from '../../modules/visUtils'; | ||
|
|
||
| const propTypes = { | ||
| orderedColumnKeys: PropTypes.array.isRequired, | ||
| data: PropTypes.array.isRequired, | ||
| height: PropTypes.number.isRequired, | ||
| filterText: PropTypes.string, | ||
| headerHeight: PropTypes.number, | ||
| overscanRowCount: PropTypes.number, | ||
| rowHeight: PropTypes.number, | ||
| striped: PropTypes.bool, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
| filterText: '', | ||
| headerHeight: 32, | ||
| overscanRowCount: 10, | ||
| rowHeight: 32, | ||
| striped: true, | ||
| }; | ||
|
|
||
| export default class FilterableTable extends PureComponent { | ||
| constructor(props) { | ||
| super(props); | ||
| this.list = List(this.formatTableData(props.data)); | ||
| this.headerRenderer = this.headerRenderer.bind(this); | ||
| this.rowClassName = this.rowClassName.bind(this); | ||
| this.sort = this.sort.bind(this); | ||
|
|
||
| this.widthsForColumnsByKey = this.getWidthsForColumns(); | ||
| this.totalTableWidth = props.orderedColumnKeys | ||
| .map(key => this.widthsForColumnsByKey[key]) | ||
| .reduce((curr, next) => curr + next); | ||
|
|
||
| this.state = { | ||
| sortBy: props.orderedColumnKeys[0], | ||
| sortDirection: SortDirection.ASC, | ||
| fitted: false, | ||
| }; | ||
| } | ||
|
|
||
| hasMatch(text, row) { | ||
| const values = []; | ||
| for (const key in row) { | ||
| if (row.hasOwnProperty(key)) { | ||
| values.push(row[key].toLowerCase()); | ||
| } | ||
| } | ||
| return values.some(v => v.includes(text.toLowerCase())); | ||
| } | ||
|
|
||
| formatTableData(data) { | ||
| const formattedData = data.map((row) => { | ||
| const newRow = {}; | ||
| for (const k in row) { | ||
| const val = row[k]; | ||
| if (typeof(val) === 'string') { | ||
| newRow[k] = val; | ||
| } else { | ||
| newRow[k] = JSON.stringify(val); | ||
| } | ||
| } | ||
| return newRow; | ||
| }); | ||
| return formattedData; | ||
| } | ||
|
|
||
| getWidthsForColumns() { | ||
|
There was a problem hiding this comment. I'm concerned about the potential cost of this method. |
||
| const PADDING = 40; // accounts for cell padding and width of sorting icon | ||
| const widthsByColumnKey = {}; | ||
| this.props.orderedColumnKeys.forEach((key) => { | ||
| const colWidths = this.list.toArray().map(d => getTextWidth(d[key]) + PADDING); | ||
|
There was a problem hiding this comment. here There was a problem hiding this comment. actually I think you could reduce right off this line already with |
||
| // push width of column key to array as well | ||
| colWidths.push(getTextWidth(key) + PADDING); | ||
| // set max width as value for key | ||
| widthsByColumnKey[key] = Math.max(...colWidths); | ||
| }); | ||
| return widthsByColumnKey; | ||
| } | ||
|
|
||
| fitTableToWidthIfNeeded() { | ||
| const containerWidth = this.container.getBoundingClientRect().width; | ||
| if (containerWidth > this.totalTableWidth) { | ||
| this.totalTableWidth = containerWidth - 2; // accomodates 1px border on container | ||
| } | ||
| this.setState({ fitted: true }); | ||
| } | ||
|
|
||
| componentDidMount() { | ||
| this.fitTableToWidthIfNeeded(); | ||
| } | ||
|
|
||
| render() { | ||
| const { sortBy, sortDirection } = this.state; | ||
| const { | ||
| filterText, | ||
| headerHeight, | ||
| height, | ||
| orderedColumnKeys, | ||
| overscanRowCount, | ||
| rowHeight, | ||
| } = this.props; | ||
|
|
||
| let sortedAndFilteredList = this.list; | ||
| // filter list | ||
| if (filterText) { | ||
| sortedAndFilteredList = this.list.filter(row => this.hasMatch(filterText, row)); | ||
| } | ||
| // sort list | ||
| sortedAndFilteredList = sortedAndFilteredList | ||
| .sortBy(item => item[sortBy]) | ||
| .update(list => sortDirection === SortDirection.DESC ? list.reverse() : list); | ||
|
|
||
| const rowGetter = ({ index }) => this.getDatum(sortedAndFilteredList, index); | ||
|
|
||
| return ( | ||
| <div | ||
| style={{ height }} | ||
| className="filterable-table-container" | ||
| ref={(ref) => { this.container = ref; }} | ||
| > | ||
| {this.state.fitted && | ||
| <Table | ||
| ref="Table" | ||
| headerHeight={headerHeight} | ||
| height={height - 2} | ||
| overscanRowCount={overscanRowCount} | ||
| rowClassName={this.rowClassName} | ||
| rowHeight={rowHeight} | ||
| rowGetter={rowGetter} | ||
| rowCount={sortedAndFilteredList.size} | ||
| sort={this.sort} | ||
| sortBy={sortBy} | ||
| sortDirection={sortDirection} | ||
| width={this.totalTableWidth} | ||
| > | ||
| {orderedColumnKeys.map((columnKey) => ( | ||
| <Column | ||
| dataKey={columnKey} | ||
| disableSort={false} | ||
| headerRenderer={this.headerRenderer} | ||
| width={this.widthsForColumnsByKey[columnKey]} | ||
| label={columnKey} | ||
| key={columnKey} | ||
| /> | ||
| ))} | ||
| </Table> | ||
| } | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| getDatum(list, index) { | ||
|
There was a problem hiding this comment. I'm used to |
||
| return list.get(index % list.size); | ||
| } | ||
|
|
||
| headerRenderer({ dataKey, label, sortBy, sortDirection }) { | ||
| return ( | ||
| <div> | ||
| {label} | ||
| {sortBy === dataKey && | ||
| <SortIndicator sortDirection={sortDirection} /> | ||
| } | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| rowClassName({ index }) { | ||
| let className = ''; | ||
| if (this.props.striped) { | ||
| className = index % 2 === 0 ? 'even-row' : 'odd-row'; | ||
| } | ||
| return className; | ||
| } | ||
|
|
||
| sort({ sortBy, sortDirection }) { | ||
| this.setState({ sortBy, sortDirection }); | ||
| } | ||
| } | ||
|
|
||
| FilterableTable.propTypes = propTypes; | ||
| FilterableTable.defaultProps = defaultProps; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
how does this react when it overflow? I saw react-virtualized has a dynamicHeight option too, would that be better?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mistercrunch and i talked offline about this, we'll keep the static row height and add a max column width. for columns that require truncating the text, we will show a modal or popover... currently there is a tooltip when hovering on any cell which shows the content, but i'm not sure if this is clear enough to the user.
i'll tackle setting a max column width in a follow up PR.