Skip to content
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

Jump to bottom

Adding sort time table #3651

Merged
merged 2 commits into from
Oct 12, 2017
Merged

Adding sort time table #3651

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9a751b
Updating time_table component to sort
michellethomas Oct 11, 2017
add2a9d
Removing old sort
michellethomas Oct 11, 2017
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
88 changes: 50 additions & 38 deletions superset/assets/visualizations/time_table.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import ReactDOM from 'react-dom';
import React from 'react';
import propTypes from 'prop-types';
import { Table, Thead, Th } from 'reactable';
import { Table, Thead, Th, Tr, Td } from 'reactable';
import d3 from 'd3';
import { Sparkline, LineSeries } from '@data-ui/sparkline';
import Mustache from 'mustache';
Expand Down Expand Up @@ -44,16 +44,8 @@ function viz(slice, payload) {
metricMap[m.metric_name] = m;
});

let metrics;
if (payload.data.is_group_by) {
// Sorting by first column desc
metrics = payload.data.columns.sort((m1, m2) => (
reversedData[0][m1] > reversedData[0][m2] ? -1 : 1
));
} else {
// Using ordering specified in Metrics dropdown
metrics = payload.data.columns;
}
const metrics = payload.data.columns;
const defaultSort = { column: fd.column_collection[0].key, direction: 'desc' };
const tableData = metrics.map((metric) => {
let leftCell;
const context = Object.assign({}, fd, { metric });
Expand All @@ -80,28 +72,31 @@ function viz(slice, payload) {
const extent = d3.extent(sparkData);
const tooltip = `min: ${d3format(c.d3format, extent[0])}, \
max: ${d3format(c.d3format, extent[1])}`;
row[c.key] = (
<TooltipWrapper label="tt-spark" tooltip={tooltip}>
<div>
<Sparkline
ariaLabel={`spark-${metric}`}
width={parseInt(c.width, 10) || 300}
height={parseInt(c.height, 10) || 50}
margin={{
top: SPARK_MARGIN,
bottom: SPARK_MARGIN,
left: SPARK_MARGIN,
right: SPARK_MARGIN,
}}
data={sparkData}
>
<LineSeries
showArea={false}
stroke={brandColor}
/>
</Sparkline>
</div>
</TooltipWrapper>);
row[c.key] = {
data: sparkData[sparkData.length - 1],
display: (
<TooltipWrapper label="tt-spark" tooltip={tooltip}>
<div>
<Sparkline
ariaLabel={`spark-${metric}`}
width={parseInt(c.width, 10) || 300}
height={parseInt(c.height, 10) || 50}
margin={{
top: SPARK_MARGIN,
bottom: SPARK_MARGIN,
left: SPARK_MARGIN,
right: SPARK_MARGIN,
}}
data={sparkData}
>
<LineSeries
showArea={false}
stroke={brandColor}
/>
</Sparkline>
</div>
</TooltipWrapper>),
};
} else {
const recent = reversedData[0][metric];
let v;
Expand Down Expand Up @@ -140,18 +135,23 @@ function viz(slice, payload) {
} else if (c.bounds && c.bounds[1] !== null) {
color = v < c.bounds[1] ? ACCESSIBLE_COLOR_BOUNDS[1] : ACCESSIBLE_COLOR_BOUNDS[0];
}
row[c.key] = (
<span style={{ color }}>
<FormattedNumber num={v} format={c.d3format} />
</span>);
row[c.key] = {
data: v,
display: (
<span style={{ color }}>
<FormattedNumber num={v} format={c.d3format} />
</span>),
};
}
});
return row;
});
ReactDOM.render(
<Table
className="table table-condensed"
data={tableData}
defaultSort={defaultSort}
sortBy={defaultSort}
sortable={fd.column_collection.map(c => c.key)}
>
<Thead>
<Th column="metric">Metric</Th>
Expand All @@ -166,6 +166,18 @@ function viz(slice, payload) {
)}
</Th>))}
</Thead>
{tableData.map(row => (
<Tr key={row.metric}>
<Td column="metric" data={row.metric}>{row.metric}</Td>
{fd.column_collection.map(c => (
<Td
column={c.key}
key={c.key}
value={row[c.key].data}
>
{row[c.key].display}
</Td>))}
</Tr>))}
</Table>,
document.getElementById(slice.containerId),
);
Expand Down