Skip to content

Fixes filters emitted from table viz #2335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mistercrunch merged 1 commit into from
Mar 6, 2017
Merged

Fixes filters emitted from table viz #2335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions superset/assets/javascripts/explorev2/components/ChartContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ class ChartContainer extends React.PureComponent {
{}
),

addFilter: () => {},

removeFilter: () => {},

done: () => {},
clearError: () => {
// no need to do anything here since Alert is closable
Expand Down
23 changes: 12 additions & 11 deletions superset/assets/visualizations/table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,24 @@ function tableVis(slice, payload) {
.enter()
.append('tr')
.selectAll('td')
.data((row) => data.columns.map((c) => {
let val = row[c];
.data(row => data.columns.map(c => {
const val = row[c];
let html;
const isMetric = metrics.indexOf(c) >= 0;
if (c === 'timestamp') {
val = timestampFormatter(val);
html = timestampFormatter(val);
}
if (typeof(val) === 'string') {
val = `<span class="like-pre">${val}</span>`;
html = `<span class="like-pre">${val}</span>`;
}
if (isMetric) {
html = slice.d3format(c, val);
}
return {
col: c,
val,
isMetric: metrics.indexOf(c) >= 0,
html,
isMetric,
};
}))
.enter()
Expand Down Expand Up @@ -118,12 +124,7 @@ function tableVis(slice, payload) {
.style('cursor', function (d) {
return (!d.isMetric) ? 'pointer' : '';
})
.html((d) => {
if (d.isMetric) {
return slice.d3format(d.col, d.val);
}
return d.val;
});
.html(d => d.html ? d.html : d.val);
const height = slice.height();
let paging = false;
let pageLength;
Expand Down