From b5442e50fb845340e55eb6481bbeaab12e3cb462 Mon Sep 17 00:00:00 2001 From: Elizabet Oliveira Date: Wed, 21 Oct 2026 16:55:04 +0100 Subject: [PATCH 1/7] feat(app): mount Columns and Sort on the search page SELECT and ORDER BY move off the query form onto the results table, and the where row wraps under the time controls on a narrow form. Co-authored-by: Cursor --- .changeset/search-columns-sort-popovers.md | 5 + packages/app/src/DBSearchPage.tsx | 263 +++++++++--------- .../DBSearchPage.directTrace.test.tsx | 9 + packages/app/src/components/DBRowTable.tsx | 195 +++++++------ .../components/DBSqlRowTableWithSidebar.tsx | 8 +- packages/app/styles/SearchPage.module.scss | 42 +++ .../e2e/features/search/saved-search.spec.ts | 122 ++++---- .../tests/e2e/features/search/search.spec.ts | 5 +- .../e2e/features/shared/input-focus.spec.ts | 2 + .../e2e/features/shared/multiline.spec.ts | 9 +- .../app/tests/e2e/page-objects/SearchPage.ts | 77 ++++- 11 files changed, 448 insertions(+), 289 deletions(-) create mode 100644 .changeset/search-columns-sort-popovers.md diff --git a/.changeset/search-columns-sort-popovers.md b/.changeset/search-columns-sort-popovers.md new file mode 100644 index 0000000000..6bd0e8ed0e --- /dev/null +++ b/.changeset/search-columns-sort-popovers.md @@ -0,0 +1,5 @@ +--- +'@hyperdx/app': minor +--- + +feat: Edit search SELECT and ORDER BY from Columns and Sort popovers on the results table, and tidy the table controls row diff --git a/packages/app/src/DBSearchPage.tsx b/packages/app/src/DBSearchPage.tsx index 9f5f62522c..88d515a8a3 100644 --- a/packages/app/src/DBSearchPage.tsx +++ b/packages/app/src/DBSearchPage.tsx @@ -112,10 +112,12 @@ import SearchWhereInput, { getStoredLanguage, } from '@/components/SearchInput/SearchWhereInput'; import SearchPageActionBar from '@/components/SearchPageActionBar'; +import { ColumnsPopover } from '@/components/SearchResultsToolbar/ColumnsPopover'; +import { SortPopover } from '@/components/SearchResultsToolbar/SortPopover'; +import { useClauseFieldOptions } from '@/components/SearchResultsToolbar/useClauseFieldOptions'; import SearchTotalCountChart from '@/components/SearchTotalCountChart'; import { TableSourceForm } from '@/components/Sources/SourceForm'; import { SourceSelectControlled } from '@/components/SourceSelect'; -import { SQLInlineEditorControlled } from '@/components/SQLEditor/SQLInlineEditor'; import { Tags } from '@/components/Tags'; import { TimePicker } from '@/components/TimePicker'; import { IS_LOCAL_MODE } from '@/config'; @@ -1146,9 +1148,6 @@ function DBSearchPageContent() { // key from a phone would collapse the sidebar the next time the same // browser opens the page on a desktop. const [isCompactFiltersOpen, setIsCompactFiltersOpen] = useState(false); - // SELECT grows with its text. On a phone that pushes the logs off the - // screen, so the column editors stay closed until the user asks. - const [columnsOpen, setColumnsOpen] = useState(false); const isCompact = useCompactViewport(); const filtersCollapsed = isCompact ? !isCompactFiltersOpen @@ -2171,6 +2170,15 @@ function DBSearchPageContent() { [inputSourceObj], ); + const inputSelect = useWatch({ name: 'select', control }); + const inputOrderBy = useWatch({ name: 'orderBy', control }); + const clauseFieldOptions = useClauseFieldOptions({ + tableConnection: inputSourceTableConnection, + columns: inputSourceColumns, + dateRange: searchedTimeRange, + timestampValueExpression: inputSourceObj?.timestampValueExpression, + }); + const [isSourceSchemaPreviewOpen, setIsSourceSchemaPreviewOpen] = useState(false); @@ -2293,51 +2301,57 @@ function DBSearchPageContent() { [setValue, setNewSourceModalClosed], ); - const columnFields = (allowMultiline: boolean, stacked: boolean) => { - const select = ( - - ); - const orderBy = ( - - ); - if (stacked) { - return ( - <> - {select} - {orderBy} - - ); - } - return ( - <> - {select} - {orderBy} - - ); - }; + const applySelect = useCallback( + (select: string, removedItems: string[]) => { + setValue('select', select); + let orderBy = getValues('orderBy') ?? ''; + for (const item of removedItems) { + orderBy = orderByAfterRemovingSelectItem( + item, + orderBy, + defaultSearchConfig.orderBy ?? '', + ); + } + setValue('orderBy', orderBy); + onSubmit(); + }, + [setValue, getValues, defaultSearchConfig.orderBy, onSubmit], + ); + + const applyOrderBy = useCallback( + (orderBy: string) => { + setValue('orderBy', orderBy); + onSubmit(); + }, + [setValue, onSubmit], + ); + + // SELECT and ORDER BY shape the results table, so they sit on that table + // and stay hidden on Event Deltas and Event Patterns. + const resultsClauseEditors = + analysisMode === 'results' ? ( + + + + + ) : null; return ( - setIsSourceSchemaPreviewOpen(false)} - /> - {!isCompact && columnFields(true, false)} - <> + {!savedSearchId ? ( @@ -2525,7 +2533,6 @@ function DBSearchPageContent() { onClick={() => { setSaveSearchModalState('update'); }} - style={{ flexShrink: 0 }} > Update @@ -2536,7 +2543,6 @@ function DBSearchPageContent() { variant="secondary" size="xs" onClick={openAlertModal} - style={{ flexShrink: 0 }} > Alerts @@ -2544,74 +2550,53 @@ function DBSearchPageContent() { )} - {isCompact && ( - - )} - + - {isCompact && columnsOpen && ( - - {columnFields(false, true)} - - )} - - - + + + - + + + {isLive && ( @@ -2635,6 +2620,22 @@ function DBSearchPageContent() { + setIsSourceSchemaPreviewOpen(false)} + /> + + {!queryReady ? ( - } - title="No data to display" - description="Select a source and click the play button to query data." - /> + + {resultsClauseEditors != null && ( + + {resultsClauseEditors} + + )} + } + title="No data to display" + description="Select a source and click the play button to query data." + /> + ) : ( <> + {resultsClauseEditors != null && ( + + {resultsClauseEditors} + + )}
{whereSuggestions && whereSuggestions.length > 0 && ( @@ -3031,6 +3044,8 @@ function DBSearchPageContent() { selectionResetKey={selectionResetKey} onSelectedRowsChange={onSelectedRowsChange} onResolvedColumnsChange={onResolvedColumnsChange} + toolbarLeading={resultsClauseEditors} + controlsAboveTable /> )} diff --git a/packages/app/src/__tests__/DBSearchPage.directTrace.test.tsx b/packages/app/src/__tests__/DBSearchPage.directTrace.test.tsx index 5b335588ff..4e7cf0e478 100644 --- a/packages/app/src/__tests__/DBSearchPage.directTrace.test.tsx +++ b/packages/app/src/__tests__/DBSearchPage.directTrace.test.tsx @@ -196,6 +196,15 @@ jest.mock('@/components/SearchGroupBy/SearchGroupBySelect', () => ({ SearchGroupBySelect: () =>
, })); jest.mock('@/components/SearchPageActionBar', () => () =>
); +jest.mock('@/components/SearchResultsToolbar/ColumnsPopover', () => ({ + ColumnsPopover: () =>
, +})); +jest.mock('@/components/SearchResultsToolbar/SortPopover', () => ({ + SortPopover: () =>
, +})); +jest.mock('@/components/SearchResultsToolbar/useClauseFieldOptions', () => ({ + useClauseFieldOptions: () => [], +})); jest.mock('@/components/SearchTotalCountChart', () => () =>
); jest.mock('@/components/Sources/SourceForm', () => ({ TableSourceForm: () =>
, diff --git a/packages/app/src/components/DBRowTable.tsx b/packages/app/src/components/DBRowTable.tsx index 6e5885b4a8..0fb7b7d0ca 100644 --- a/packages/app/src/components/DBRowTable.tsx +++ b/packages/app/src/components/DBRowTable.tsx @@ -40,13 +40,13 @@ import { TSource, } from '@hyperdx/common-utils/dist/types'; import { + ActionIcon, Box, Flex, Group, Modal, Text, Tooltip as MantineTooltip, - UnstyledButton, } from '@mantine/core'; import { IconCode, @@ -389,6 +389,8 @@ export const RawLogTable = memo( getRowWhere, variant = 'default', onRemoveColumn, + toolbarLeading, + controlsAboveTable = false, }: { wrapLines?: boolean; displayedColumns: string[]; @@ -432,6 +434,10 @@ export const RawLogTable = memo( getRowWhere?: (row: Record) => RowWhereResult; variant?: DBRowTableVariant; onRemoveColumn?: (column: string) => void; + /** Rendered on the left of the bar above the table. */ + toolbarLeading?: React.ReactNode; + /** Keep the header actions above the table instead of in the last column. */ + controlsAboveTable?: boolean; }) => { const dedupedRows = useMemo(() => { const lIds = new Set(); @@ -1031,8 +1037,107 @@ export const RawLogTable = memo( [], ); + // Above the scroll area, so a wide table can't scroll these out of view. + const wrapLinesLabel = wrapLinesEnabled ? 'Unwrap lines' : 'Wrap lines'; + const csvLabel = `Download as CSV (max ${maxRows.toLocaleString()} rows)${isLimited ? ', data truncated' : ''}`; + const rowSelectionMenu = enableRowSelection ? ( + + ) : null; + + const tableControls = ( + + {tableId && Object.keys(columnSizeStorage).length > 0 && ( + + setColumnSizeStorage({})} + aria-label="Reset column widths" + > + + + + )} + + setWrapLinesEnabled(prev => !prev)} + aria-label={wrapLinesLabel} + > + {wrapLinesEnabled ? ( + + ) : ( + + )} + + + {config && ( + + handleSqlModalOpen(true)} + aria-label="Show generated SQL" + > + + + + )} + + + + + + + + {onSettingsClick != null && ( + + onSettingsClick()} + aria-label="Settings" + > + + + + )} + {!controlsAboveTable && rowSelectionMenu} + + ); + return ( + {(controlsAboveTable || toolbarLeading != null) && ( + + + {toolbarLeading} + {controlsAboveTable && rowSelectionMenu} + + {controlsAboveTable && ( + + {tableControls} + + )} + + )} {/* Find within page search bar - floating on top right */} - {tableId && - Object.keys(columnSizeStorage).length > 0 && ( - setColumnSizeStorage({})} - title="Reset Column Widths" - display="flex" - > - - - - - )} - {config && ( - handleSqlModalOpen(true)} - title="Show Generated SQL" - tabIndex={0} - display="flex" - > - - - - - )} - - setWrapLinesEnabled(prev => !prev) - } - title={`${wrapLinesEnabled ? 'Disable' : 'Enable'} Wrap Lines`} - display="flex" - > - - {wrapLinesEnabled ? ( - - ) : ( - - )} - - - - - - - - - {onSettingsClick != null && ( - onSettingsClick()} - title="Settings" - display="flex" - > - - - - - )} - {enableRowSelection && ( - - )} - + controlsAboveTable ? undefined : tableControls } /> ); @@ -1677,6 +1702,8 @@ function DBSqlRowTableComponent({ tableId, errorVariant, onResolvedColumnsChange, + toolbarLeading, + controlsAboveTable, }: { config: BuilderChartConfigWithDateRange; sourceId?: string; @@ -1710,6 +1737,8 @@ function DBSqlRowTableComponent({ tableId?: string; errorVariant?: ChartErrorStateVariant; onResolvedColumnsChange?: (meta: ColumnMetaType[]) => void; + toolbarLeading?: React.ReactNode; + controlsAboveTable?: boolean; }) { const { data: me } = api.useMe(); const { toggleColumn, displayedColumns: contextDisplayedColumns } = @@ -2033,6 +2062,8 @@ function DBSqlRowTableComponent({ variant={variant} onRemoveColumn={toggleColumn ? onRemoveColumnFromTable : undefined} tableId={tableId} + toolbarLeading={toolbarLeading} + controlsAboveTable={controlsAboveTable} /> ); diff --git a/packages/app/src/components/DBSqlRowTableWithSidebar.tsx b/packages/app/src/components/DBSqlRowTableWithSidebar.tsx index c683786711..bdb6b34820 100644 --- a/packages/app/src/components/DBSqlRowTableWithSidebar.tsx +++ b/packages/app/src/components/DBSqlRowTableWithSidebar.tsx @@ -1,4 +1,4 @@ -import { useCallback, useState } from 'react'; +import { type ReactNode, useCallback, useState } from 'react'; import { useQueryState } from 'nuqs'; import { ClickHouseQueryError, @@ -50,6 +50,8 @@ interface Props { selectionResetKey?: string; onSelectedRowsChange?: (hasSelectedRows: boolean) => void; onResolvedColumnsChange?: (meta: ColumnMetaType[]) => void; + toolbarLeading?: ReactNode; + controlsAboveTable?: boolean; // Clicking outside the row side panel (and outside `keepOpenSelector`) closes // it. Enabled by default; pass `false` to opt out. closeOnClickOutside?: boolean; @@ -82,6 +84,8 @@ export default function DBSqlRowTableWithSideBar({ selectionResetKey, onSelectedRowsChange, onResolvedColumnsChange, + toolbarLeading, + controlsAboveTable, closeOnClickOutside = true, keepOpenSelector = DEFAULT_KEEP_OPEN_SELECTOR, }: Props) { @@ -163,6 +167,8 @@ export default function DBSqlRowTableWithSideBar({ selectionResetKey={selectionResetKey} onSelectedRowsChange={onSelectedRowsChange} onResolvedColumnsChange={onResolvedColumnsChange} + toolbarLeading={toolbarLeading} + controlsAboveTable={controlsAboveTable} /> ); diff --git a/packages/app/styles/SearchPage.module.scss b/packages/app/styles/SearchPage.module.scss index 713ee35f05..e291a44a94 100644 --- a/packages/app/styles/SearchPage.module.scss +++ b/packages/app/styles/SearchPage.module.scss @@ -171,4 +171,46 @@ z-index: 4; padding-bottom: var(--mantine-spacing-xs); border-bottom: 1px solid var(--color-border); + + // The where row uses this width. 900px is the compact search cutoff. + container-type: inline-size; +} + +.whereRow { + flex-wrap: wrap; +} + +.whereField { + flex: 1 1 0%; + max-width: 100%; + min-width: 0; +} + +.timeControls { + flex: 0 0 auto; + max-width: 100%; +} + +.timePicker { + width: 350px; + max-width: 100%; + min-width: 0; +} + +// Stack the where clause once the form itself is under 900px. Wider than +// that, it stays beside the time controls. Matches the compact layout cutoff. +@container (min-width: 900px) { + .whereRow { + flex-wrap: nowrap; + } +} + +@container (max-width: 899px) { + .whereField { + flex-basis: 100%; + } + + .timeControls { + flex-basis: 100%; + } } diff --git a/packages/app/tests/e2e/features/search/saved-search.spec.ts b/packages/app/tests/e2e/features/search/saved-search.spec.ts index 9201f730d3..610c189a2c 100644 --- a/packages/app/tests/e2e/features/search/saved-search.spec.ts +++ b/packages/app/tests/e2e/features/search/saved-search.spec.ts @@ -98,10 +98,10 @@ test.describe('Saved Search Functionality', () => { }); await test.step('Verify custom SELECT is preserved', async () => { - const selectEditor = searchPage.getSELECTEditor(); - await expect(selectEditor).toContainText( - 'upper(ServiceName) as service_name', - ); + const selectValue = () => searchPage.getSelectValue(); + await expect + .poll(selectValue) + .toContain('upper(ServiceName) as service_name'); }); }, ); @@ -140,11 +140,11 @@ test.describe('Saved Search Functionality', () => { }); await test.step('Verify different source has its own default SELECT', async () => { - const selectEditor = searchPage.getSELECTEditor(); - await expect(selectEditor).not.toContainText( - 'lower(Body) as body_lower', - ); - await expect(selectEditor).toContainText('Timestamp'); + const selectValue = () => searchPage.getSelectValue(); + await expect + .poll(selectValue) + .not.toContain('lower(Body) as body_lower'); + await expect.poll(selectValue).toContain('Timestamp'); }); await test.step('Navigate back to saved search', async () => { @@ -153,12 +153,12 @@ test.describe('Saved Search Functionality', () => { }); await test.step('Verify saved search SELECT is restored', async () => { - const selectEditor = searchPage.getSELECTEditor(); + const selectValue = () => searchPage.getSelectValue(); // Verifies the fix: SELECT restores to saved search's custom value - await expect(selectEditor).toContainText('lower(Body) as body_lower'); - await expect(selectEditor).toContainText( - 'Timestamp, Body, lower(Body)', - ); + await expect.poll(selectValue).toContain('lower(Body) as body_lower'); + await expect + .poll(selectValue) + .toContain('Timestamp, Body, lower(Body)'); }); }, ); @@ -186,11 +186,11 @@ test.describe('Saved Search Functionality', () => { }); await test.step('Verify SELECT changed to the new source default', async () => { - const selectEditor = searchPage.getSELECTEditor(); - await expect(selectEditor).not.toContainText( - 'lower(ServiceName) as service_name', - ); - await expect(selectEditor).toContainText('Timestamp'); + const selectValue = () => searchPage.getSelectValue(); + await expect + .poll(selectValue) + .not.toContain('lower(ServiceName) as service_name'); + await expect.poll(selectValue).toContain('Timestamp'); }); await test.step('Switch back to original source via dropdown', async () => { @@ -201,10 +201,10 @@ test.describe('Saved Search Functionality', () => { }); await test.step('Verify SELECT is search custom SELECT', async () => { - const selectEditor = searchPage.getSELECTEditor(); - await expect(selectEditor).toContainText( - 'lower(ServiceName) as service_name', - ); + const selectValue = () => searchPage.getSelectValue(); + await expect + .poll(selectValue) + .toContain('lower(ServiceName) as service_name'); }); }, ); @@ -255,9 +255,9 @@ test.describe('Saved Search Functionality', () => { expect(savedSearchParams.has('to')).toBe(false); await expect(searchPage.input).toHaveValue('SeverityText:info'); - await expect(searchPage.getOrderByEditor()).toContainText( - customOrderBy, - ); + await expect + .poll(() => searchPage.getOrderByValue()) + .toContain(customOrderBy); // Capture the saved search URL (without query params) savedSearchUrl = page.url().split('?')[0]; @@ -289,8 +289,8 @@ test.describe('Saved Search Functionality', () => { await expect(whereInput).toHaveValue('SeverityText:info'); // Verify ORDER BY is restored - const orderByEditor = searchPage.getOrderByEditor(); - await expect(orderByEditor).toContainText('ServiceName ASC'); + const orderByValue = () => searchPage.getOrderByValue(); + await expect.poll(orderByValue).toContain('ServiceName ASC'); // Verify search results are visible (search executed automatically) await searchPage.table.waitForRowsToPopulate(); @@ -343,11 +343,11 @@ test.describe('Saved Search Functionality', () => { await searchPage.table.waitForRowsToPopulate(true); // Verify SELECT content - const selectEditor = searchPage.getSELECTEditor(); - await expect(selectEditor).toContainText( - 'upper(ServiceName) as service_name', - ); - await expect(selectEditor).toContainText('Timestamp, Body'); + const selectValue = () => searchPage.getSelectValue(); + await expect + .poll(selectValue) + .toContain('upper(ServiceName) as service_name'); + await expect.poll(selectValue).toContain('Timestamp, Body'); }); }, ); @@ -401,9 +401,9 @@ test.describe('Saved Search Functionality', () => { }); await test.step('The tweak survives, in the form and in the URL', async () => { - await expect(searchPage.getSELECTEditor()).toContainText( - 'lower(Body) as body_lower', - ); + await expect + .poll(() => searchPage.getSelectValue()) + .toContain('lower(Body) as body_lower'); expect(new URL(page.url()).searchParams.get('select')).toContain( 'lower(Body)', ); @@ -427,10 +427,10 @@ test.describe('Saved Search Functionality', () => { }); await test.step('Verify default SELECT is loaded', async () => { - const selectEditor = searchPage.getSELECTEditor(); - await expect(selectEditor).toContainText( - 'Timestamp, ServiceName, SeverityText, Body', - ); + const selectValue = () => searchPage.getSelectValue(); + await expect + .poll(selectValue) + .toContain('Timestamp, ServiceName, SeverityText, Body'); }); await test.step('Navigate to dashboards page', async () => { @@ -444,10 +444,10 @@ test.describe('Saved Search Functionality', () => { }); await test.step('Verify default SELECT is loaded', async () => { - const selectEditor = searchPage.getSELECTEditor(); - await expect(selectEditor).toContainText( - 'Timestamp, ServiceName, SeverityText, Body', - ); + const selectValue = () => searchPage.getSelectValue(); + await expect + .poll(selectValue) + .toContain('Timestamp, ServiceName, SeverityText, Body'); }); }, ); @@ -531,16 +531,16 @@ test.describe('Saved Search Functionality', () => { }); await test.step('Verify ORDER BY changed to second source default', async () => { - const orderByEditor = searchPage.getOrderByEditor(); + const orderByValue = () => searchPage.getOrderByValue(); // Should not contain the custom ORDER BY from the saved search - await expect(orderByEditor).not.toHaveText('Body DESC', { - timeout: 5000, - }); - await expect(orderByEditor).toHaveText(/(Timestamp|timestamp)/i, { - timeout: 5000, - }); + await expect + .poll(orderByValue, { timeout: 5000 }) + .not.toBe('Body DESC'); + await expect + .poll(orderByValue, { timeout: 5000 }) + .toMatch(/(Timestamp|timestamp)/i); }); await test.step('Switch back to original source', async () => { @@ -556,8 +556,8 @@ test.describe('Saved Search Functionality', () => { }); await test.step('Verify ORDER BY restored to saved search custom value', async () => { - const orderByEditor = searchPage.getOrderByEditor(); - await expect(orderByEditor).toHaveText('Body DESC', { timeout: 5000 }); + const orderByValue = () => searchPage.getOrderByValue(); + await expect.poll(orderByValue, { timeout: 5000 }).toBe('Body DESC'); }); }, ); @@ -780,10 +780,10 @@ test.describe('Saved Search Functionality', () => { await test.step('Verify the new search preserved the SELECT', async () => { await searchPage.table.waitForRowsToPopulate(); - const selectEditor = searchPage.getSELECTEditor(); - await expect(selectEditor).toContainText( - 'upper(ServiceName) as service_upper', - ); + const selectValue = () => searchPage.getSelectValue(); + await expect + .poll(selectValue) + .toContain('upper(ServiceName) as service_upper'); }); await test.step('Verify the new search preserved the WHERE', async () => { @@ -796,10 +796,10 @@ test.describe('Saved Search Functionality', () => { await searchPage.table.waitForRowsToPopulate(); await expect(searchPage.input).toHaveValue('SeverityText:info'); - const selectEditor = searchPage.getSELECTEditor(); - await expect(selectEditor).toContainText( - 'upper(ServiceName) as service_upper', - ); + const selectValue = () => searchPage.getSelectValue(); + await expect + .poll(selectValue) + .toContain('upper(ServiceName) as service_upper'); }); }, ); diff --git a/packages/app/tests/e2e/features/search/search.spec.ts b/packages/app/tests/e2e/features/search/search.spec.ts index 3f72a5cba8..7ed7f20497 100644 --- a/packages/app/tests/e2e/features/search/search.spec.ts +++ b/packages/app/tests/e2e/features/search/search.spec.ts @@ -314,10 +314,7 @@ test.describe('Search', { tag: '@search' }, () => { expect(url, 'URL should contain select parameter').toContain('select='); expect(url, 'URL should contain alias "message"').toContain('message'); - // Verify SELECT editor content using page object - const selectEditor = searchPage.getSELECTEditor(); - await expect(selectEditor).toBeVisible(); - const selectValue = await selectEditor.textContent(); + const selectValue = await searchPage.getSelectValue(); expect(selectValue, 'SELECT should contain alias').toContain( 'Body as message', diff --git a/packages/app/tests/e2e/features/shared/input-focus.spec.ts b/packages/app/tests/e2e/features/shared/input-focus.spec.ts index 984d80f7ea..1812e7ce83 100644 --- a/packages/app/tests/e2e/features/shared/input-focus.spec.ts +++ b/packages/app/tests/e2e/features/shared/input-focus.spec.ts @@ -41,12 +41,14 @@ test.describe('Query input focus states', { tag: '@search' }, () => { const searchPage = new SearchPage(page); await searchPage.goto(); + await searchPage.openSelectEditor(); const selectBlurred = await searchPage.getSelectBorderColor(); await searchPage.getSELECTEditor().focus(); await expect .poll(() => searchPage.getSelectBorderColor()) .not.toBe(selectBlurred); + await searchPage.openOrderByEditor(); const orderByBlurred = await searchPage.getOrderByBorderColor(); await searchPage.getOrderByEditor().focus(); await expect diff --git a/packages/app/tests/e2e/features/shared/multiline.spec.ts b/packages/app/tests/e2e/features/shared/multiline.spec.ts index 0696d75cef..df0df202bb 100644 --- a/packages/app/tests/e2e/features/shared/multiline.spec.ts +++ b/packages/app/tests/e2e/features/shared/multiline.spec.ts @@ -60,10 +60,11 @@ test.describe('Multiline Input', { tag: '@search' }, () => { const searchPage = new SearchPage(page); await searchPage.goto(); - for (const field of [ - searchPage.selectClauseField(), - searchPage.orderByClauseField(), - ]) { + for (const [open, field] of [ + [() => searchPage.openSelectEditor(), searchPage.selectClauseField()], + [() => searchPage.openOrderByEditor(), searchPage.orderByClauseField()], + ] as const) { + await open(); await expect(field.focusTarget).toBeVisible(); await searchPage.clearClause(field); await expectExpandsAndStaysExpanded(page, field); diff --git a/packages/app/tests/e2e/page-objects/SearchPage.ts b/packages/app/tests/e2e/page-objects/SearchPage.ts index 5806833fdc..215a24c5e6 100644 --- a/packages/app/tests/e2e/page-objects/SearchPage.ts +++ b/packages/app/tests/e2e/page-objects/SearchPage.ts @@ -459,11 +459,53 @@ export class SearchPage { return this.whereInput.borderColors(); } + get columnsButton() { + return this.page.getByTestId('search-columns-button'); + } + + get sortButton() { + return this.page.getByTestId('search-sort-button'); + } + + /** The SELECT the table runs with; the Columns button carries it as its title. */ + async getSelectValue(): Promise { + return (await this.columnsButton.getAttribute('title')) ?? ''; + } + + async getOrderByValue(): Promise { + return (await this.sortButton.getAttribute('title')) ?? ''; + } + /** - * Get SELECT editor (CodeMirror) + * Get SELECT editor (CodeMirror). It lives on the SQL tab of the Columns + * popover, so call `openSelectEditor` first. */ getSELECTEditor() { - return this.page.locator('.cm-content').first(); + return this.page.getByTestId('search-select-input').locator('.cm-content'); + } + + async openSelectEditor() { + return this.openClauseSqlTab( + 'search-columns-button', + this.getSELECTEditor(), + ); + } + + async openOrderByEditor() { + return this.openClauseSqlTab('search-sort-button', this.getOrderByEditor()); + } + + private async openClauseSqlTab(testId: string, editor: Locator) { + const popover = this.page.getByTestId(`${testId}-popover`); + if (!(await popover.isVisible())) { + await this.page.getByTestId(testId).click(); + } + await popover + .getByTestId(`${testId}-mode`) + .getByText('SQL', { exact: true }) + .click(); + await editor.waitFor({ state: 'visible' }); + return editor; } async getSelectBorderColor(): Promise { @@ -505,33 +547,42 @@ export class SearchPage { * Get ORDER BY editor (CodeMirror) */ getOrderByEditor() { - return this.page.locator('.cm-content').nth(1); + return this.page + .getByTestId('search-order-by-input') + .locator('.cm-content'); } /** - * Set custom SELECT columns + * Set custom SELECT columns through the Columns popover's SQL tab and apply + * it, which also runs the search. */ async setCustomSELECT(selectStatement: string) { - const selectEditor = this.getSELECTEditor(); + const selectEditor = await this.openSelectEditor(); await selectEditor.click({ clickCount: 3 }); // Select all // Insert atomically rather than per-keystroke: under load CodeMirror can // drop individual keys from keyboard.type (e.g. "Timestamp" -> "Timstamp"), // which then gets faithfully saved and fails later assertions. await this.page.keyboard.insertText(selectStatement); - // Dismiss the autocomplete popup so it can't linger and overlay the next - // control (e.g. the Save Search button). - await dismissSqlAutocomplete(this.page); + await this.applyClause('search-columns-button'); } /** - * Set custom ORDER BY clause + * Set custom ORDER BY through the Sort popover's SQL tab and apply it. */ async setCustomOrderBy(orderByStatement: string) { - const orderByEditor = this.getOrderByEditor(); + const orderByEditor = await this.openOrderByEditor(); await orderByEditor.click({ clickCount: 3 }); // Select all - await this.page.keyboard.type(orderByStatement); - // CLoses Autocomplete Modal if open - await this.page.keyboard.press('Escape'); + await this.page.keyboard.insertText(orderByStatement); + await this.applyClause('search-sort-button'); + } + + private async applyClause(testId: string) { + // Blur rather than Escape: Escape also closes the popover, dropping the draft. + await dismissSqlAutocomplete(this.page); + await this.page.getByTestId(`${testId}-apply`).click(); + await this.page + .getByTestId(`${testId}-popover`) + .waitFor({ state: 'hidden' }); } get groupByButton() { From c02c1b60b05b1e64b75cb76e5b1f56959394e430 Mon Sep 17 00:00:00 2001 From: Elizabet Oliveira Date: Fri, 23 Oct 2026 14:48:05 +0100 Subject: [PATCH 2/7] fix(app): let the results toolbar wrap on a narrow screen Columns, Sort, and the table actions move onto another line instead of overlapping when the results panel is narrow. Co-authored-by: Cursor --- packages/app/src/DBSearchPage.tsx | 2 +- packages/app/src/components/DBRowTable.tsx | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/app/src/DBSearchPage.tsx b/packages/app/src/DBSearchPage.tsx index 88d515a8a3..d6e1f5b507 100644 --- a/packages/app/src/DBSearchPage.tsx +++ b/packages/app/src/DBSearchPage.tsx @@ -2330,7 +2330,7 @@ function DBSearchPageContent() { // and stay hidden on Event Deltas and Event Patterns. const resultsClauseEditors = analysisMode === 'results' ? ( - + - + {toolbarLeading} {controlsAboveTable && rowSelectionMenu} From 3f6bae38622f082b24d67504b617451a5e6bbc61 Mon Sep 17 00:00:00 2001 From: Elizabet Oliveira Date: Fri, 23 Oct 2026 15:21:55 +0100 Subject: [PATCH 3/7] fix(app): keep clause Apply above the SQL completion list Typing in the popover reopens the completion list over Apply, so the saved-search click never lands. Co-authored-by: Cursor --- .../SearchResultsToolbar/ClausePopover.tsx | 12 +++++++++++- .../app/tests/e2e/page-objects/SearchPage.ts | 18 +++++++++++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/packages/app/src/components/SearchResultsToolbar/ClausePopover.tsx b/packages/app/src/components/SearchResultsToolbar/ClausePopover.tsx index 0c7450e259..9140882eda 100644 --- a/packages/app/src/components/SearchResultsToolbar/ClausePopover.tsx +++ b/packages/app/src/components/SearchResultsToolbar/ClausePopover.tsx @@ -123,7 +123,17 @@ export function ClausePopover({ data-testid={`${testId}-mode`} /> {mode === 'pick' ? renderPick(apply) : renderSql(apply)} - +