{whereSuggestions && whereSuggestions.length > 0 && (
@@ -3031,6 +3060,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 69e9a15d80..20d0354153 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,
@@ -391,6 +391,8 @@ export const RawLogTable = memo(
getRowWhere,
variant = 'default',
onRemoveColumn,
+ toolbarLeading,
+ controlsAboveTable = false,
}: {
wrapLines?: boolean;
displayedColumns: string[];
@@ -434,6 +436,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();
@@ -1034,8 +1040,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
}
/>
);
@@ -1680,6 +1709,8 @@ function DBSqlRowTableComponent({
tableId,
errorVariant,
onResolvedColumnsChange,
+ toolbarLeading,
+ controlsAboveTable,
}: {
config: BuilderChartConfigWithDateRange;
sourceId?: string;
@@ -1713,6 +1744,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 } =
@@ -2036,6 +2069,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..39d8be59b6 100644
--- a/packages/app/src/components/SearchResultsToolbar/ClausePopover.tsx
+++ b/packages/app/src/components/SearchResultsToolbar/ClausePopover.tsx
@@ -123,7 +123,21 @@ export function ClausePopover({
data-testid={`${testId}-mode`}
/>
{mode === 'pick' ? renderPick(apply) : renderSql(apply)}
-
+