diff --git a/packages/kbn-unified-data-table/src/components/data_table.tsx b/packages/kbn-unified-data-table/src/components/data_table.tsx index 1262619401ab60..07755e0e65769b 100644 --- a/packages/kbn-unified-data-table/src/components/data_table.tsx +++ b/packages/kbn-unified-data-table/src/components/data_table.tsx @@ -828,6 +828,12 @@ export const UnifiedDataTable = ({ const sorting = useMemo(() => { if (isSortEnabled) { + // in ES|QL mode, sorting is disabled when in Document view + // ideally we want the @timestamp column to be sortable server side + // but it needs discussion before moving forward like this + if (isPlainRecord && !columns.length) { + return undefined; + } return { columns: sortingColumns, onSort: onTableSort, @@ -837,7 +843,7 @@ export const UnifiedDataTable = ({ columns: sortingColumns, onSort: () => {}, }; - }, [isSortEnabled, sortingColumns, onTableSort]); + }, [isSortEnabled, sortingColumns, isPlainRecord, columns.length, onTableSort]); const canSetExpandedDoc = Boolean(setExpandedDoc && !!renderDocumentView); diff --git a/test/functional/apps/discover/esql/_esql_view.ts b/test/functional/apps/discover/esql/_esql_view.ts index cea3b6ecce0445..4bd351febc66c4 100644 --- a/test/functional/apps/discover/esql/_esql_view.ts +++ b/test/functional/apps/discover/esql/_esql_view.ts @@ -85,7 +85,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { expect(await testSubjects.exists('discoverQueryHits')).to.be(true); expect(await testSubjects.exists('discoverAlertsButton')).to.be(true); expect(await testSubjects.exists('shareTopNavButton')).to.be(true); - expect(await testSubjects.exists('dataGridColumnSortingButton')).to.be(true); + // we don't sort for the Document view + expect(await testSubjects.exists('dataGridColumnSortingButton')).to.be(false); expect(await testSubjects.exists('docTableExpandToggleColumn')).to.be(true); expect(await testSubjects.exists('fieldListFiltersFieldTypeFilterToggle')).to.be(true); await testSubjects.click('field-@message-showDetails'); diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/esql/_esql_view.ts b/x-pack/test_serverless/functional/test_suites/common/discover/esql/_esql_view.ts index 600ce61167c746..561f8903ba94e1 100644 --- a/x-pack/test_serverless/functional/test_suites/common/discover/esql/_esql_view.ts +++ b/x-pack/test_serverless/functional/test_suites/common/discover/esql/_esql_view.ts @@ -84,7 +84,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await testSubjects.existOrFail('discoverQueryHits'); await testSubjects.existOrFail('discoverAlertsButton'); await testSubjects.existOrFail('shareTopNavButton'); - await testSubjects.existOrFail('dataGridColumnSortingButton'); + await testSubjects.missingOrFail('dataGridColumnSortingButton'); await testSubjects.existOrFail('docTableExpandToggleColumn'); await testSubjects.existOrFail('fieldListFiltersFieldTypeFilterToggle'); await testSubjects.click('field-@message-showDetails');