{whereSuggestions && whereSuggestions.length > 0 && (
@@ -3052,6 +3081,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 37e1f1774d..bd1b703a7b 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/__tests__/utils.test.ts b/packages/app/src/__tests__/utils.test.ts
index ee74129dcd..5d53e5847c 100644
--- a/packages/app/src/__tests__/utils.test.ts
+++ b/packages/app/src/__tests__/utils.test.ts
@@ -1582,6 +1582,23 @@ describe('orderByAfterRemovingSelectItem', () => {
).toBe('"http.method" DESC');
});
+ it('drops a sort on an alias written without quotes', () => {
+ expect(
+ orderByAfterRemovingSelectItem(
+ 'upper(Body) AS message',
+ 'message DESC',
+ 'Timestamp DESC',
+ ),
+ ).toBe('Timestamp DESC');
+ expect(
+ orderByAfterRemovingSelectItem(
+ 'upper(Body) AS message',
+ '`message` ASC, Timestamp DESC',
+ 'Timestamp DESC',
+ ),
+ ).toBe('Timestamp DESC');
+ });
+
it('keeps a comma inside a backtick-quoted sort name', () => {
expect(
orderByAfterRemovingSelectItem(
diff --git a/packages/app/src/components/DBRowTable.tsx b/packages/app/src/components/DBRowTable.tsx
index c20b1586ec..c914823428 100644
--- a/packages/app/src/components/DBRowTable.tsx
+++ b/packages/app/src/components/DBRowTable.tsx
@@ -37,13 +37,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,
@@ -393,6 +393,8 @@ export const RawLogTable = memo(
getRowWhere,
variant = 'default',
onRemoveColumn,
+ toolbarLeading,
+ controlsAboveTable = false,
}: {
wrapLines?: boolean;
displayedColumns: string[];
@@ -436,6 +438,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();
@@ -1036,8 +1042,111 @@ 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
}
/>
);
@@ -1760,6 +1789,8 @@ function DBSqlRowTableComponent({
tableId,
errorVariant,
onResolvedColumnsChange,
+ toolbarLeading,
+ controlsAboveTable,
}: {
config: BuilderChartConfigWithDateRange;
sourceId?: string;
@@ -1793,6 +1824,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 } =
@@ -2041,6 +2074,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/src/components/SearchResultsToolbar/ClausePopover.tsx b/packages/app/src/components/SearchResultsToolbar/ClausePopover.tsx
index 0c7450e259..d2050ad2c9 100644
--- a/packages/app/src/components/SearchResultsToolbar/ClausePopover.tsx
+++ b/packages/app/src/components/SearchResultsToolbar/ClausePopover.tsx
@@ -1,7 +1,8 @@
-import { type ReactNode, useState } from 'react';
+import { type ReactNode, useRef, useState } from 'react';
import { Button, Group, Popover, SegmentedControl, Stack } from '@mantine/core';
import { SplitValueButton } from '@/components/SplitValueButton/SplitValueButton';
+import { useConfirm } from '@/useConfirm';
export type ClauseMode = 'pick' | 'sql';
@@ -28,6 +29,13 @@ export const clauseResetDisabled = matchesDefault;
export const clauseApplyDisabled = (draft: string) => draft.trim() === '';
+/** Apply would write a different clause than the one currently stored. */
+export const clauseDirty = (
+ draft: string,
+ value: string,
+ defaultValue: string,
+) => storedClause(draft, value, defaultValue) !== value;
+
const MODE_OPTIONS = [
{ label: 'Fields', value: 'pick' },
{ label: 'SQL', value: 'sql' },
@@ -35,7 +43,8 @@ const MODE_OPTIONS = [
/**
* A toolbar button that edits one query clause in a popover. Edits stay in a
- * draft owned by the caller until Apply, so closing the popover discards them.
+ * draft owned by the caller until Apply. Closing a draft that would change the
+ * stored clause asks first. Cancel discards it without asking.
*/
export function ClausePopover({
name,
@@ -44,6 +53,7 @@ export function ClausePopover({
dimmed,
title,
initialMode,
+ dirty,
onOpen,
onApply,
onReset,
@@ -65,6 +75,8 @@ export function ClausePopover({
title: string;
/** The tab to show each time the popover opens. */
initialMode: ClauseMode;
+ /** The draft would change the stored clause, so closing asks first. */
+ dirty: boolean;
/** Reset the caller's draft to the current value. */
onOpen: () => void;
onApply: () => void;
@@ -77,8 +89,12 @@ export function ClausePopover({
renderSql: (apply: () => void) => ReactNode;
'data-testid': string;
}) {
+ const confirm = useConfirm();
const [opened, setOpened] = useState(false);
const [mode, setMode] = useState(initialMode);
+ // The confirm dialog sits outside this popover, so its own clicks look like
+ // another dismiss. Ignore those while it is open.
+ const confirmingRef = useRef(false);
const open = () => {
onOpen();
@@ -86,6 +102,21 @@ export function ClausePopover({
setOpened(true);
};
+ const requestClose = () => {
+ if (confirmingRef.current) return;
+ if (!dirty) {
+ setOpened(false);
+ return;
+ }
+ confirmingRef.current = true;
+ void confirm('Discard unsaved changes?', 'Discard', {
+ variant: 'danger',
+ }).then(discard => {
+ confirmingRef.current = false;
+ if (discard) setOpened(false);
+ });
+ };
+
const apply = () => {
if (applyDisabled) return;
onApply();
@@ -95,7 +126,9 @@ export function ClausePopover({
return (
{
+ if (!next) requestClose();
+ }}
position="bottom-start"
width={440}
shadow="md"
@@ -108,7 +141,7 @@ export function ClausePopover({
count={count}
dimmed={dimmed}
title={title}
- onClick={() => (opened ? setOpened(false) : open())}
+ onClick={() => (opened ? requestClose() : open())}
data-testid={testId}
/>
@@ -123,7 +156,21 @@ export function ClausePopover({
data-testid={`${testId}-mode`}
/>
{mode === 'pick' ? renderPick(apply) : renderSql(apply)}
-
+
Select a column, or type an expression such as{' '}
- upper(Body) as message, then click Add.
+ upper(Body) as message and add it to the list. Then
+ click Apply.
)}
diff --git a/packages/app/src/components/SearchResultsToolbar/SortPopover.tsx b/packages/app/src/components/SearchResultsToolbar/SortPopover.tsx
index 6713e64be7..0a4ac8c83a 100644
--- a/packages/app/src/components/SearchResultsToolbar/SortPopover.tsx
+++ b/packages/app/src/components/SearchResultsToolbar/SortPopover.tsx
@@ -15,6 +15,7 @@ import SQLInlineEditor from '@/components/SQLEditor/SQLInlineEditor';
import {
clauseApplyDisabled,
+ clauseDirty,
ClausePopover,
clauseResetDisabled,
storedClause,
@@ -112,6 +113,7 @@ export function SortPopover({
}}
resetDisabled={clauseResetDisabled(draft, defaultValue)}
applyDisabled={clauseApplyDisabled(draft)}
+ dirty={clauseDirty(draft, value, defaultValue)}
onApply={() => onApply(storedClause(draft, value, defaultValue))}
data-testid="search-sort-button"
renderPick={() => (
diff --git a/packages/app/src/components/SearchResultsToolbar/__tests__/ColumnsPopover.test.tsx b/packages/app/src/components/SearchResultsToolbar/__tests__/ColumnsPopover.test.tsx
index d0020458a1..d529c61e6e 100644
--- a/packages/app/src/components/SearchResultsToolbar/__tests__/ColumnsPopover.test.tsx
+++ b/packages/app/src/components/SearchResultsToolbar/__tests__/ColumnsPopover.test.tsx
@@ -4,6 +4,9 @@ import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import { ColumnsPopover } from '@/components/SearchResultsToolbar/ColumnsPopover';
+const confirm = jest.fn();
+jest.mock('@/useConfirm', () => ({ useConfirm: () => confirm }));
+
jest.mock('@/components/SQLEditor/SQLInlineEditor', () => ({
__esModule: true,
default: ({
@@ -46,7 +49,15 @@ function renderPopover(
const openPopover = () =>
fireEvent.click(screen.getByTestId('search-columns-button'));
+const closePopover = () =>
+ fireEvent.click(screen.getByTestId('search-columns-button'));
+
describe('ColumnsPopover', () => {
+ beforeEach(() => {
+ confirm.mockReset();
+ confirm.mockResolvedValue(true);
+ });
+
it('shows the column count and falls back to the default SELECT', () => {
renderPopover({ value: '' });
expect(screen.getByTestId('search-columns-button')).toHaveAccessibleName(
@@ -244,6 +255,12 @@ describe('ColumnsPopover', () => {
expect(onApply).toHaveBeenCalledWith('count()', ['Timestamp', 'Body']);
});
+ it('says Apply is what updates the search', async () => {
+ renderPopover();
+ openPopover();
+ expect(await screen.findByText(/Then click Apply/)).toBeInTheDocument();
+ });
+
it('discards the draft on cancel', async () => {
const { onApply } = renderPopover();
openPopover();
@@ -257,5 +274,94 @@ describe('ColumnsPopover', () => {
openPopover();
expect(await screen.findByLabelText('Remove Body')).toBeInTheDocument();
expect(onApply).not.toHaveBeenCalled();
+ expect(confirm).not.toHaveBeenCalled();
+ });
+
+ it('closes an unchanged list without asking', async () => {
+ renderPopover();
+ openPopover();
+ expect(
+ await screen.findByTestId('search-columns-button-popover'),
+ ).toBeInTheDocument();
+ closePopover();
+ await waitFor(() =>
+ expect(
+ screen.queryByTestId('search-columns-button-popover'),
+ ).not.toBeInTheDocument(),
+ );
+ expect(confirm).not.toHaveBeenCalled();
+ });
+
+ it('asks before discarding a column edit', async () => {
+ const { onApply } = renderPopover();
+ openPopover();
+ fireEvent.click(await screen.findByLabelText('Remove Body'));
+
+ confirm.mockResolvedValueOnce(false);
+ closePopover();
+ await waitFor(() => expect(confirm).toHaveBeenCalledTimes(1));
+ expect(confirm).toHaveBeenCalledWith(
+ 'Discard unsaved changes?',
+ 'Discard',
+ {
+ variant: 'danger',
+ },
+ );
+ expect(
+ screen.getByTestId('search-columns-button-popover'),
+ ).toBeInTheDocument();
+ expect(screen.queryByLabelText('Remove Body')).not.toBeInTheDocument();
+ expect(onApply).not.toHaveBeenCalled();
+
+ confirm.mockResolvedValueOnce(true);
+ closePopover();
+ await waitFor(() =>
+ expect(
+ screen.queryByTestId('search-columns-button-popover'),
+ ).not.toBeInTheDocument(),
+ );
+ openPopover();
+ expect(await screen.findByLabelText('Remove Body')).toBeInTheDocument();
+ });
+
+ it('asks when a click outside would discard a column edit', async () => {
+ renderPopover();
+ openPopover();
+ fireEvent.click(await screen.findByLabelText('Remove Body'));
+ confirm.mockResolvedValueOnce(false);
+ fireEvent.mouseDown(document.documentElement);
+ await waitFor(() => expect(confirm).toHaveBeenCalledTimes(1));
+ expect(
+ screen.getByTestId('search-columns-button-popover'),
+ ).toBeInTheDocument();
+ });
+
+ it('ignores a second dismiss while the discard dialog is open', async () => {
+ let settle: (discard: boolean) => void = () => {};
+ confirm.mockImplementation(
+ () =>
+ new Promise(resolve => {
+ settle = resolve;
+ }),
+ );
+ renderPopover();
+ openPopover();
+ fireEvent.click(await screen.findByLabelText('Remove Body'));
+ closePopover();
+ await waitFor(() => expect(confirm).toHaveBeenCalledTimes(1));
+
+ fireEvent.mouseDown(document.documentElement);
+ closePopover();
+ expect(confirm).toHaveBeenCalledTimes(1);
+ expect(
+ screen.getByTestId('search-columns-button-popover'),
+ ).toBeInTheDocument();
+
+ settle(false);
+ await waitFor(() =>
+ expect(
+ screen.getByTestId('search-columns-button-popover'),
+ ).toBeInTheDocument(),
+ );
});
});
diff --git a/packages/app/src/components/SearchResultsToolbar/__tests__/SortPopover.test.tsx b/packages/app/src/components/SearchResultsToolbar/__tests__/SortPopover.test.tsx
index dcf2cc898e..f4f74f3475 100644
--- a/packages/app/src/components/SearchResultsToolbar/__tests__/SortPopover.test.tsx
+++ b/packages/app/src/components/SearchResultsToolbar/__tests__/SortPopover.test.tsx
@@ -1,9 +1,12 @@
import React from 'react';
import { MantineProvider } from '@mantine/core';
-import { fireEvent, render, screen } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import { SortPopover } from '@/components/SearchResultsToolbar/SortPopover';
+const confirm = jest.fn();
+jest.mock('@/useConfirm', () => ({ useConfirm: () => confirm }));
+
jest.mock('@/components/SQLEditor/SQLInlineEditor', () => ({
__esModule: true,
default: ({
@@ -46,6 +49,11 @@ const openPopover = () =>
fireEvent.click(screen.getByTestId('search-sort-button'));
describe('SortPopover', () => {
+ beforeEach(() => {
+ confirm.mockReset();
+ confirm.mockResolvedValue(true);
+ });
+
it('labels the button with the parsed field and direction', () => {
renderPopover({ value: 'Body ASC' });
expect(screen.getByTestId('search-sort-button')).toHaveAccessibleName(
@@ -216,5 +224,27 @@ describe('SortPopover', () => {
fireEvent.click(await screen.findByText('Asc'));
fireEvent.click(screen.getByText('Cancel'));
expect(onApply).not.toHaveBeenCalled();
+ expect(confirm).not.toHaveBeenCalled();
+ });
+
+ it('asks before discarding a sort edit', async () => {
+ const { onApply } = renderPopover();
+ openPopover();
+ fireEvent.click(await screen.findByText('Asc'));
+ confirm.mockResolvedValueOnce(false);
+ fireEvent.click(screen.getByTestId('search-sort-button'));
+ await waitFor(() => expect(confirm).toHaveBeenCalledTimes(1));
+ expect(
+ screen.getByTestId('search-sort-button-popover'),
+ ).toBeInTheDocument();
+ expect(onApply).not.toHaveBeenCalled();
+
+ confirm.mockResolvedValueOnce(true);
+ fireEvent.click(screen.getByTestId('search-sort-button'));
+ await waitFor(() =>
+ expect(
+ screen.queryByTestId('search-sort-button-popover'),
+ ).not.toBeInTheDocument(),
+ );
});
});
diff --git a/packages/app/src/useConfirm.tsx b/packages/app/src/useConfirm.tsx
index f84374c0f7..1ef13a006f 100644
--- a/packages/app/src/useConfirm.tsx
+++ b/packages/app/src/useConfirm.tsx
@@ -1,6 +1,6 @@
import * as React from 'react';
import { useRouter } from 'next/router';
-import { Button, Group, Modal, Text } from '@mantine/core';
+import { Button, getDefaultZIndex, Group, Modal, Text } from '@mantine/core';
type ConfirmOptions = {
variant?: 'primary' | 'danger';
@@ -71,6 +71,9 @@ export function ConfirmProvider({ children }: { children: React.ReactNode }) {
onClose={state?.onClose ?? (() => {})}
centered
withCloseButton={false}
+ // Popovers render above the default modal layer, so a confirm opened
+ // from one would sit behind the dropdown.
+ zIndex={getDefaultZIndex('overlay')}
>
{state?.message}
diff --git a/packages/app/src/utils.ts b/packages/app/src/utils.ts
index 7cdbf972c7..2658160a99 100644
--- a/packages/app/src/utils.ts
+++ b/packages/app/src/utils.ts
@@ -1291,10 +1291,11 @@ export const orderByAfterRemovingSelectItem = (
if (alias == null) {
return orderBy;
}
- const quoted = `"${alias}"`;
+ // An alias can be written bare, double-quoted, or backtick-quoted in ORDER BY
+ const aliasKeys = new Set([alias, `"${alias}"`, `\`${alias}\``]);
const keys = splitAndTrimWithBracket(orderBy);
const kept = keys.filter(
- key => key.replace(/\s+(ASC|DESC)$/i, '') !== quoted,
+ key => !aliasKeys.has(key.replace(/\s+(ASC|DESC)$/i, '')),
);
if (kept.length === keys.length) {
return orderBy;
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 32a3c6731e..f94690d6cf 100644
--- a/packages/app/tests/e2e/features/search/saved-search.spec.ts
+++ b/packages/app/tests/e2e/features/search/saved-search.spec.ts
@@ -120,10 +120,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');
});
},
);
@@ -162,11 +162,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 () => {
@@ -175,12 +175,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)');
});
},
);
@@ -208,11 +208,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 () => {
@@ -223,10 +223,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');
});
},
);
@@ -277,9 +277,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];
@@ -311,8 +311,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();
@@ -365,11 +365,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');
});
},
);
@@ -423,9 +423,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)',
);
@@ -449,10 +449,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 () => {
@@ -466,10 +466,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');
});
},
);
@@ -560,16 +560,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 () => {
@@ -585,8 +585,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');
});
},
);
@@ -809,10 +809,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 () => {
@@ -825,10 +825,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 6467474f5d..b3c75e08c2 100644
--- a/packages/app/tests/e2e/page-objects/SearchPage.ts
+++ b/packages/app/tests/e2e/page-objects/SearchPage.ts
@@ -476,11 +476,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 {
@@ -522,33 +564,50 @@ 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) {
+ const popover = this.page.getByTestId(`${testId}-popover`);
+ // Typing swaps the completion plugin, which opens a fresh list over Apply
+ // after a blur. Move focus to the mode control once that list is up.
+ // Escape would close the popover and drop the draft.
+ const tooltip = popover.locator('.cm-tooltip-autocomplete');
+ await tooltip
+ .waitFor({ state: 'visible', timeout: 2000 })
+ .catch(() => undefined);
+ await popover
+ .getByTestId(`${testId}-mode`)
+ .getByText('SQL', { exact: true })
+ .click();
+ await this.page.getByTestId(`${testId}-apply`).click();
+ await popover.waitFor({ state: 'hidden' });
}
get groupByButton() {