Skip to content

Faster dc.filterAll() #1323

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

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

Faster dc.filterAll() #1323

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
de65187
modified dc.filterAll() to only act on charts that have a filter
ehansis Jul 24, 2017
fc23668
tabs to spaces
ehansis Jul 24, 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
36 changes: 27 additions & 9 deletions spec/core-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ describe('dc.core', function () {
expect(dc.hasChart(chart)).toBeTruthy();
});

it('filterAll should invoke filter on each chart', function () {
it('filterAll should not invoke filter on each unfiltered chart', function () {
dc.filterAll();
expect(chart.filterAll).toHaveBeenCalled();
expect(chart.filterAll).not.toHaveBeenCalled();
});

it('renderAll should invoke filter on each chart', function () {
Expand All @@ -54,6 +54,24 @@ describe('dc.core', function () {
});
});

describe('chart w/ filter', function () {
var chart;
beforeEach(function () {
chart = dc.pieChart('#id')
.dimension(valueDimension)
.group(valueGroup)
.filter(0);
spyOn(chart, 'filterAll');
return chart;
});

it('filterAll should invoke filter on each filtered chart', function () {
dc.filterAll();
expect(chart.filterAll).toHaveBeenCalled();
});

});

describe('chartsRegistry', function () {
var chart;
var chartGrouped;
Expand Down Expand Up @@ -249,15 +267,15 @@ describe('dc.core', function () {
var chart;

beforeEach(function () {
chart = dc.pieChart('#a', 'groupA').dimension(valueDimension).group(valueGroup);
chart = dc.pieChart('#a', 'groupA').dimension(valueDimension).group(valueGroup).filter(0);
spyOn(chart, 'filterAll');
spyOn(chart, 'render');
dc.pieChart('#b', 'groupA').dimension(valueDimension).group(valueGroup);
dc.bubbleChart('#c', 'groupB').dimension(valueDimension).group(valueGroup);
dc.barChart('#b1', 'groupB').dimension(valueDimension).group(valueGroup);
dc.lineChart('#b2', 'groupB').dimension(valueDimension).group(valueGroup);
dc.dataCount('#b3', 'groupB').dimension(valueDimension).group(valueGroup);
dc.dataTable('#b4', 'groupB').dimension(valueDimension).group(valueGroup);
dc.pieChart('#b', 'groupA').dimension(valueDimension).group(valueGroup).filter(0);
dc.bubbleChart('#c', 'groupB').dimension(valueDimension).group(valueGroup).filter(0);
dc.barChart('#b1', 'groupB').dimension(valueDimension).group(valueGroup).filter(0);
dc.lineChart('#b2', 'groupB').dimension(valueDimension).group(valueGroup).filter(0);
dc.dataCount('#b3', 'groupB').dimension(valueDimension).group(valueGroup).filter(0);
dc.dataTable('#b4', 'groupB').dimension(valueDimension).group(valueGroup).filter(0);
return chart;
});

Expand Down
4 changes: 3 additions & 1 deletion src/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,9 @@ dc.deregisterAllCharts = function (group) {
dc.filterAll = function (group) {
var charts = dc.chartRegistry.list(group);
for (var i = 0; i < charts.length; ++i) {
charts[i].filterAll();
if (charts[i].hasFilter()) {
charts[i].filterAll();
}
}
};

Expand Down