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

Enable rowTotals and colTotals as params in tableOptions #136

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Enable rowTotals and colTotals as params in tableOptions #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd724f5
minimalistic re-enabling of total col/row controls
cdruck Jun 24, 2021
34bd43c
moved changes to correct file
cdruck Jun 24, 2021
d654366
add configurable prop
cdruck Oct 15, 2022
9bd4cf2
init aggregators
cdruck Oct 15, 2022
36eb624
test
cdruck Oct 15, 2022
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
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/plotly/react-pivottable.git"
"url": "git+https://github.com/cdruck/react-pivottable.git"
},
"keywords": [
"react",
Expand All @@ -41,9 +41,9 @@
"author": "Nicolas Kruchten <[email protected]>",
"license": "MIT",
"bugs": {
"url": "https://github.com/plotly/react-pivottable/issues"
"url": "https://github.com/cdruck/react-pivottable/issues"
},
"homepage": "https://github.com/plotly/react-pivottable#readme",
"homepage": "https://github.com/cdruck/react-pivottable#readme",
"dependencies": {
"immutability-helper": "^2.3.1",
"prop-types": "^15.5.10",
Expand Down
17 changes: 15 additions & 2 deletions src/PivotTableUI.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import update from 'immutability-helper';
import {PivotData, sortAs, getSort} from './Utilities';
import {PivotData, sortAs, getSort, aggregators} from './Utilities';
import PivotTable from './PivotTable';
import Sortable from 'react-sortablejs';
import Draggable from 'react-draggable';
Expand All @@ -12,7 +12,7 @@ import Draggable from 'react-draggable';
export class DraggableAttribute extends React.Component {
constructor(props) {
super(props);
this.state = {open: false, filterText: ''};
this.state = { open: false, filterText: '' };
}

toggleValue(value) {
Expand Down Expand Up @@ -230,6 +230,17 @@ export class Dropdown extends React.PureComponent {
class PivotTableUI extends React.PureComponent {
constructor(props) {
super(props);

// if aggregators are passed as strings, match them with those defined in ./Utilities/aggregators
var aggs = {};
if (!!props.aggregators) {
for (agg in props.aggregators) {
aggs[agg] = aggregators[agg];
}
props.aggregators = aggs;
}
console.log(props);

this.state = {
unusedOrder: [],
zIndices: {},
Expand Down Expand Up @@ -576,6 +587,7 @@ PivotTableUI.propTypes = Object.assign({}, PivotTable.propTypes, {
hiddenFromDragDrop: PropTypes.arrayOf(PropTypes.string),
unusedOrientationCutoff: PropTypes.number,
menuLimit: PropTypes.number,
aggregators: PropTypes.arrayOf(PropTypes.string),
});

PivotTableUI.defaultProps = Object.assign({}, PivotTable.defaultProps, {
Expand All @@ -584,6 +596,7 @@ PivotTableUI.defaultProps = Object.assign({}, PivotTable.defaultProps, {
hiddenFromDragDrop: [],
unusedOrientationCutoff: 85,
menuLimit: 500,
aggregators: aggregators,
});

export default PivotTableUI;
34 changes: 17 additions & 17 deletions src/PlotlyRenderers.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import {PivotData} from './Utilities';
import { PivotData } from './Utilities';

/* eslint-disable react/prop-types */
// eslint can't see inherited propTypes!
Expand Down Expand Up @@ -47,7 +47,7 @@ function makeRenderer(
values.push(isFinite(val) ? val : null);
labels.push(datumKey.join('-') || ' ');
}
const trace = {name: traceKey.join('-') || fullAggName};
const trace = { name: traceKey.join('-') || fullAggName };
if (traceOptions.type === 'pie') {
trace.values = values;
trace.labels = labels.length > 1 ? labels : [fullAggName];
Expand Down Expand Up @@ -84,7 +84,7 @@ function makeRenderer(
if (traceOptions.type === 'pie') {
const columns = Math.ceil(Math.sqrt(data.length));
const rows = Math.ceil(data.length / columns);
layout.grid = {columns, rows};
layout.grid = { columns, rows };
data.forEach((d, i) => {
d.domain = {
row: Math.floor(i / columns),
Expand Down Expand Up @@ -149,7 +149,7 @@ function makeScatterRenderer(PlotlyComponent) {
colKeys.push([]);
}

const data = {x: [], y: [], text: [], type: 'scatter', mode: 'markers'};
const data = { x: [], y: [], text: [], type: 'scatter', mode: 'markers' };

rowKeys.map(rowKey => {
colKeys.map(colKey => {
Expand All @@ -166,8 +166,8 @@ function makeScatterRenderer(PlotlyComponent) {
title: this.props.rows.join('-') + ' vs ' + this.props.cols.join('-'),
hovermode: 'closest',
/* eslint-disable no-magic-numbers */
xaxis: {title: this.props.cols.join('-'), automargin: true},
yaxis: {title: this.props.rows.join('-'), automargin: true},
xaxis: { title: this.props.cols.join('-'), automargin: true },
yaxis: { title: this.props.rows.join('-'), automargin: true },
width: window.innerWidth / 1.5,
height: window.innerHeight / 1.4 - 50,
/* eslint-enable no-magic-numbers */
Expand Down Expand Up @@ -201,33 +201,33 @@ export default function createPlotlyRenderers(PlotlyComponent) {
return {
'Grouped Column Chart': makeRenderer(
PlotlyComponent,
{type: 'bar'},
{barmode: 'group'}
{ type: 'bar' },
{ barmode: 'group' }
),
'Stacked Column Chart': makeRenderer(
PlotlyComponent,
{type: 'bar'},
{barmode: 'relative'}
{ type: 'bar' },
{ barmode: 'relative' }
),
'Grouped Bar Chart': makeRenderer(
PlotlyComponent,
{type: 'bar', orientation: 'h'},
{barmode: 'group'},
{ type: 'bar', orientation: 'h' },
{ barmode: 'group' },
true
),
'Stacked Bar Chart': makeRenderer(
PlotlyComponent,
{type: 'bar', orientation: 'h'},
{barmode: 'relative'},
{ type: 'bar', orientation: 'h' },
{ barmode: 'relative' },
true
),
'Line Chart': makeRenderer(PlotlyComponent),
'Dot Chart': makeRenderer(PlotlyComponent, {mode: 'markers'}, {}, true),
'Area Chart': makeRenderer(PlotlyComponent, {stackgroup: 1}),
'Dot Chart': makeRenderer(PlotlyComponent, { mode: 'markers' }, {}, true),
'Area Chart': makeRenderer(PlotlyComponent, { stackgroup: 1 }),
'Scatter Chart': makeScatterRenderer(PlotlyComponent),
'Multiple Pie Chart': makeRenderer(
PlotlyComponent,
{type: 'pie', scalegroup: 1, hoverinfo: 'label+value', textinfo: 'none'},
{ type: 'pie', scalegroup: 1, hoverinfo: 'label+value', textinfo: 'none' },
{},
true
),
Expand Down
90 changes: 45 additions & 45 deletions src/TableRenderers.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import PropTypes from 'prop-types';
import {PivotData} from './Utilities';
import { PivotData } from './Utilities';

// helper function for setting row/col-span in pivotTableRenderer
const spanSize = function(arr, i, j) {
const spanSize = function (arr, i, j) {
let x;
if (i !== 0) {
let asc, end;
Expand Down Expand Up @@ -48,7 +48,7 @@ function redColorScaleGenerator(values) {
return x => {
// eslint-disable-next-line no-magic-numbers
const nonRed = 255 - Math.round((255 * (x - min)) / (max - min));
return {backgroundColor: `rgb(255,${nonRed},${nonRed})`};
return { backgroundColor: `rgb(255,${nonRed},${nonRed})` };
};
}

Expand All @@ -62,9 +62,9 @@ function makeRenderer(opts = {}) {
const colKeys = pivotData.getColKeys();
const grandTotalAggregator = pivotData.getAggregator([], []);

let valueCellColors = () => {};
let rowTotalColors = () => {};
let colTotalColors = () => {};
let valueCellColors = () => { };
let rowTotalColors = () => { };
let colTotalColors = () => { };
if (opts.heatmapMode) {
const colorScaleGenerator = this.props.tableColorScaleGenerator;
const rowTotalValues = colKeys.map(x =>
Expand Down Expand Up @@ -109,40 +109,40 @@ function makeRenderer(opts = {}) {
const getClickHandler =
this.props.tableOptions && this.props.tableOptions.clickCallback
? (value, rowValues, colValues) => {
const filters = {};
for (const i of Object.keys(colAttrs || {})) {
const attr = colAttrs[i];
if (colValues[i] !== null) {
filters[attr] = colValues[i];
}
const filters = {};
for (const i of Object.keys(colAttrs || {})) {
const attr = colAttrs[i];
if (colValues[i] !== null) {
filters[attr] = colValues[i];
}
for (const i of Object.keys(rowAttrs || {})) {
const attr = rowAttrs[i];
if (rowValues[i] !== null) {
filters[attr] = rowValues[i];
}
}
for (const i of Object.keys(rowAttrs || {})) {
const attr = rowAttrs[i];
if (rowValues[i] !== null) {
filters[attr] = rowValues[i];
}
return e =>
this.props.tableOptions.clickCallback(
e,
value,
filters,
pivotData
);
}
return e =>
this.props.tableOptions.clickCallback(
e,
value,
filters,
pivotData
);
}
: null;

return (
<table className="pvtTable">
<thead>
{colAttrs.map(function(c, j) {
{colAttrs.map((c, j) => {
return (
<tr key={`colAttr${j}`}>
{j === 0 && rowAttrs.length !== 0 && (
<th colSpan={rowAttrs.length} rowSpan={colAttrs.length} />
)}
<th className="pvtAxisLabel">{c}</th>
{colKeys.map(function(colKey, i) {
{colKeys.map(function (colKey, i) {
const x = spanSize(colKeys, i, j);
if (x === -1) {
return null;
Expand All @@ -163,7 +163,7 @@ function makeRenderer(opts = {}) {
);
})}

{j === 0 && (
{j === 0 && this.props.tableOptions.colTotals && (
<th
className="pvtTotalLabel"
rowSpan={
Expand All @@ -179,26 +179,26 @@ function makeRenderer(opts = {}) {

{rowAttrs.length !== 0 && (
<tr>
{rowAttrs.map(function(r, i) {
{rowAttrs.map(function (r, i) {
return (
<th className="pvtAxisLabel" key={`rowAttr${i}`}>
{r}
</th>
);
})}
<th className="pvtTotalLabel">
{<th className="pvtTotalLabel">
{colAttrs.length === 0 ? 'Totals' : null}
</th>
</th>}
</tr>
)}
</thead>

<tbody>
{rowKeys.map(function(rowKey, i) {
{rowKeys.map((rowKey, i) => {
const totalAggregator = pivotData.getAggregator(rowKey, []);
return (
<tr key={`rowKeyRow${i}`}>
{rowKey.map(function(txt, j) {
{rowKey.map((txt, j) => {
const x = spanSize(rowKeys, i, j);
if (x === -1) {
return null;
Expand All @@ -218,7 +218,7 @@ function makeRenderer(opts = {}) {
</th>
);
})}
{colKeys.map(function(colKey, j) {
{colKeys.map((colKey, j) => {
const aggregator = pivotData.getAggregator(rowKey, colKey);
return (
<td
Expand All @@ -238,7 +238,7 @@ function makeRenderer(opts = {}) {
</td>
);
})}
<td
{this.props.tableOptions.colTotals && <td
className="pvtTotal"
onClick={
getClickHandler &&
Expand All @@ -247,20 +247,20 @@ function makeRenderer(opts = {}) {
style={colTotalColors(totalAggregator.value())}
>
{totalAggregator.format(totalAggregator.value())}
</td>
</td>}
</tr>
);
})}

<tr>
{this.props.tableOptions.rowTotals && <tr>
<th
className="pvtTotalLabel"
colSpan={rowAttrs.length + (colAttrs.length === 0 ? 0 : 1)}
>
Totals
</th>
</th>

{colKeys.map(function(colKey, i) {
{colKeys.map(function (colKey, i) {
const totalAggregator = pivotData.getAggregator([], colKey);
return (
<td
Expand All @@ -277,16 +277,16 @@ function makeRenderer(opts = {}) {
);
})}

<td
{this.props.tableOptions.colTotals && <td
onClick={
getClickHandler &&
getClickHandler(grandTotalAggregator.value(), [null], [null])
}
className="pvtGrandTotal"
>
{grandTotalAggregator.format(grandTotalAggregator.value())}
</td>
</tr>
</td>}
</tr>}
</tbody>
</table>
);
Expand Down Expand Up @@ -335,7 +335,7 @@ class TSVExportRenderer extends React.PureComponent {
return (
<textarea
value={result.map(r => r.join('\t')).join('\n')}
style={{width: window.innerWidth / 2, height: window.innerHeight / 2}}
style={{ width: window.innerWidth / 2, height: window.innerHeight / 2 }}
readOnly={true}
/>
);
Expand All @@ -347,8 +347,8 @@ TSVExportRenderer.propTypes = PivotData.propTypes;

export default {
Table: makeRenderer(),
'Table Heatmap': makeRenderer({heatmapMode: 'full'}),
'Table Col Heatmap': makeRenderer({heatmapMode: 'col'}),
'Table Row Heatmap': makeRenderer({heatmapMode: 'row'}),
'Table Heatmap': makeRenderer({ heatmapMode: 'full' }),
'Table Col Heatmap': makeRenderer({ heatmapMode: 'col' }),
'Table Row Heatmap': makeRenderer({ heatmapMode: 'row' }),
'Exportable TSV': TSVExportRenderer,
};