[Discover] Persist query mode to local storage by AlexGPlay · Pull Request #250388 · elastic/kibana

AlexGPlay · 2026-01-26T11:43:59Z

Summary

Closes #200765

When changing between classic and ES|QL mode we persist it in local storage so the next default session uses that preference.

Before (Example with ESQL)

before.default.query.mov

After (Example with ESQL)

after.default.query.mov

Checklist

Check the PR satisfies following conditions.

Reviewers should verify this PR satisfies this list as well.

Unit or functional tests were updated or added to match the most common scenarios
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.

…storage

elasticmachine · 2026-01-28T14:05:42Z

Pinging @elastic/kibana-data-discovery (Team:DataDiscovery)

davismcphee · 2026-01-30T03:44:40Z

@jughosta could you please take the review on this one?

…storage

jughosta · 2026-01-30T12:54:50Z

            } else {
              dispatch(transitionFromESQLToDataView({ dataViewId: currentDataView?.id ?? '' }));
            }
+            services.storage.set(DISCOVER_QUERY_MODE_KEY, 'classic');


I would suggest to clear the previously saved value then so when we continue with #250038 it would not interfere.

do you mean to instead of save which of the modes was the last one we just store if the last one was ESQL? i guess the problem then is going to be that once ESQL is the default in #250201 if someone switches back to classic it won't use it as the next default

Okay, good point! Then we just need to keep in mind that if users had switched to classic before we enabled ES|QL by default then they will continue using the classic mode without noticing the change in Discover cc @kertal

thx for raising, yes, also didn't think about this. so it makes sense, to store it with classic, but I think further down the road, we might think of solving it differently, because as @jughosta highlighted, one we generally enable ES|QL as default, those users still would see classic ... worth a comment in the code, so it doesn't get lost

…storage

jughosta · 2026-02-03T12:40:21Z

            ) {
              dispatch(internalStateActions.setIsESQLToDataViewTransitionModalVisible(true));
            } else {
              dispatch(transitionFromESQLToDataView({ dataViewId: currentDataView?.id ?? '' }));


Since the transition modal to Classic can be dismissed, the value should not change to classic in this case.

Then a single place in the code, where to move services.storage.set(DISCOVER_QUERY_MODE_KEY, 'classic'); to, might be inside transitionFromESQLToDataView action. Or better as a redux listener to the action.

For consistency we could apply a similar change to transitionFromESQLToDataView.

that makes sense, i thought of that at first but i wasn't sure if we wanted to introduce a side-effect in the redux actions

updated to redux listener in 5a4c68b - it seems to be working but it's my first time doing one redux listener so I hope it's the way it should be

I meant listeners for transitionFromESQLToDataView and transitionFromDataViewToESQL actions. We still want to capture only the manual changes to the mode.

Thanks for looking into it!

i think i got it now a135bf0 🙈

i wasn't sure if we wanted to introduce a side-effect in the redux actions

Just wanted to say this is totally fine to do in thunks and middleware, often preferable even. It keeps the logic consolidated and makes it easy to test.

Personally in your case I'd put the logic directly in the thunk to avoid the extra actions indirection, but middleware works too.

i'm happy with either, i've seen now that i can access the storage in the thunks - no strong opinion from my side

…storage

jughosta

Works well and LGTM 👍
Sorry for the delay!

jughosta · 2026-02-06T12:43:59Z

+        await common.navigateToApp('discover', { path: '' });
+        await testSubjects.existOrFail('discover-dataView-switch-link');
+      });
+    });


Would be nice to also add a test when the path is not empty.

i think the unit tests are kind of covering this scenario, but i can follow up in the feature flag PR with more tests if it doesn't look that way

…storage

elasticmachine · 2026-02-09T09:28:30Z

💚 Build Succeeded

Buildkite Build
Commit: f0a07f3

Metrics [docs]

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	+953.0B

Page load bundle

Size of the bundles that are downloaded on every page load. Target size is below 100kb

id	before	after	diff
`discover`	25.1KB	25.2KB	+39.0B

History

💚 Build #390821 succeeded 479240c
💔 Build #389464 failed a135bf0
💛 Build #388587 was flaky 80c5678
💔 Build #388572 failed bdd9f10
💛 Build #387868 was flaky 57d52ec
💔 Build #386443 failed ebccd71

cc @AlexGPlay

