Skip to content

[Discover][ES|QL mode] Clear time field sorting after going from Classic to ES|QL mode #235338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MiloszRadzynski merged 3 commits into from
Sep 19, 2025
Merged

[Discover][ES|QL mode] Clear time field sorting after going from Classic to ES|QL mode #235338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bba4ad5
Clear timefilter sorting after going from classic to ES|QL mode
MiloszRadzynski Sep 17, 2025
090eb5b
Update the discover state test to cover the clearing sort state case
MiloszRadzynski Sep 17, 2025
40bb902
Merge branch 'main' into discover-clear-timefield-sort-after-going-to…
MiloszRadzynski Sep 17, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions ...m/plugins/shared/discover/public/application/main/state_management/discover_state.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
savedSearchMockWithESQL,
} from '../../../__mocks__/saved_search';
import { createDiscoverServicesMock } from '../../../__mocks__/services';
import { dataViewMock } from '@kbn/discover-utils/src/__mocks__';
import { dataViewMock, dataViewMockWithTimeField } from '@kbn/discover-utils/src/__mocks__';
import { getInitialState } from './discover_app_state_container';
import { waitFor } from '@testing-library/react';
import { FetchStatus } from '../../types';
Expand Down Expand Up @@ -1054,11 +1054,18 @@ describe('Discover state', () => {
globalState: { filters },
})
);
state.appState.set({ query });
await state.actions.transitionFromDataViewToESQL(dataViewMock);
state.appState.set({
query,
sort: [
['@timestamp', 'asc'],
['bytes', 'desc'],
],
});
await state.actions.transitionFromDataViewToESQL(dataViewMockWithTimeField);
expect(state.appState.getState().query).toStrictEqual({
esql: 'FROM the-data-view-title | WHERE KQL("""foo: \'bar\'""")',
});
expect(state.appState.getState().sort).toEqual([['bytes', 'desc']]);
expect(state.getCurrentTab().globalState.filters).toStrictEqual([]);
expect(state.appState.getState().filters).toStrictEqual([]);
});
Expand Down
15 changes: 14 additions & 1 deletion ...atform/plugins/shared/discover/public/application/main/state_management/discover_state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,11 +357,23 @@ export function getDiscoverStateContainer({
});
};

const clearTimeFieldFromSort = (
sort: DiscoverAppState['sort'],
timeFieldName: string | undefined
) => {
if (!Array.isArray(sort) || !timeFieldName) return sort;

const filteredSort = sort.filter(([field]) => field !== timeFieldName);

return filteredSort;
};

const transitionFromDataViewToESQL = (dataView: DataView) => {
const appState = appStateContainer.get();
const { query } = appState;
const { query, sort } = appState;
const filterQuery = query && isOfQueryType(query) ? query : undefined;
const queryString = getInitialESQLQuery(dataView, true, filterQuery);
const clearedSort = clearTimeFieldFromSort(sort, dataView?.timeFieldName);

appStateContainer.update({
query: { esql: queryString },
Expand All @@ -370,6 +382,7 @@ export function getDiscoverStateContainer({
type: DataSourceType.Esql,
},
columns: [],
sort: clearedSort,
});

// clears pinned filters
Expand Down