QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-12 04:37:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bumping the JS libs to fix the build (#2616)

Browse Source 
* bumping the js libs

* New linting rules

* More linting

* More

* Done linting

* npm >=4.5.0

* Bumping node

* Tweaking the build

* Fixing the damn build

* Fixing the apps
This commit is contained in:
Maxime Beauchemin
2017-04-13 15:04:09 -07:00
committed by GitHub
parent a2b30f35fc
commit 366ecefbaa
132 changed files with 611 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
superset/assets/javascripts/SqlLab/components/ResultSet.jsx
View File

@@ -17,6 +17,7 @@ const propTypes = {
showSql: React.PropTypes.bool,
visualize: React.PropTypes.bool,
cache: React.PropTypes.bool,
resultSetHeight: React.PropTypes.number,
};
const defaultProps = {
search: true,
@@ -36,7 +37,6 @@ class ResultSet extends React.PureComponent {
searchText: '',
showModal: false,
data: [],
resultSetHeight: '0',
};
}
componentWillReceiveProps(nextProps) {
@@ -46,7 +46,7 @@ class ResultSet extends React.PureComponent {
&& nextProps.query.results.data.length > 0) {
this.setState(
{ data: nextProps.query.results.data },
this.clearQueryResults(nextProps.query)
this.clearQueryResults(nextProps.query),
);
}
if (nextProps.query.resultsKey
@@ -204,7 +204,7 @@ class ResultSet extends React.PureComponent {
const newRow = {};
for (const k in row) {
const val = row[k];
if (typeof(val) === 'string') {
if (typeof (val) === 'string') {
newRow[k] = val;
} else {
newRow[k] = JSON.stringify(val);
@@ -212,11 +212,11 @@ class ResultSet extends React.PureComponent {
}
return newRow;
})}
columns={results.columns.map((col) => col.name)}
columns={results.columns.map(col => col.name)}
sortable
className="table table-condensed table-bordered"
filterBy={this.state.searchText}
filterable={results.columns.map((c) => c.name)}
filterable={results.columns.map(c => c.name)}
hideFilterInput
/>
</div>