[Discover] [Group By] Support restoring UI state when switching tabs by davismcphee · Pull Request #253608 · elastic/kibana

davismcphee · 2026-02-18T02:12:02Z

Summary

This PR adds persisted group by UI state in Discover so switching between tabs restores the cascade where the user left it. It preserves the main cascade scroll position, expanded groups, and nested row state for expanded groups, so returning to a tab restores the previous view instead of starting fresh.

Feature flag for testing: feature_flags.overrides.discover.cascadeLayoutEnabled: true

Example queries for testing:

FROM kibana_sample_data_logs | STATS count = COUNT(*) BY extension.keyword
FROM kibana_sample_data_logs | STATS count = COUNT(*) BY ip

Resolves #249456.
Resolves #246985.

Checklist

Any text added follows EUI's writing guidelines, uses sentence case text and includes i18n support
Documentation was added for features that require explanation or tutorials
Unit or functional tests were updated or added to match the most common scenarios
If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the docker list
This was checked for breaking HTTP API changes, and any breaking changes have been approved by the breaking-change committee. The release_note:breaking label should be applied in these situations.
Flaky Test Runner was used on any tests changed
The PR description includes the appropriate Release Notes section, and the correct release_note:* label is applied per the guidelines
Review the backport guidelines and apply applicable backport:* labels.

davismcphee

I was planning to add some FTR tests for the Discover changes, but the scroll restoring doesn't seem to work for me, and I noticed an odd regression. I think we're quite close on this, maybe just need to work through the last bit together including scrolling.

davismcphee

Thanks for working on the scroll restoration @eokoneyo, definitely working better now. I added some functional tests to cover our changes and attempted to fix type and lint errors. Not sure if you have any other changes you need to do, but otherwise at this point I think things work well enough for the MVP once it passes CI.

davismcphee · 2026-02-26T06:25:19Z

