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.

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

Column chooser #9

Merged
merged 13 commits into from
Jan 22, 2018
Prev Previous commit
Next Next commit
Update test regression.
  • Loading branch information
texodus committed Jan 22, 2018
commit ffa17bb6e592e42315c87c89ab12da9bb6569d80
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"scatter.html/pivots by two rows and two columns.": "8076a1aa797aa57c3e09977bb12a49e3",
"scatter.html/sorts by a numeric column.": "384eea0345e7a35e444f26aa3eb3d208",
"scatter.html/sorts by an alpha column.": "fac0df141d22b3868d87e1ce30c9a045",
"scatter.html/displays visible columns.": "dcffcd6d23534d745ee0816ab11a71ce",
"scatter.html/displays visible columns.": "7a919ee86624d9b91c6c494214a9f3f1",
"bar.html/shows a grid without any settings applied.": "fa9f33409c8409155b403c30e97b9397",
"bar.html/pivots by a row.": "8848040374bbf4817169054d69b88012",
"bar.html/pivots by two rows.": "d3f8bf092cb96bd753b7a94597f0af8a",
Expand Down
2 changes: 0 additions & 2 deletions packages/perspective-viewer-hypergrid/src/js/hypergrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -707,9 +707,7 @@ async function grid(div, view, hidden, redraw, task) {

this[PRIVATE].grid.set_data(json, schema);
await this.hypergrid.canvas.resize();
await this.hypergrid._updating_cache;
await this.hypergrid.canvas.resize();
await this.hypergrid._updating_cache;
}

global.registerPlugin("hypergrid", {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"superstore.html/shows a grid without any settings applied.": "45055f06b933226373579c5e3b03608f",
"superstore.html/pivots by a row.": "95ffdf460138b9f2aab4d9e0362d281b",
"superstore.html/pivots by two rows.": "2f5f9fe6a82fca7e5320d9996eeae559",
"superstore.html/pivots by a row and a column.": "4dae593930a024e6e45ae3e902ded425",
"superstore.html/pivots by two rows and two columns.": "0f4423864bb5ac00fb002c386f42327c",
"superstore.html/pivots by a row and a column.": "8b46d8d101f643e1caeb21286bb88e32",
"superstore.html/pivots by two rows and two columns.": "570d8ffd63c3c2c7ebdd0b13e0aa5543",
"superstore.html/sorts by a numeric column.": "b1cab634c6f028aadca4cb80d45da0d2",
"superstore.html/sorts by an alpha column.": "75f2524a106af8f9f5a032561cf8ffbd",
"superstore.html/displays visible columns.": "5e92e91cfbfa7dd864e3381bd834dfab",
Expand Down
2 changes: 2 additions & 0 deletions packages/perspective-viewer/test/js/simple_tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,15 @@ exports.default = function() {
await page.click('#config_button');
const viewer = await page.$('perspective-viewer');
await page.evaluate(element => element.setAttribute('row-pivots', '["State"]'), viewer);
await page.waitForSelector('perspective-viewer:not([updating])');
await page.evaluate(element => element.setAttribute('column-pivots', '["Category"]'), viewer);
});

test.capture("pivots by two rows and two columns.", async page => {
await page.click('#config_button');
const viewer = await page.$('perspective-viewer');
await page.evaluate(element => element.setAttribute('row-pivots', '["Region","State"]'), viewer);
await page.waitForSelector('perspective-viewer:not([updating])');
await page.evaluate(element => element.setAttribute('column-pivots', '["Category","Sub-Category"]'), viewer);
});

Expand Down