## Summary Closes elastic#200765 When changing between classic and ES|QL mode we persist it in local storage so the next default session uses that preference. --- Before (Example with ESQL) https://github.com/user-attachments/assets/a689c0f9-ff69-4bcb-a8da-108d4693cb56 After (Example with ESQL) https://github.com/user-attachments/assets/bebc03db-a860-4ec9-9843-5e1f0e53f585 ### Checklist Check the PR satisfies following conditions. Reviewers should verify this PR satisfies this list as well. - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios - [x] The PR description includes the appropriate Release Notes section, and the correct `release_note:*` label is applied per the [guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process) - [x] Review the [backport guidelines](https://docs.google.com/document/d/1VyN5k91e5OVumlc0Gb9RPa3h1ewuPE705nRtioPiTvY/edit?usp=sharing) and apply applicable `backport:*` labels.

) ## Summary Closes #250201 Follow up to #250388 - now on top of storing the last used query mode, if there's nothing stored as the last one, and if possible, ES|QL will be the default when the `isEsqlDefault` feature flag is set to true. > [!TIP] > To test it set `feature_flags.overrides.discover.isEsqlDefault` to true in your `kibana.dev.yml` ### Checklist Check the PR satisfies following conditions. Reviewers should verify this PR satisfies this list as well. - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios - [x] The PR description includes the appropriate Release Notes section, and the correct `release_note:*` label is applied per the [guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process) - [x] Review the [backport guidelines](https://docs.google.com/document/d/1VyN5k91e5OVumlc0Gb9RPa3h1ewuPE705nRtioPiTvY/edit?usp=sharing) and apply applicable `backport:*` labels.

Persist query mode to local storage

20b6058

AlexGPlay changed the title ~~Persist query mode to local storage~~ [Discover] Persist query mode to local storage Jan 26, 2026

AlexGPlay and others added 6 commits January 26, 2026 16:12

Reset query mode before testing

d0129fd

Fix tabs code + tests

eeff241

Another test fix

ebccd71

Fix tests

116f0f6

Merge branch 'main' into 200765-persist-esql-or-classic-mode-to-local…

bc3a50f

…storage

Add functional tests

2f1163d

AlexGPlay self-assigned this Jan 28, 2026

AlexGPlay added release_note:enhancement 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 Jan 28, 2026

AlexGPlay commented Jan 28, 2026

View reviewed changes

Comment thread ...gins/shared/discover/public/application/main/state_management/utils/get_initial_app_state.ts Outdated

AlexGPlay marked this pull request as ready for review January 28, 2026 14:05

AlexGPlay requested review from a team as code owners January 28, 2026 14:05

kertal added the Feature:Discover Discover Application label Jan 28, 2026

jbudz approved these changes Jan 28, 2026

View reviewed changes

davismcphee requested a review from jughosta January 30, 2026 03:44

Merge branch 'main' into 200765-persist-esql-or-classic-mode-to-local…

57d52ec

…storage

jughosta reviewed Jan 30, 2026

View reviewed changes

AlexGPlay and others added 5 commits February 2, 2026 08:58

Update dataview check and use uisettings

2d3a1b9

Merge branch 'main' into 200765-persist-esql-or-classic-mode-to-local…

cfb3c95

…storage

Combine functional tests

26d21b8

Use available query mode or classic when _a or _g are present2

bdd9f10

Make hasGlobalState default false

80c5678

jughosta reviewed Feb 3, 2026

View reviewed changes

Move storage updates to redux listener

5a4c68b

AlexGPlay added 4 commits February 3, 2026 17:21

Add comment on the feature flag default

9676c7d

Merge branch 'main' into 200765-persist-esql-or-classic-mode-to-local…

2e24f59

…storage

Create 2 individual actions to listen to

a135bf0

Update functional tests

3e64040

AlexGPlay requested a review from jughosta February 5, 2026 07:21

Merge branch 'main' into 200765-persist-esql-or-classic-mode-to-local…

479240c

…storage

jughosta approved these changes Feb 6, 2026

View reviewed changes

Merge branch 'main' into 200765-persist-esql-or-classic-mode-to-local…

f0a07f3

…storage

AlexGPlay merged commit 35f1f24 into elastic:main Feb 9, 2026
16 checks passed

kibanamachine added the v9.4.0 label Feb 9, 2026

AlexGPlay mentioned this pull request Feb 9, 2026

[Discover] Add feature flag to make ESQL the default query mode #252268

Merged

3 tasks

florent-leborgne mentioned this pull request Mar 31, 2026

Discover remembers your preferred query mode (Classic or ES|QL) elastic/docs-content#5714

Closed

Copilot AI mentioned this pull request Apr 17, 2026

docs(discover): note that Discover persists query mode preference across sessions elastic/docs-content#5972

Merged

3 tasks

Conversation

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

Uh oh!

Summary

Checklist

Uh oh!

Uh oh!

elasticmachine commented Jan 28, 2026

Uh oh!

davismcphee commented Jan 30, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jughosta left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

elasticmachine commented Feb 9, 2026

💚 Build Succeeded

Metrics [docs]

Async chunks

Page load bundle

History

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

AlexGPlay commented Jan 26, 2026 •

edited

Loading