From 8d2c2cd62d415cc9190e7760cf73c2ae81fde8d1 Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Tue, 7 Jan 2025 09:32:01 +0100
Subject: [PATCH] focus query editor

---
 packages/web/src/appobj/ConnectionAppObject.svelte      | 3 ++-
 packages/web/src/appobj/DatabaseAppObject.svelte        | 2 ++
 packages/web/src/appobj/DatabaseObjectAppObject.svelte  | 2 ++
 packages/web/src/datagrid/CollectionDataGridCore.svelte | 1 +
 packages/web/src/datagrid/SqlDataGridCore.svelte        | 1 +
 packages/web/src/tabs/ImportExportTab.svelte            | 2 +-
 packages/web/src/tabs/SqlObjectTab.svelte               | 1 +
 packages/web/src/widgets/QueryHistoryList.svelte        | 1 +
 8 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/web/src/appobj/ConnectionAppObject.svelte b/packages/web/src/appobj/ConnectionAppObject.svelte
index 076bc7119..a49e3d553 100644
--- a/packages/web/src/appobj/ConnectionAppObject.svelte
+++ b/packages/web/src/appobj/ConnectionAppObject.svelte
@@ -284,6 +284,7 @@
         icon: 'img sql-file',
         tooltip,
         tabComponent: 'QueryTab',
+        focused: true,
         props: {
           conid: data._id,
         },
@@ -320,7 +321,7 @@
         ],
       { divider: true },
       !data.singleDatabase && [
-        hasPermission(`dbops/query`) && { onClick: handleNewQuery, text: 'New query', isNewQuery: true },
+        hasPermission(`dbops/query`) && { onClick: handleNewQuery, text: 'New Query (server)', isNewQuery: true },
         $openedConnections.includes(data._id) &&
           data.status && {
             text: 'Refresh',
diff --git a/packages/web/src/appobj/DatabaseAppObject.svelte b/packages/web/src/appobj/DatabaseAppObject.svelte
index b9ad7b41c..decbb8261 100644
--- a/packages/web/src/appobj/DatabaseAppObject.svelte
+++ b/packages/web/src/appobj/DatabaseAppObject.svelte
@@ -53,6 +53,7 @@
         icon: 'img sql-file',
         tooltip,
         tabComponent: 'QueryTab',
+        focused: true,
         props: {
           conid: connection._id,
           database: name,
@@ -240,6 +241,7 @@
         title: 'Query #',
         icon: 'img query-design',
         tabComponent: 'QueryDesignTab',
+        focused: true,
         props: {
           conid: connection._id,
           database: name,
diff --git a/packages/web/src/appobj/DatabaseObjectAppObject.svelte b/packages/web/src/appobj/DatabaseObjectAppObject.svelte
index daf58d4fd..176d940fd 100644
--- a/packages/web/src/appobj/DatabaseObjectAppObject.svelte
+++ b/packages/web/src/appobj/DatabaseObjectAppObject.svelte
@@ -421,6 +421,7 @@
           title: 'Query #',
           icon: 'img query-design',
           tabComponent: 'QueryDesignTab',
+          focused: true,
           props: {
             conid: data.conid,
             database: data.database,
@@ -666,6 +667,7 @@
       {
         // title: getObjectTitle(connection, schemaName, pureName),
         title: tabComponent ? getObjectTitle(connection, schemaName, pureName) : 'Query #',
+        focused: tabComponent == null,
         tooltip,
         icon:
           icon ||
diff --git a/packages/web/src/datagrid/CollectionDataGridCore.svelte b/packages/web/src/datagrid/CollectionDataGridCore.svelte
index b1175e316..8dda67cd3 100644
--- a/packages/web/src/datagrid/CollectionDataGridCore.svelte
+++ b/packages/web/src/datagrid/CollectionDataGridCore.svelte
@@ -216,6 +216,7 @@
         title: 'Query #',
         icon: 'img sql-file',
         tabComponent: 'QueryTab',
+        focused: true,
         props: {
           conid,
           database,
diff --git a/packages/web/src/datagrid/SqlDataGridCore.svelte b/packages/web/src/datagrid/SqlDataGridCore.svelte
index 2c0332a06..471240974 100644
--- a/packages/web/src/datagrid/SqlDataGridCore.svelte
+++ b/packages/web/src/datagrid/SqlDataGridCore.svelte
@@ -153,6 +153,7 @@
         title: 'Query #',
         icon: 'img sql-file',
         tabComponent: 'QueryTab',
+        focused: true,
         props: {
           schemaName: display.baseTableOrSimilar?.schemaName,
           pureName: display.baseTableOrSimilar?.pureName,
diff --git a/packages/web/src/tabs/ImportExportTab.svelte b/packages/web/src/tabs/ImportExportTab.svelte
index fd972f387..37e4321cc 100644
--- a/packages/web/src/tabs/ImportExportTab.svelte
+++ b/packages/web/src/tabs/ImportExportTab.svelte
@@ -166,7 +166,7 @@
 
   const handleGenerateScript = async e => {
     const values = $formValues as any;
-    const code = await createImpExpScript($extensions, values, undefined, true);
+    const code = await createImpExpScript($extensions, values, true);
     openNewTab(
       {
         title: 'Shell #',
diff --git a/packages/web/src/tabs/SqlObjectTab.svelte b/packages/web/src/tabs/SqlObjectTab.svelte
index 042fd0f21..f02dca4f2 100644
--- a/packages/web/src/tabs/SqlObjectTab.svelte
+++ b/packages/web/src/tabs/SqlObjectTab.svelte
@@ -161,6 +161,7 @@
             icon: 'img sql-file',
             tabComponent: 'QueryTab',
             objectTypeField: appObjectData.objectTypeField,
+            focused: true,
             props: {
               conid,
               database,
diff --git a/packages/web/src/widgets/QueryHistoryList.svelte b/packages/web/src/widgets/QueryHistoryList.svelte
index 992172959..f6436df20 100644
--- a/packages/web/src/widgets/QueryHistoryList.svelte
+++ b/packages/web/src/widgets/QueryHistoryList.svelte
@@ -57,6 +57,7 @@
             title: 'Query #',
             icon: 'icon sql-file',
             tabComponent: 'QueryTab',
+            focused: true,
             props: {
               conid: item.conid,
               database: item.database,