+  );
+
+  virtualizerRef.current = useCascadeVirtualizer<DataTableRecord>({
+    // @ts-expect-error -- it's fine to do this as long as we're not using the sticky group header functionality


I'm not a fan of using @ts-expect-error here, but not a blocker for MVP.

I know... I'll make some changes

I've rather opted to track this here #255075, when it gets fixed this will error and we'd remove the @ts-expect-error

kibanamachine · 2026-03-02T07:58:41Z

Cloud deployment initiated, see credentials at: https://buildkite.com/elastic/kibana-deploy-cloud-from-pr/builds/774

macroscopeapp · 2026-03-25T13:54:21Z

+      scrollToVirtualizedIndex: ((offset, options = {}) => {
+        return virtualizerImpl.options.scrollToFn(offset, options, virtualizerImpl);
+      }) satisfies CascadeVirtualizerReturnValue['scrollToVirtualizedIndex'],


🟠 High virtualizer/index.tsx:503

scrollToVirtualizedIndex calls virtualizerImpl.options.scrollToFn(offset, ...) which expects a pixel offset, but scrollToLastVirtualizedRow (line 517) passes rows.length - 1 as an index. This causes scrollToLastVirtualizedRow() to scroll to pixel position N-1 instead of the actual offset of the last row. Consider using virtualizerImpl.scrollToIndex which handles the index-to-offset conversion.

- scrollToVirtualizedIndex: ((offset, options = {}) => { - return virtualizerImpl.options.scrollToFn(offset, options, virtualizerImpl); - }) satisfies CascadeVirtualizerReturnValue['scrollToVirtualizedIndex'],

🤖 Copy this AI Prompt to have your agent fix this:

In file src/platform/packages/shared/shared-ux/document_data_cascade/impl/src/lib/core/virtualizer/index.tsx around lines 503-505: `scrollToVirtualizedIndex` calls `virtualizerImpl.options.scrollToFn(offset, ...)` which expects a pixel offset, but `scrollToLastVirtualizedRow` (line 517) passes `rows.length - 1` as an index. This causes `scrollToLastVirtualizedRow()` to scroll to pixel position `N-1` instead of the actual offset of the last row. Consider using `virtualizerImpl.scrollToIndex` which handles the index-to-offset conversion. Evidence trail: - Kibana code: src/platform/packages/shared/shared-ux/document_data_cascade/impl/src/lib/core/virtualizer/index.tsx lines 454, 503-505, 516-518 at REVIEWED_COMMIT - TanStack Virtual library source: https://github.com/TanStack/virtual/blob/main/packages/virtual-core/src/index.ts - scrollToFn signature shows first parameter is pixel offset, not index (line ~295 type definition, line ~824 _scrollToOffset implementation) - TanStack Virtual scrollToIndex method (line ~716) shows proper index-to-offset conversion using getOffsetForIndex()

kertal · 2026-03-26T08:47:31Z

/ci

eokoneyo · 2026-03-26T12:32:10Z

/ci

kertal · 2026-03-31T06:11:29Z

/ci

eokoneyo · 2026-04-02T06:42:32Z

Latest changes look good, and I tested locally and it's working well 👍 We're still a bit off on scroll position with an expanded group, but we agreed that was ok for tech preview. I pushed one commit (1712043) with a few final cleanups, but otherwise I think it's good to go. I'll have someone else from my team do a final review since I can't approve my own PR.

Appreciate the cleanup... I also made some changes to address valid AI feedback, I'll also reach out to my team to give this a look.

kowalczyk-krzysztof

Code changes LGTM. I didn't test the functionality, leaving that up to @eokoneyo

…a group

- handling for non-viable row marked as expanded in persisted state - get scroll position restoration on switching tabs to work - opt to reset persisted state once the query changes - prevent measurement updates before first paint - improvement to cascade component for restoration phase - scroll position restoration for nested virtualized grid - Minor type cleanup - improve exposed public API for cascade component to include index of topmost visible item - consolidate scroll position restoration into helper hook - leverage scroll restoration util within row grid - consolidate scroll restoration into cascade virtualizer and adopt it for nested virtualizer use case - specify containment options for cascade wrapper, row and cell - defer overscan config till after next paint - Fix types and linting - Fix aggregatedValues badge rendering - Add functional tests - cleanup cascade component - remove reference to removed apis

- structural changes to virtualizer implementation - favor anchor item index over scroll offset for scroll restoration - use cascade virtualizer for nesting in discover - deferred mounting for nested rows - add foundation for controlled child virtualizer - add orchestration for nested virtualized children - adjustments so returning expanded rows do not show loading skeleton - render a loader in place of white screen whilst cascade is bootstrapping

- opt to reset persisted state once the query changes - scroll position restoration for nested virtualized grid - adjustments so scroll restoration matches previous row exactly

akowalska622

Code looks good to me and I tested it locally. I'll leave the final approval to @MiloszRadzynski who volunteered to give it a second look 👀

MiloszRadzynski

LGTM 🚀 Tested I didn't notice any issues! Thank you

eokoneyo · 2026-04-02T17:45:51Z

@elasticmachine merge upstream

davismcphee · 2026-04-03T00:26:48Z

/flaky ftrConfig:src/platform/test/functional/apps/discover/cascade_layout/config.ts:25

kibanamachine · 2026-04-03T00:27:09Z

Flaky Test Runner

✅ Build triggered - kibana-flaky-test-suite-runner#11358

src/platform/test/functional/apps/discover/cascade_layout/config.ts x25

kibanamachine · 2026-04-03T01:40:50Z

Flaky Test Runner Stats

🟠 Some tests failed. - kibana-flaky-test-suite-runner#11358

[❌] src/platform/test/functional/apps/discover/cascade_layout/config.ts: 0/25 tests passed.

see run history

Replace fixed sleep(100) waits with retry-based polling in expectScrollToBeRoughly. The helper already has a 5-second retry window, so the sleep was both wasteful and insufficient. Also measure actual scroll position before tab switch instead of predicting it based on arithmetic, which is unreliable after row expansion.

Wrap isCascadeLayoutRowExpanded and the find+click sequence in toggleCascadeLayoutRow with retry.try() to handle StaleElementReferenceError when the virtualizer re-renders DOM elements between finding and interacting with them.

…te-final

kibanamachine · 2026-04-03T16:54:10Z

Flaky Test Runner Stats

🎉 All tests passed! - kibana-flaky-test-suite-runner#11370

[✅] src/platform/test/functional/apps/discover/cascade_layout/config.ts: 25/25 tests passed.

see run history

elasticmachine · 2026-04-03T17:03:26Z

💛 Build succeeded, but was flaky

Buildkite Build
Commit: 89495e0

Failed CI Steps

Test Failures

[job] [logs] Jest Tests #8 / AssetDocumentTab should select json tab when clicked
[job] [logs] FTR Configs #139 / Entity Analytics - Risk Score Maintainer @ess @serverless @serverlessQA Risk Score Maintainer Resolution Scoring with test log data produces a resolution score that aggregates alerts from both target and alias

Metrics [docs]

Public APIs missing comments

Total count of every public API that lacks a comment. Target amount is 0. Run node scripts/build_api_docs --plugin [yourplugin] --stats comments for more detailed information.

id	before	after	diff
`@kbn/shared-ux-document-data-cascade`	106	105	-1

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id	before	after	diff
`discover`	1.6MB	1.6MB	+1.7KB

Unknown metric groups

API count

id	before	after	diff
`@kbn/shared-ux-document-data-cascade`	127	124	-3

ESLint disabled line counts

id	before	after	diff
`discover`	17	19	+2

Total ESLint disabled count

id	before	after	diff
`discover`	19	21	+2

History

cc @davismcphee

jughosta · 2026-04-07T11:16:13Z

 });

