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

Fixed expand/collapse on 2-sided pivots #502

Merged
merged 1 commit into from
Mar 29, 2019
Merged

Fixed expand/collapse on 2-sided pivots #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions cpp/perspective/src/cpp/context_two.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,15 @@ t_ctx2::close(t_header header, t_index idx) {
m_row_depth = 0;
retval = m_rtraversal->collapse_node(idx);
m_rows_changed = (retval > 0);
}
} break;
case HEADER_COLUMN: {
if (!m_ctraversal->is_valid_idx(idx))
return 0;
m_column_depth_set = false;
m_column_depth = 0;
retval = m_ctraversal->collapse_node(idx);
m_columns_changed = (retval > 0);
}
} break;
default: {
PSP_COMPLAIN_AND_ABORT("Invalid header type detected.");
return INVALID_INDEX;
Expand Down
38 changes: 38 additions & 0 deletions packages/perspective/test/js/pivots.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,44 @@ module.exports = perspective => {
});
});

describe("Expand/Collapse", function() {
it("Collapse a row in a 2x2 pivot", async function() {
var table = perspective.table([
{x: 7, y: "A", z: true, a: "AA", b: "BB", c: "CC"},
{x: 2, y: "A", z: false, a: "AA", b: "CC", c: "CC"},
{x: 5, y: "A", z: true, a: "AA", b: "BB", c: "DD"},
{x: 4, y: "A", z: false, a: "AA", b: "CC", c: "DD"},
{x: 1, y: "B", z: true, a: "AA", b: "BB", c: "CC"},
{x: 8, y: "B", z: false, a: "AA", b: "CC", c: "CC"},
{x: 3, y: "B", z: true, a: "BB", b: "BB", c: "DD"},
{x: 6, y: "B", z: false, a: "BB", b: "CC", c: "DD"},
{x: 9, y: "C", z: true, a: "BB", b: "BB", c: "CC"},
{x: 10, y: "C", z: false, a: "BB", b: "CC", c: "CC"},
{x: 11, y: "C", z: true, a: "BB", b: "BB", c: "DD"},
{x: 12, y: "C", z: false, a: "BB", b: "CC", c: "DD"}
]);
var view = table.view({
column_pivot: ["z", "b"],
row_pivot: ["y", "a"],
aggregate: [{column: "x", op: "last"}]
});

let answer = [
{__ROW_PATH__: [], "false|CC|x": 12, "true|BB|x": 11},
{__ROW_PATH__: ["A"], "false|CC|x": 4, "true|BB|x": 5},
{__ROW_PATH__: ["A", "AA"], "false|CC|x": 4, "true|BB|x": 5},
{__ROW_PATH__: ["B"], "false|CC|x": 6, "true|BB|x": 3},
{__ROW_PATH__: ["C"], "false|CC|x": 12, "true|BB|x": 11},
{__ROW_PATH__: ["C", "BB"], "false|CC|x": 12, "true|BB|x": 11}
];
view.collapse(3);
let result2 = await view.to_json();
expect(result2).toEqual(answer);
view.delete();
table.delete();
});
});

describe("Column pivot w/sort", function() {
it("['y'] by ['z'], sorted by 'x'", async function() {
var table = perspective.table([
Expand Down