From 1c8a6aeee190940bd677cd9b6bff257ae15deabf Mon Sep 17 00:00:00 2001 From: "jie.yang" Date: Sun, 6 Jul 2025 16:35:00 +0800 Subject: [PATCH] useAutoCompleteOptions: use current search dateRange. --- packages/app/src/DBSearchPage.tsx | 2 ++ packages/app/src/SearchInputV2.tsx | 6 ++++ packages/app/src/ServicesDashboardPage.tsx | 2 ++ packages/app/src/SessionSubpanel.tsx | 2 ++ packages/app/src/SessionsPage.tsx | 2 ++ .../app/src/components/ContextSidePanel.tsx | 2 ++ .../src/components/DBEditTimeChartForm.tsx | 4 +++ .../app/src/components/KubernetesFilters.tsx | 2 ++ .../app/src/hooks/useAutoCompleteOptions.tsx | 33 ++++++++++--------- 9 files changed, 39 insertions(+), 16 deletions(-) diff --git a/packages/app/src/DBSearchPage.tsx b/packages/app/src/DBSearchPage.tsx index 847236542..c0adb9966 100644 --- a/packages/app/src/DBSearchPage.tsx +++ b/packages/app/src/DBSearchPage.tsx @@ -1295,6 +1295,8 @@ function DBSearchPage() { placeholder="Search your events w/ Lucene ex. column:foo" queryHistoryType={QUERY_LOCAL_STORAGE.SEARCH_LUCENE} enableHotkey + dateRange={searchedTimeRange} + source={inputSourceObj} /> } /> diff --git a/packages/app/src/SearchInputV2.tsx b/packages/app/src/SearchInputV2.tsx index aac40a5db..09fc0d6da 100644 --- a/packages/app/src/SearchInputV2.tsx +++ b/packages/app/src/SearchInputV2.tsx @@ -35,6 +35,8 @@ export default function SearchInputV2({ onSubmit, additionalSuggestions, queryHistoryType, + dateRange, + source, ...props }: { tableConnections?: TableConnection | TableConnection[]; @@ -47,6 +49,8 @@ export default function SearchInputV2({ onSubmit?: () => void; additionalSuggestions?: string[]; queryHistoryType?: string; + dateRange?: [Date, Date]; + source?: any; } & UseControllerProps) { const { field: { onChange, value }, @@ -61,6 +65,8 @@ export default function SearchInputV2({ { tableConnections, additionalSuggestions, + dateRange, + source, }, ); diff --git a/packages/app/src/ServicesDashboardPage.tsx b/packages/app/src/ServicesDashboardPage.tsx index 0da301608..0a788cc80 100644 --- a/packages/app/src/ServicesDashboardPage.tsx +++ b/packages/app/src/ServicesDashboardPage.tsx @@ -944,6 +944,8 @@ function ServicesDashboardPage() { language="lucene" placeholder="Search your events w/ Lucene ex. column:foo" enableHotkey + dateRange={searchedTimeRange} + source={source} /> } /> diff --git a/packages/app/src/SessionSubpanel.tsx b/packages/app/src/SessionSubpanel.tsx index 2ef6b09f5..f49ae8104 100644 --- a/packages/app/src/SessionSubpanel.tsx +++ b/packages/app/src/SessionSubpanel.tsx @@ -505,6 +505,8 @@ export default function SessionSubpanel({ size="xs" placeholder="Search your events w/ Lucene ex. column:foo" enableHotkey + dateRange={[start, end]} + traceSource={traceSource} /> )} diff --git a/packages/app/src/SessionsPage.tsx b/packages/app/src/SessionsPage.tsx index 7d00e9268..8e411e787 100644 --- a/packages/app/src/SessionsPage.tsx +++ b/packages/app/src/SessionsPage.tsx @@ -472,6 +472,8 @@ export default function SessionsPage() { language="lucene" placeholder="Search your events w/ Lucene ex. column:foo" enableHotkey + dateRange={searchedTimeRange} + source={traceTrace} /> } /> diff --git a/packages/app/src/components/ContextSidePanel.tsx b/packages/app/src/components/ContextSidePanel.tsx index 541fe13fa..6eab7060f 100644 --- a/packages/app/src/components/ContextSidePanel.tsx +++ b/packages/app/src/components/ContextSidePanel.tsx @@ -214,6 +214,8 @@ export default function ContextSubpanel({ placeholder="Lucene where clause (ex. column:value)" enableHotkey size="sm" + dateRange={newDateRange} + source={source} /> ) } diff --git a/packages/app/src/components/DBEditTimeChartForm.tsx b/packages/app/src/components/DBEditTimeChartForm.tsx index e9f650498..ef7debba8 100644 --- a/packages/app/src/components/DBEditTimeChartForm.tsx +++ b/packages/app/src/components/DBEditTimeChartForm.tsx @@ -255,6 +255,8 @@ function ChartSeriesEditorComponent({ placeholder="Search your events w/ Lucene ex. column:foo" onSubmit={onSubmit} additionalSuggestions={attributeKeys} + dateRange={dateRange} + source={tableSource} /> )} {showGroupBy && ( @@ -745,6 +747,8 @@ export default function EditTimeChartForm({ language="lucene" placeholder="Search your events w/ Lucene ex. column:foo" onSubmit={onSubmit} + dateRange={dateRange} + source={tableSource} /> )} diff --git a/packages/app/src/components/KubernetesFilters.tsx b/packages/app/src/components/KubernetesFilters.tsx index 372485d01..4300eee1c 100644 --- a/packages/app/src/components/KubernetesFilters.tsx +++ b/packages/app/src/components/KubernetesFilters.tsx @@ -239,6 +239,8 @@ export const KubernetesFilters: React.FC = ({ control={control} size="xs" enableHotkey + dateRange={dateRange} + source={metricSource} /> ); diff --git a/packages/app/src/hooks/useAutoCompleteOptions.tsx b/packages/app/src/hooks/useAutoCompleteOptions.tsx index ac4bf7585..31cf689af 100644 --- a/packages/app/src/hooks/useAutoCompleteOptions.tsx +++ b/packages/app/src/hooks/useAutoCompleteOptions.tsx @@ -21,9 +21,13 @@ export function useAutoCompleteOptions( { tableConnections, additionalSuggestions, + dateRange, + source, }: { tableConnections?: TableConnection | TableConnection[]; additionalSuggestions?: string[]; + dateRange?: [Date, Date]; + source?: any; // TSource 类型，外部传入 }, ) { // Fetch and gather all field options @@ -87,22 +91,19 @@ export function useAutoCompleteOptions( // hooks to get key values const chartConfigs: ChartConfigWithDateRange[] = toArray( tableConnections, - ).map(({ databaseName, tableName, connectionId }) => ({ - connection: connectionId, - from: { - databaseName, - tableName, - }, - timestampValueExpression: '', - select: '', - where: '', - // TODO: Pull in date for query as arg - // just assuming 1/2 day is okay to query over right now - dateRange: [ - new Date(Date.now() - (86400 * 1000) / 2), - new Date(Date.now()), - ], - })); + ).map(({ databaseName, tableName, connectionId }) => { + return { + connection: connectionId, + from: { + databaseName, + tableName, + }, + timestampValueExpression: source?.timestampValueExpression, + select: '', + where: '', + dateRange: dateRange, + }; + }); const { data: keyVals } = useGetKeyValues({ chartConfigs, keys: searchKeys,