+const NO_VALUE_PLACEHOLDER = i18n.translate('discover.dataCascade.row.action.noValue', {
+  defaultMessage: '(blank)',


(blank) we use for empty strings when formatting field values. Wonder if (null) fit better here.

https://github.com/elastic/kibana/blob/3d0320d0c1ca5f6481e8044cdaf56d8f1b0c7d26/src/platform/packages/shared/kbn-field-formats-common/constants.ts

Yes I think that makes sense. Opened a followup issue for it here: #261839.

davismcphee self-assigned this Feb 18, 2026

davismcphee added release_note:skip Skip the PR/issue when compiling release notes backport:skip This PR does not require backporting Team:DataDiscovery Discover, search (data plugin and KQL), data views, saved searches. For ES|QL, use Team:ES|QL. t// labels Feb 18, 2026

This was referenced Feb 18, 2026

[Discover] [Group by] Support restoring UI state when switching tabs (attempt 2) #253074

Closed

[Discover] [Group by] Support restoring UI state when switching tabs #252888

Closed

davismcphee commented Feb 19, 2026

View reviewed changes

Comment thread ...er/public/application/main/components/layout/cascaded_documents/cascaded_document_layout.tsx

Comment thread ...er/public/application/main/components/layout/cascaded_documents/cascaded_document_layout.tsx Outdated

eokoneyo force-pushed the discover-group-by-ui-state-final branch from 828b0d6 to 6a20f72 Compare February 23, 2026 13:49

davismcphee commented Feb 24, 2026

View reviewed changes

Comment thread ...er/public/application/main/components/layout/cascaded_documents/cascaded_document_layout.tsx

eokoneyo reviewed Feb 25, 2026

View reviewed changes

davismcphee commented Feb 26, 2026

View reviewed changes

eokoneyo force-pushed the discover-group-by-ui-state-final branch from b532874 to b55b542 Compare February 26, 2026 12:53

kertal added the ci:cloud-deploy Create or update a Cloud deployment label Mar 2, 2026

kertal mentioned this pull request Mar 3, 2026

[Discover][Group By] Lag when restoring a previously visited tab #255745

Closed

davismcphee mentioned this pull request Mar 9, 2026

[Cascade] Fixes oddities in the cascade in discover experience #256417

Merged

eokoneyo force-pushed the discover-group-by-ui-state-final branch from ed79e0f to 5d2743c Compare March 16, 2026 10:34

eokoneyo force-pushed the discover-group-by-ui-state-final branch 2 times, most recently from 1f25625 to c827c6e Compare March 25, 2026 13:44

macroscopeapp Bot reviewed Mar 25, 2026

View reviewed changes

eokoneyo force-pushed the discover-group-by-ui-state-final branch from c827c6e to ba60223 Compare March 25, 2026 16:03

macroscopeapp Bot reviewed Mar 25, 2026

View reviewed changes

Comment thread src/platform/packages/shared/shared-ux/document_data_cascade/impl/src/lib/core/api/index.ts Outdated

eokoneyo force-pushed the discover-group-by-ui-state-final branch from ba60223 to 0000ee1 Compare March 25, 2026 16:31

eokoneyo force-pushed the discover-group-by-ui-state-final branch from 627a902 to 0e1f7dd Compare March 30, 2026 14:04

eokoneyo force-pushed the discover-group-by-ui-state-final branch from 0e1f7dd to 8cc9f5a Compare March 31, 2026 07:46

kertal removed the ci:cloud-deploy Create or update a Cloud deployment label Mar 31, 2026

eokoneyo force-pushed the discover-group-by-ui-state-final branch from 8cc9f5a to a7a82c5 Compare March 31, 2026 11:39

kowalczyk-krzysztof approved these changes Apr 2, 2026

View reviewed changes

davismcphee and others added 11 commits April 2, 2026 14:48

Restore data cascade state in Discover

b77a543

Restore nested grid UI state

916c30b

Ensure nested grid state is up to date when collapsing and expanding …

812ea69

…a group

scroll position restoration on switching tabs in discover

96492ef

- opt to reset persisted state once the query changes - scroll position restoration for nested virtualized grid - adjustments so scroll restoration matches previous row exactly

fix build type issues

e61cfed

resolve failing tests

0dc5674

fix failing test resulting from conflict resolution

5006845

Small cleanups

7409bdf

attend to AI suggested improvements

abd90a1

akowalska622 reviewed Apr 2, 2026

View reviewed changes

MiloszRadzynski approved these changes Apr 2, 2026

View reviewed changes

elasticmachine and others added 3 commits April 2, 2026 10:45

Merge branch 'main' into discover-group-by-ui-state-final

1d90e83

Fix the flake

d6f0cf6

Merge branch 'main' into discover-group-by-ui-state-final

0510619

kertal added 3 commits April 3, 2026 17:40

Merge remote-tracking branch 'upstream' into discover-group-by-ui-sta…

89495e0

…te-final

eokoneyo mentioned this pull request Apr 5, 2026

Restore data cascade state in Discover #261127

Closed

10 tasks

jughosta reviewed Apr 7, 2026

View reviewed changes

davismcphee mentioned this pull request Apr 7, 2026

[Discover] [Group By] Change aggregate value display from (blank)to (null) for missing values #261839

Open

Conversation

davismcphee commented Feb 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Checklist

Uh oh!

davismcphee left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

davismcphee left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

davismcphee Feb 26, 2026

Choose a reason for hiding this comment

Uh oh!

eokoneyo Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eokoneyo Feb 26, 2026

Choose a reason for hiding this comment

Uh oh!

kibanamachine commented Mar 2, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

macroscopeapp Bot Mar 25, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

kertal commented Mar 26, 2026

Uh oh!

eokoneyo commented Mar 26, 2026

Uh oh!

kertal commented Mar 31, 2026

Uh oh!

eokoneyo commented Apr 2, 2026

Uh oh!

kowalczyk-krzysztof left a comment

Choose a reason for hiding this comment

Uh oh!

akowalska622 left a comment

Choose a reason for hiding this comment

Uh oh!

MiloszRadzynski left a comment

Choose a reason for hiding this comment

Uh oh!

eokoneyo commented Apr 2, 2026

Uh oh!

davismcphee commented Apr 3, 2026

Uh oh!

kibanamachine commented Apr 3, 2026

Flaky Test Runner

✅ Build triggered - kibana-flaky-test-suite-runner#11358

Uh oh!

kibanamachine commented Apr 3, 2026

Flaky Test Runner Stats

🟠 Some tests failed. - kibana-flaky-test-suite-runner#11358

Uh oh!

kibanamachine commented Apr 3, 2026

Flaky Test Runner Stats

🎉 All tests passed! - kibana-flaky-test-suite-runner#11370

Uh oh!

elasticmachine commented Apr 3, 2026

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

Metrics [docs]

davismcphee commented Feb 18, 2026 •

edited

Loading

davismcphee left a comment •

edited

Loading

eokoneyo Feb 26, 2026 •

edited

Loading