Skip to content

Commit

Permalink
fix: JS API should pass date/number formatting to UI (#6158)
Browse files Browse the repository at this point in the history 
Fixes #6120
  • Loading branch information
@niloc132
niloc132 authored Oct 1, 2024
1 parent 11a0620 commit d2873dd
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 23 deletions.
2 changes: 1 addition & 1 deletion web/client-api/src/main/java/io/deephaven/web/client/api/barrage/def/ColumnDefinition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public Column makeJsColumn(int index, Map<Boolean, Map<String, ColumnDefinition>
style == null ? null : style.getColumnIndex(),
style == null ? null : style.getColumnIndex(),
isPartitionColumn(),
format == null || format.isFormatColumn() ? null : format.getColumnIndex(),
format == null ? null : format.getColumnIndex(),
getDescription(),
isInputTableKeyColumn());
}
Expand Down
76 changes: 54 additions & 22 deletions web/client-api/src/test/java/io/deephaven/web/client/api/subscription/ViewportTestGwt.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import elemental2.promise.Promise;
import io.deephaven.web.client.api.AbstractAsyncGwtTestCase;
import io.deephaven.web.client.api.Column;
import io.deephaven.web.client.api.DateWrapper;
import io.deephaven.web.client.api.Format;
import io.deephaven.web.client.api.HasEventHandling;
import io.deephaven.web.client.api.JsRangeSet;
import io.deephaven.web.client.api.JsTable;
Expand All @@ -30,15 +32,7 @@
import static elemental2.dom.DomGlobal.console;

/**
* Assumes two tables, ticking every 2 seconds:
*
* growingForward = db.timeTable("00:00:01").update("I=i", "J=i*i", "K=0") growingBackward =
* growingForward.sortDescending("Timestamp") blinkOne = db.timeTable("00:00:01").update("I=i",
* "J=1").lastBy("J").where("I%2 != 0")
*
* And another static one:
*
* staticTable = emptyTable(100).update("I=i")
* Verifies behavior of viewport subscriptions.
*/
public class ViewportTestGwt extends AbstractAsyncGwtTestCase {

Expand All @@ -47,9 +41,11 @@ public class ViewportTestGwt extends AbstractAsyncGwtTestCase {
.script("staticTable", "empty_table(100).update(\"I=i\")")
.script("from datetime import datetime, timedelta")
.script("growingForward",
"time_table(period=\"PT00:00:01\", start_time=datetime.now() - timedelta(minutes=1)).update([\"I=i\", \"J=i*i\", \"K=0\"])")
"time_table(period=\"PT00:00:01\", start_time=datetime.now() - timedelta(minutes=1))" +
".update([\"I=i\", \"J=i*i\", \"K=0\"])")
.script("growingBackward",
"growingForward.sort_descending(\"Timestamp\").format_columns(['I=I>2 ? GREEN : RED'])")
"growingForward.sort_descending(\"Timestamp\")" +
".format_columns(['I=I>2 ? GREEN : RED', 'I = Decimal(`0.00%`)', 'Timestamp = Date(`yyyy_MM_dd`)'])")
.script("blinkOne",
"time_table(\"PT00:00:01\").update([\"I=i\", \"J=1\"]).last_by(by=\"J\").where(\"I%2 != 0\")")
.script("big", "empty_table(1_000_000).update_view(['I=i', 'Str=``+I']).where('I % 2 == 0')");
Expand Down Expand Up @@ -182,20 +178,55 @@ public void testViewportSubsetOfColumns() {
.then(table("growingBackward"))
.then(table -> {
delayTestFinish(8000);
table.setViewport(0, 0, Js.uncheckedCast(new Column[] {table.findColumn("I")}));
table.setViewport(0, 0, Js.uncheckedCast(table.findColumns(new String[] {"I", "Timestamp"})));

return assertUpdateReceived(table, viewport -> {
assertEquals(1, viewport.getColumns().length);
assertEquals(0, indexOf(viewport.getColumns(), table.findColumn("I")));
assertEquals(2, viewport.getColumns().length);
assertEquals(1, indexOf(viewport.getColumns(), table.findColumn("I")));
assertEquals(0, indexOf(viewport.getColumns(), table.findColumn("Timestamp")));

assertEquals(1, viewport.getRows().length);
TableData.Row row1 = viewport.getRows().getAt(0);
assertNotNull(viewport.getData(0, table.findColumn("I")));
assertNotNull(row1.get(table.findColumn("I")));
assertNotNull(table.findColumn("I").get(row1));
assertNotNull(row1.getFormat(table.findColumn("I")));
assertNotNull(table.findColumn("I").getFormat(row1));
assertNotNull(viewport.getFormat(0, table.findColumn("I")));
{
Any d1 = viewport.getData(0, table.findColumn("I"));
Any d2 = row1.get(table.findColumn("I"));
Any d3 = table.findColumn("I").get(row1);
assertNotNull(d1);
assertEquals("number", Js.typeof(d1));
assertEquals(d1, d2);
assertEquals(d2, d3);
Format f1 = row1.getFormat(table.findColumn("I"));
Format f2 = table.findColumn("I").getFormat(row1);
Format f3 = viewport.getFormat(0, table.findColumn("I"));
assertNotNull(f1);
assertEquals(f1, f2);
assertEquals(f2, f3);

assertNotNull(f1.getBackgroundColor());
assertNotNull(f1.getColor());
assertEquals("0.00%", f1.getFormatString());
}

{
Any d1 = viewport.getData(0, table.findColumn("Timestamp"));
Any d2 = row1.get(table.findColumn("Timestamp"));
Any d3 = table.findColumn("Timestamp").get(row1);
assertNotNull(d1);
assertTrue(d1 instanceof DateWrapper);
assertEquals(d1, d2);
assertEquals(d2, d3);
Format f1 = row1.getFormat(table.findColumn("Timestamp"));
Format f2 = table.findColumn("Timestamp").getFormat(row1);
Format f3 = viewport.getFormat(0, table.findColumn("Timestamp"));
assertNotNull(f1);
assertEquals(f1, f2);
assertEquals(f2, f3);

assertNull(f1.getBackgroundColor());
assertNull(f1.getColor());
assertEquals("yyyy_MM_dd", f1.getFormatString());
}


assertThrowsException(() -> row1.get(table.findColumn("J")));
assertThrowsException(() -> row1.get(table.findColumn("K")));
Expand All @@ -204,8 +235,9 @@ public void testViewportSubsetOfColumns() {
.then(table -> {
// don't change viewport, test the same thing again, make sure deltas behave too
return assertUpdateReceived(table, viewport -> {
assertEquals(1, viewport.getColumns().length);
assertEquals(0, indexOf(viewport.getColumns(), table.findColumn("I")));
assertEquals(2, viewport.getColumns().length);
assertEquals(1, indexOf(viewport.getColumns(), table.findColumn("I")));
assertEquals(0, indexOf(viewport.getColumns(), table.findColumn("Timestamp")));

assertEquals(1, viewport.getRows().length);
assertNotNull(viewport.getRows().getAt(0).get(table.findColumn("I")));
Expand Down

0 comments on commit d2873dd

Please sign in to comment.