From e2cd2933d07490402c1b9fb0708143a06f4a38ac Mon Sep 17 00:00:00 2001
From: Drew Davis <drew.davis@clickhouse.com>
Date: Wed, 12 Nov 2025 21:24:34 -0500
Subject: [PATCH 1/2] fix: Fix session search behavior

---
 .changeset/light-timers-raise.md     | 5 +++++
 packages/app/src/SessionSubpanel.tsx | 9 ++++++---
 packages/app/src/SessionsPage.tsx    | 1 +
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/light-timers-raise.md

diff --git a/.changeset/light-timers-raise.md b/.changeset/light-timers-raise.md
new file mode 100644
index 000000000..edb672845
--- /dev/null
+++ b/.changeset/light-timers-raise.md
@@ -0,0 +1,5 @@
+---
+"@hyperdx/app": patch
+---
+
+fix: Fix session search behavior
diff --git a/packages/app/src/SessionSubpanel.tsx b/packages/app/src/SessionSubpanel.tsx
index cab77049f..5cb51a7e7 100644
--- a/packages/app/src/SessionSubpanel.tsx
+++ b/packages/app/src/SessionSubpanel.tsx
@@ -353,7 +353,7 @@ export default function SessionSubpanel({
       select: commonSelect,
       from: traceSource.from,
       dateRange: [start, end],
-      whereLanguage: 'lucene',
+      whereLanguage,
       where: searchedQuery,
       timestampValueExpression: traceSource.timestampValueExpression,
       implicitColumnExpression: traceSource.implicitColumnExpression,
@@ -376,7 +376,7 @@ export default function SessionSubpanel({
       traceSource.connection,
       start,
       end,
-      // whereLanguage,
+      whereLanguage,
       searchedQuery,
       tab,
       highlightedEventsFilter,
@@ -402,7 +402,7 @@ export default function SessionSubpanel({
       select: commonSelect,
       from: traceSource.from,
       dateRange: [start, end],
-      whereLanguage: 'lucene',
+      whereLanguage,
       where: searchedQuery,
       timestampValueExpression: traceSource.timestampValueExpression,
       implicitColumnExpression: traceSource.implicitColumnExpression,
@@ -425,6 +425,7 @@ export default function SessionSubpanel({
       traceSource.connection,
       start,
       end,
+      whereLanguage,
       searchedQuery,
       tab,
       highlightedEventsFilter,
@@ -495,6 +496,7 @@ export default function SessionSubpanel({
                 language="sql"
                 size="xs"
                 enableHotkey
+                onSubmit={handleSubmit(handleWhereSubmit)}
               />
             ) : (
               <SearchInputV2
@@ -505,6 +507,7 @@ export default function SessionSubpanel({
                 size="xs"
                 placeholder="Search your events w/ Lucene ex. column:foo"
                 enableHotkey
+                onSubmit={handleSubmit(handleWhereSubmit)}
               />
             )}
           </form>
diff --git a/packages/app/src/SessionsPage.tsx b/packages/app/src/SessionsPage.tsx
index 349c8157f..a8fcd2040 100644
--- a/packages/app/src/SessionsPage.tsx
+++ b/packages/app/src/SessionsPage.tsx
@@ -470,6 +470,7 @@ export default function SessionsPage() {
                   <SearchInputV2
                     tableConnection={tcFromSource(traceTrace)}
                     control={control}
+                    onSubmit={onSubmit}
                     name="where"
                     onLanguageChange={lang =>
                       setValue('whereLanguage', lang, {

From aeb613170c0bc598c8cf6779fe7e3bc3f1612943 Mon Sep 17 00:00:00 2001
From: Drew Davis <drew.davis@clickhouse.com>
Date: Wed, 12 Nov 2025 22:19:14 -0500
Subject: [PATCH 2/2] fix: Fix form submission on dashboard and services page
 search input

---
 packages/app/src/DBDashboardPage.tsx       | 1 +
 packages/app/src/ServicesDashboardPage.tsx | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/app/src/DBDashboardPage.tsx b/packages/app/src/DBDashboardPage.tsx
index b1590fc47..299cc62be 100644
--- a/packages/app/src/DBDashboardPage.tsx
+++ b/packages/app/src/DBDashboardPage.tsx
@@ -1033,6 +1033,7 @@ function DBDashboardPage({ presetConfig }: { presetConfig?: Dashboard }) {
                 placeholder="Search your events w/ Lucene ex. column:foo"
                 enableHotkey
                 data-testid="search-input"
+                onSubmit={onSubmit}
               />
             )
           }
diff --git a/packages/app/src/ServicesDashboardPage.tsx b/packages/app/src/ServicesDashboardPage.tsx
index 939d8ba58..8bc3a665a 100644
--- a/packages/app/src/ServicesDashboardPage.tsx
+++ b/packages/app/src/ServicesDashboardPage.tsx
@@ -995,6 +995,7 @@ function ServicesDashboardPage() {
                   language="lucene"
                   placeholder="Search your events w/ Lucene ex. column:foo"
                   enableHotkey
+                  onSubmit={onSubmit}
                 />
               }
             />