From 3fd7afaf80fd90514bade6d0c4c630531440f69a Mon Sep 17 00:00:00 2001
From: akshat_1074 <valaniakshat1074@gmail.com>
Date: Sun, 22 Feb 2026 15:59:00 +0530
Subject: [PATCH 1/3] feat: preserve user's language preference in search page

---
 packages/app/src/DBSearchPage.tsx | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/app/src/DBSearchPage.tsx b/packages/app/src/DBSearchPage.tsx
index 1f07d5622..0c467eb74 100644
--- a/packages/app/src/DBSearchPage.tsx
+++ b/packages/app/src/DBSearchPage.tsx
@@ -881,7 +881,7 @@ function DBSearchPage() {
     values: {
       select: searchedConfig.select || '',
       where: searchedConfig.where || '',
-      whereLanguage: searchedConfig.whereLanguage ?? 'lucene',
+      whereLanguage: searchedConfig.whereLanguage ?? (localStorage.getItem('hdx-search-language-preference') as 'sql' | 'lucene') ?? 'lucene',
       source: searchedConfig.source || defaultSourceId,
       filters: searchedConfig.filters ?? [],
       orderBy: searchedConfig.orderBy ?? '',
@@ -982,7 +982,7 @@ function DBSearchPage() {
         source: defaultSourceId,
         where: '',
         select: '',
-        whereLanguage: 'lucene',
+        whereLanguage: (localStorage.getItem('hdx-search-language-preference') as 'sql' | 'lucene') || 'lucene',
         filters: [],
         orderBy: '',
       });
@@ -996,7 +996,7 @@ function DBSearchPage() {
     defaultSourceId,
     sources,
   ]);
-
+  console.log('localStorage value:', localStorage.getItem('hdx-search-language-preference'));
   const [_queryErrors, setQueryErrors] = useState<{
     [key: string]: Error | ClickHouseQueryError;
   }>({});
@@ -1545,11 +1545,14 @@ function DBSearchPage() {
   );
 
   const onLanguageChange = useCallback(
-    (lang: 'sql' | 'lucene') =>
+    (lang: 'sql' | 'lucene') => {
+      localStorage.setItem('hdx-search-language-preference',lang);
       setValue('whereLanguage', lang, {
         shouldDirty: true,
-      }),
-    [setValue],
+      });
+      setSearchedConfig({ whereLanguage: lang });
+    },
+    [setValue,setSearchedConfig],
   );
 
   const onModelFormExpandClose = useCallback(() => {

From 5f503903da1ccf4c73fb215e526735472e762f6f Mon Sep 17 00:00:00 2001
From: akshat_1074 <valaniakshat1074@gmail.com>
Date: Sun, 22 Feb 2026 16:03:57 +0530
Subject: [PATCH 2/3] feat: preserve user's language preference in search page

---
 packages/app/src/DBSearchPage.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/app/src/DBSearchPage.tsx b/packages/app/src/DBSearchPage.tsx
index 0c467eb74..07a2c2b0e 100644
--- a/packages/app/src/DBSearchPage.tsx
+++ b/packages/app/src/DBSearchPage.tsx
@@ -996,7 +996,6 @@ function DBSearchPage() {
     defaultSourceId,
     sources,
   ]);
-  console.log('localStorage value:', localStorage.getItem('hdx-search-language-preference'));
   const [_queryErrors, setQueryErrors] = useState<{
     [key: string]: Error | ClickHouseQueryError;
   }>({});

From 35ead19f3c13bbaca8fdac891a6c9b70b4191a91 Mon Sep 17 00:00:00 2001
From: akshat_1074 <valaniakshat1074@gmail.com>
Date: Sun, 22 Feb 2026 17:53:46 +0530
Subject: [PATCH 3/3] fix: remove setSearchedConfig from onLanguageChange to
 prevent form reset

---
 packages/app/src/DBSearchPage.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/app/src/DBSearchPage.tsx b/packages/app/src/DBSearchPage.tsx
index 07a2c2b0e..049b0ada2 100644
--- a/packages/app/src/DBSearchPage.tsx
+++ b/packages/app/src/DBSearchPage.tsx
@@ -944,7 +944,7 @@ function DBSearchPage() {
       reset({
         select: searchedConfig?.select ?? '',
         where: searchedConfig?.where ?? '',
-        whereLanguage: searchedConfig?.whereLanguage ?? 'lucene',
+        
         source: searchedConfig?.source ?? undefined,
         filters: searchedConfig?.filters ?? [],
         orderBy: searchedConfig?.orderBy ?? '',
@@ -1549,9 +1549,9 @@ function DBSearchPage() {
       setValue('whereLanguage', lang, {
         shouldDirty: true,
       });
-      setSearchedConfig({ whereLanguage: lang });
+      
     },
-    [setValue,setSearchedConfig],
+    [setValue],
   );
 
   const onModelFormExpandClose = useCallback(() => {