Skip to content

Add query syntax reference to search input #2381

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

Open
vinzee wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add query syntax reference to search input #2381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 85 additions & 61 deletions packages/app/src/components/SearchInput/SearchWhereInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import { FieldPath, useController, UseControllerProps } from 'react-hook-form';
import { TableConnectionChoice } from '@hyperdx/common-utils/dist/core/metadata';
import { Box, Flex, Kbd } from '@mantine/core';
import { ActionIcon, Box, Flex, Kbd, Tooltip } from '@mantine/core';
import { useDisclosure } from '@mantine/hooks';
import { IconHelp } from '@tabler/icons-react';

import { SQLInlineEditorControlled } from '@/components/SQLEditor/SQLInlineEditor';

import InputLanguageSwitch from './InputLanguageSwitch';
import SearchInputV2 from './SearchInputV2';
import SyntaxReferenceModal from './SyntaxReferenceModal';

import styles from './SearchWhereInput.module.scss';

Expand Down Expand Up @@ -164,6 +167,9 @@ export default function SearchWhereInput({
languageName = `${name}Language`,
sourceId,
}: SearchWhereInputProps) {
const [syntaxRefOpened, { open: openSyntaxRef, close: closeSyntaxRef }] =
useDisclosure(false);

const { field: languageField } = useController({
control,
name: languageName as FieldPath<any>,
Expand All @@ -182,68 +188,86 @@ export default function SearchWhereInput({
const sizeClass = size === 'xs' ? styles.sizeXs : styles.sizeSm;

return (
<Box
className={styles.root}
style={{
width,
maxWidth,
minWidth,
}}
>
<Flex
align="center"
className={`${styles.languageSwitch} ${sizeClass}`}
data-testid="where-language-switch"
onMouseDown={e => e.preventDefault()}
<>
<SyntaxReferenceModal
opened={syntaxRefOpened}
onClose={closeSyntaxRef}
language={language}
/>
<Box
className={styles.root}
style={{
width,
maxWidth,
minWidth,
}}
>
<InputLanguageSwitch
language={language}
onLanguageChange={handleLanguageChange}
/>
</Flex>
<Box className={`${styles.inputWrapper} ${sizeClass}`}>
{isSql ? (
<SQLInlineEditorControlled
{...tc}
control={control}
name={name}
placeholder={sqlPlaceholder}
onSubmit={onSubmit}
label={showLabel ? labelText : undefined}
queryHistoryType={sqlQueryHistoryType}
enableHotkey={enableHotkey}
allowMultiline={allowMultiline}
size={size}
additionalSuggestions={additionalSuggestions}
dateRange={dateRange}
sourceId={sourceId}
/>
) : (
<SearchInputV2
{...tc}
control={control}
name={name}
onSubmit={onSubmit}
placeholder={lucenePlaceholder}
queryHistoryType={luceneQueryHistoryType}
enableHotkey={enableHotkey}
size={size}
data-testid={dataTestId}
additionalSuggestions={additionalSuggestions}
dateRange={dateRange}
sourceId={sourceId}
<Flex
align="center"
className={`${styles.languageSwitch} ${sizeClass}`}
data-testid="where-language-switch"
onMouseDown={e => e.preventDefault()}
>
<InputLanguageSwitch
language={language}
onLanguageChange={handleLanguageChange}
/>
)}
{enableHotkey && (
<Box
className={styles.shortcutHint}
title="Press / or s to focus search"
aria-hidden
>
<Kbd size="xs">/</Kbd>
</Box>
)}
<Tooltip label="Syntax reference" withArrow position="top">
<ActionIcon
variant="subtle"
size="xs"
aria-label="Open syntax reference"
onClick={openSyntaxRef}
style={{ marginRight: 4 }}
>
<IconHelp size={14} />
</ActionIcon>
</Tooltip>
</Flex>
<Box className={`${styles.inputWrapper} ${sizeClass}`}>
{isSql ? (
<SQLInlineEditorControlled
{...tc}
control={control}
name={name}
placeholder={sqlPlaceholder}
onSubmit={onSubmit}
label={showLabel ? labelText : undefined}
queryHistoryType={sqlQueryHistoryType}
enableHotkey={enableHotkey}
allowMultiline={allowMultiline}
size={size}
additionalSuggestions={additionalSuggestions}
dateRange={dateRange}
sourceId={sourceId}
/>
) : (
<SearchInputV2
{...tc}
control={control}
name={name}
onSubmit={onSubmit}
placeholder={lucenePlaceholder}
queryHistoryType={luceneQueryHistoryType}
enableHotkey={enableHotkey}
size={size}
data-testid={dataTestId}
additionalSuggestions={additionalSuggestions}
dateRange={dateRange}
sourceId={sourceId}
/>
)}
{enableHotkey && (
<Box
className={styles.shortcutHint}
title="Press / or s to focus search"
aria-hidden
>
<Kbd size="xs">/</Kbd>
</Box>
)}
</Box>
</Box>
</Box>
</>
);
}
Loading
Loading