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

fix: Don't recreate JS TreeTable subscriptions when viewport changes #6060

Merged
merged 2 commits into from
Sep 13, 2024
Merged

fix: Don't recreate JS TreeTable subscriptions when viewport changes #6060

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
9d10b70
fix: Don't recreate JS TreeTable subscriptions when viewport changes
niloc132 Sep 12, 2024
169e44f
Add tests for this bug
niloc132 Sep 13, 2024
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
13 changes: 12 additions & 1 deletion web/client-api/src/main/java/io/deephaven/web/client/api/tree/JsTreeTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,14 +599,25 @@ private void replaceSubscription(RebuildStep step) {
viewTicket.release();
viewTicket = null;
}
case SUBSCRIPTION:

// In all of the above cases, we replace the subscription
if (stream != null) {
stream.then(stream -> {
stream.close();
return null;
});
stream = null;
}
break;
case SUBSCRIPTION:
// If it exists, adjust the existing subscription, otherwise create a new one
if (stream != null) {
stream.then(subscription -> {
subscription.setViewport(firstRow, lastRow, Js.uncheckedCast(columns), (double) updateInterval);
return null;
});
return;
}
}

Promise<TreeSubscription> stream = Promise.resolve(defer())
Expand Down
19 changes: 19 additions & 0 deletions web/client-api/src/test/java/io/deephaven/web/client/api/HierarchicalTableTestGwt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,16 @@ public void testStaticTreeTable() {
JsTreeTable.EVENT_UPDATED, 2001d);
}).then(event -> {
assertEquals(10d, event.detail.getTreeSize());
assertEquals(10, event.detail.getRows().length);


// move the viewport and try again
treeTable.setViewport(5, 50, treeTable.getColumns(), null);
return treeTable.<TreeViewportData>nextEvent(
JsTreeTable.EVENT_UPDATED, 2002d);
}).then(event -> {
assertEquals(10d, event.detail.getTreeSize());
assertEquals(5, event.detail.getRows().length);

treeTable.close();

Expand Down Expand Up @@ -133,6 +143,15 @@ public void testRefreshingTreeTable() {
assertEquals(green, data.getFormat(1, idCol));
assertEquals(green, row2.getFormat(idCol));
assertEquals(green, idCol.getFormat(row2));

// Move the viewport and make sure we get the correct data
treeTable.setViewport(5, 49, treeTable.getColumns(), null);
return treeTable.<TreeViewportData>nextEvent(
JsTreeTable.EVENT_UPDATED, 2002d);
}).then(event -> {
assertEquals(10d, event.detail.getTreeSize());
assertEquals(5, event.detail.getRows().length);

return Promise.resolve(treeTable);
})
.then(event -> {
Expand Down