Skip to content

add transforms for histogram, box, violin #560

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
merged 2 commits into from
Jul 9, 2018
Merged

add transforms for histogram, box, violin #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cab595d
add transforms for histogram and box
dmt0 Jul 6, 2018
f94c9ff
workaround for trace disappearing when all transforms are deleted
dmt0 Jul 6, 2018
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
12 changes: 8 additions & 4 deletions src/EditorControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,10 +232,14 @@ class EditorControls extends Component {
isNumeric(payload.transformIndex) &&
payload.traceIndex < graphDiv.data.length
) {
graphDiv.data[payload.traceIndex].transforms.splice(
payload.transformIndex,
1
);
if (graphDiv.data[payload.traceIndex].transforms.length === 1) {
delete graphDiv.data[payload.traceIndex].transforms;
} else {
graphDiv.data[payload.traceIndex].transforms.splice(
payload.transformIndex,
1
);
}
if (this.props.onUpdate) {
this.props.onUpdate(
graphDiv.data.slice(),
Expand Down
12 changes: 10 additions & 2 deletions src/components/containers/TransformAccordion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,15 @@ class TransformAccordion extends Component {
{label: _('Aggregate'), type: 'aggregate'},
];

const transformableCharts = ['scatter', 'bar', 'scattergl'];
const transformableCharts = [
'scatter',
'bar',
'scattergl',
'histogram',
'histogram2d',
'box',
'violin',
];

if (!transformableCharts.includes(fullContainer.type)) {
return (
Expand Down Expand Up @@ -68,7 +76,7 @@ class TransformAccordion extends Component {
transformIndex={i}
name={`${
transformTypes.filter(({type}) => type === tr.type)[0].label
}${transformBy[i]}`}
}${transformBy && transformBy[i]}`}
canDelete={true}
>
{children}
Expand Down
5 changes: 4 additions & 1 deletion src/default_panels/GraphTransformsPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ export class Aggregations extends Component {
}

return aggregations
.filter(aggr => aggr.target.match(/transforms\[\d*\]\./gi) === null)
.filter(
aggr =>
aggr.target && aggr.target.match(/transforms\[\d*\]\./gi) === null
)
.map(({target}, i) => (
<AggregationSection show key={i} aggregationIndex={i}>
<Dropdown
Expand Down