Skip to content

Commit 085f7ce

Browse files
vbabichbmingles
andauthored
fix: DH-18906: Enable filters on constituent columns in rollups (#2463) (#2475)
- 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 - Cherry-pick #2338 to fix types --------- Co-authored-by: Brian Ingles <brianingles@deephaven.io>
1 parent d8d621d commit 085f7ce

37 files changed

+301
-102
lines changed

__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: 37 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
"@deephaven/jsapi-bootstrap": "file:packages/jsapi-bootstrap",
172172
"@deephaven/jsapi-components": "file:packages/jsapi-components",
173173
"@deephaven/jsapi-shim": "file:packages/jsapi-shim",
174-
"@deephaven/jsapi-types": "^1.0.0-dev0.34.0",
174+
"@deephaven/jsapi-types": "^1.0.0-dev0.39.4",
175175
"@deephaven/jsapi-utils": "file:packages/jsapi-utils",
176176
"@deephaven/log": "file:packages/log",
177177
"@deephaven/mocks": "file:packages/mocks",

packages/app-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"@deephaven/iris-grid": "file:../iris-grid",
4242
"@deephaven/jsapi-bootstrap": "file:../jsapi-bootstrap",
4343
"@deephaven/jsapi-components": "file:../jsapi-components",
44-
"@deephaven/jsapi-types": "^1.0.0-dev0.34.0",
44+
"@deephaven/jsapi-types": "^1.0.0-dev0.39.4",
4545
"@deephaven/jsapi-utils": "file:../jsapi-utils",
4646
"@deephaven/log": "file:../log",
4747
"@deephaven/plugin": "file:../plugin",

packages/app-utils/src/components/ConnectionBootstrap.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export function ConnectionBootstrap({
8585
if (connection == null || isShutdown) return;
8686

8787
// handles the disconnect event
88-
function handleDisconnect(event: CustomEvent): void {
88+
function handleDisconnect(event: dh.Event<unknown>): void {
8989
const { detail } = event;
9090
log.info('Disconnect', `${JSON.stringify(detail)}`);
9191
setConnectionState('reconnecting');
@@ -105,7 +105,7 @@ export function ConnectionBootstrap({
105105
if (connection == null || isShutdown) return;
106106

107107
// handles the reconnect event
108-
function handleReconnect(event: CustomEvent): void {
108+
function handleReconnect(event: dh.Event<unknown>): void {
109109
const { detail } = event;
110110
log.info('Reconnect', `${JSON.stringify(detail)}`);
111111
setConnectionState('connected');
@@ -125,7 +125,7 @@ export function ConnectionBootstrap({
125125
if (connection == null) return;
126126

127127
// handles the shutdown event
128-
function handleShutdown(event: CustomEvent): void {
128+
function handleShutdown(event: dh.Event<unknown>): void {
129129
const { detail } = event;
130130
log.info('Shutdown', `${JSON.stringify(detail)}`);
131131
setError(`Server shutdown: ${detail ?? 'Unknown reason'}`);
@@ -146,7 +146,7 @@ export function ConnectionBootstrap({
146146
if (connection == null || isShutdown) return;
147147

148148
// handles the auth failed event
149-
function handleAuthFailed(event: CustomEvent): void {
149+
function handleAuthFailed(event: dh.Event<unknown>): void {
150150
const { detail } = event;
151151
log.warn(
152152
'Reconnect authentication failed',

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.34.0",
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.34.0",
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",

0 commit comments

Comments
 (0)