Skip to content

Commit 35046d1

Browse files
authored
fix: DH-18906: Enable filters on constituent columns in rollups (#2463)
- Enable filters on constituent columns in Core+ rollups - Disable filters on aggregated columns - Update jsapi-types to `1.0.0-dev0.39.4` This PR is dependent on deephaven/deephaven-core#6943
1 parent 5b572c3 commit 35046d1

22 files changed

Lines changed: 407 additions & 56 deletions

File tree

__mocks__/dh-core.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,8 @@ class TreeTable extends Table {
846846
constructor(props) {
847847
super(props);
848848

849-
const { groupedColumns = [] } = props;
849+
const { aggregatedColumns = [], groupedColumns = [] } = props;
850+
this.aggregatedColumns = aggregatedColumns;
850851
this.groupedColumns = groupedColumns;
851852
}
852853
}

package-lock.json

Lines changed: 202 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/app-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@deephaven/iris-grid": "file:../iris-grid",
4343
"@deephaven/jsapi-bootstrap": "file:../jsapi-bootstrap",
4444
"@deephaven/jsapi-components": "file:../jsapi-components",
45-
"@deephaven/jsapi-types": "^1.0.0-dev0.37.2",
45+
"@deephaven/jsapi-types": "^1.0.0-dev0.39.4",
4646
"@deephaven/jsapi-utils": "file:../jsapi-utils",
4747
"@deephaven/log": "file:../log",
4848
"@deephaven/plugin": "file:../plugin",

packages/auth-plugins/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@deephaven/components": "file:../components",
3737
"@deephaven/jsapi-bootstrap": "file:../jsapi-bootstrap",
3838
"@deephaven/jsapi-components": "file:../jsapi-components",
39-
"@deephaven/jsapi-types": "^1.0.0-dev0.37.2",
39+
"@deephaven/jsapi-types": "^1.0.0-dev0.39.4",
4040
"@deephaven/jsapi-utils": "file:../jsapi-utils",
4141
"@deephaven/log": "file:../log",
4242
"@deephaven/redux": "file:../redux",

packages/chart/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"dependencies": {
3030
"@deephaven/components": "file:../components",
3131
"@deephaven/icons": "file:../icons",
32-
"@deephaven/jsapi-types": "^1.0.0-dev0.37.2",
32+
"@deephaven/jsapi-types": "^1.0.0-dev0.39.4",
3333
"@deephaven/jsapi-utils": "file:../jsapi-utils",
3434
"@deephaven/log": "file:../log",
3535
"@deephaven/react-hooks": "file:../react-hooks",

packages/code-studio/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@deephaven/jsapi-bootstrap": "file:../jsapi-bootstrap",
2929
"@deephaven/jsapi-components": "file:../jsapi-components",
3030
"@deephaven/jsapi-shim": "file:../jsapi-shim",
31-
"@deephaven/jsapi-types": "^1.0.0-dev0.37.2",
31+
"@deephaven/jsapi-types": "^1.0.0-dev0.39.4",
3232
"@deephaven/jsapi-utils": "file:../jsapi-utils",
3333
"@deephaven/log": "file:../log",
3434
"@deephaven/plugin": "file:../plugin",

packages/console/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@deephaven/components": "file:../components",
2929
"@deephaven/icons": "file:../icons",
3030
"@deephaven/jsapi-bootstrap": "file:../jsapi-bootstrap",
31-
"@deephaven/jsapi-types": "^1.0.0-dev0.37.2",
31+
"@deephaven/jsapi-types": "^1.0.0-dev0.39.4",
3232
"@deephaven/jsapi-utils": "file:../jsapi-utils",
3333
"@deephaven/log": "file:../log",
3434
"@deephaven/react-hooks": "file:../react-hooks",

packages/dashboard-core-plugins/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"@deephaven/iris-grid": "file:../iris-grid",
3535
"@deephaven/jsapi-bootstrap": "file:../jsapi-bootstrap",
3636
"@deephaven/jsapi-components": "file:../jsapi-components",
37-
"@deephaven/jsapi-types": "^1.0.0-dev0.37.2",
37+
"@deephaven/jsapi-types": "^1.0.0-dev0.39.4",
3838
"@deephaven/jsapi-utils": "file:../jsapi-utils",
3939
"@deephaven/log": "file:../log",
4040
"@deephaven/plugin": "file:../plugin",

packages/embed-widget/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@deephaven/dashboard-core-plugins": "file:../dashboard-core-plugins",
2323
"@deephaven/jsapi-bootstrap": "file:../jsapi-bootstrap",
2424
"@deephaven/jsapi-components": "file:../jsapi-components",
25-
"@deephaven/jsapi-types": "^1.0.0-dev0.37.2",
25+
"@deephaven/jsapi-types": "^1.0.0-dev0.39.4",
2626
"@deephaven/jsapi-utils": "file:../jsapi-utils",
2727
"@deephaven/log": "file:../log",
2828
"@deephaven/plugin": "file:../plugin",

packages/iris-grid/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"@deephaven/grid": "file:../grid",
3838
"@deephaven/icons": "file:../icons",
3939
"@deephaven/jsapi-components": "file:../jsapi-components",
40-
"@deephaven/jsapi-types": "^1.0.0-dev0.37.2",
40+
"@deephaven/jsapi-types": "^1.0.0-dev0.39.4",
4141
"@deephaven/jsapi-utils": "file:../jsapi-utils",
4242
"@deephaven/log": "file:../log",
4343
"@deephaven/react-hooks": "file:../react-hooks",

0 commit comments

Comments
 (0)