From 8aac9cf59d7c79f23d7465aae18dc23c31f34d16 Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Fri, 20 Sep 2024 14:40:14 +0200
Subject: [PATCH] loading schemas indicator + error reporting

---
 .../api/src/proc/databaseConnectionProcess.js |  1 +
 .../web/src/appobj/DatabaseAppObject.svelte   | 18 +++++++++++++++-
 .../web/src/impexp/FormSchemaSelect.svelte    |  3 ++-
 packages/web/src/stores.ts                    |  1 +
 packages/web/src/utility/common.ts            | 21 +++++++++++++++++--
 packages/web/src/widgets/SqlObjectList.svelte |  4 ++--
 .../dbgate-plugin-mssql/src/backend/driver.js |  2 ++
 .../src/backend/drivers.js                    |  2 ++
 8 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/packages/api/src/proc/databaseConnectionProcess.js b/packages/api/src/proc/databaseConnectionProcess.js
index 702b968d..7ca93323 100644
--- a/packages/api/src/proc/databaseConnectionProcess.js
+++ b/packages/api/src/proc/databaseConnectionProcess.js
@@ -214,6 +214,7 @@ async function handleDriverDataCore(msgid, callMethod) {
 }
 
 async function handleSchemaList({ msgid }) {
+  logger.debug('Loading schema list');
   return handleDriverDataCore(msgid, driver => driver.listSchemas(dbhan));
 }
 
diff --git a/packages/web/src/appobj/DatabaseAppObject.svelte b/packages/web/src/appobj/DatabaseAppObject.svelte
index 120577e7..7285f8b6 100644
--- a/packages/web/src/appobj/DatabaseAppObject.svelte
+++ b/packages/web/src/appobj/DatabaseAppObject.svelte
@@ -262,6 +262,17 @@
       });
     };
 
+    const handleRefreshSchemas = () => {
+      const conid = connection._id;
+      const database = name;
+      apiCall('database-connections/dispatch-database-changed-event', {
+        event: 'schema-list-changed',
+        conid,
+        database,
+      });
+      loadSchemaList(conid, database);
+    };
+
     async function handleConfirmSql(sql) {
       saveScriptToDatabase({ conid: connection._id, database: name }, sql, false);
     }
@@ -290,6 +301,8 @@
         onClick: handleNewPerspective,
         text: 'Design perspective query',
       },
+      connection.useSeparateSchemas && { onClick: handleRefreshSchemas, text: 'Refresh schemas' },
+
       { divider: true },
       isSqlOrDoc &&
         !connection.isReadOnly &&
@@ -364,6 +377,7 @@
     getCurrentDatabase,
     getExtensions,
     getOpenedTabs,
+    loadingSchemaLists,
     openedConnections,
     openedSingleDatabaseConnections,
     pinnedDatabases,
@@ -391,7 +405,7 @@
   import hasPermission from '../utility/hasPermission';
   import { openImportExportTab } from '../utility/importExportTools';
   import newTable from '../tableeditor/newTable';
-  import { switchCurrentDatabase } from '../utility/common';
+  import { loadSchemaList, switchCurrentDatabase } from '../utility/common';
 
   export let data;
   export let passProps;
@@ -409,6 +423,7 @@
 
   $: isPinned = !!$pinnedDatabases.find(x => x?.name == data.name && x?.connection?._id == data.connection?._id);
   $: apps = useUsedApps();
+  $: isLoadingSchemas = $loadingSchemaLists[`${data?.connection?._id}::${data?.name}`];
 </script>
 
 <AppObjectCore
@@ -431,6 +446,7 @@
       .find(x => x.isNewQuery)
       .onClick();
   }}
+  statusIcon={isLoadingSchemas ? 'icon loading' : ''}
   menu={createMenu}
   showPinnedInsteadOfUnpin={passProps?.showPinnedInsteadOfUnpin}
   onPin={isPinned ? null : () => pinnedDatabases.update(list => [...list, data])}
diff --git a/packages/web/src/impexp/FormSchemaSelect.svelte b/packages/web/src/impexp/FormSchemaSelect.svelte
index bcc6c757..049fdad7 100644
--- a/packages/web/src/impexp/FormSchemaSelect.svelte
+++ b/packages/web/src/impexp/FormSchemaSelect.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import _ from 'lodash';
   import { getFormContext } from '../forms/FormProviderCore.svelte';
   import FormSelectField from '../forms/FormSelectField.svelte';
   import { useSchemaList } from '../utility/metadataLoaders';
@@ -9,7 +10,7 @@
   const { values } = getFormContext();
   $: schemaList = useSchemaList({ conid: $values[conidName], database: values[databaseName] });
 
-  $: schemaOptions = ($schemaList || []).map(schema => ({
+  $: schemaOptions = (_.isArray($schemaList) ? $schemaList : []).map(schema => ({
     value: schema.schemaName,
     label: schema.schemaName,
   }));
diff --git a/packages/web/src/stores.ts b/packages/web/src/stores.ts
index ae7fe1b0..9d2ca81f 100644
--- a/packages/web/src/stores.ts
+++ b/packages/web/src/stores.ts
@@ -150,6 +150,7 @@ export const loadingPluginStore = writable({
 });
 export const activeDbKeysStore = writableWithStorage({}, 'activeDbKeysStore');
 export const appliedCurrentSchema = writable<string>(null);
+export const loadingSchemaLists = writable({}); // dict [`${conid}::${database}`]: true
 
 export const currentThemeDefinition = derived([currentTheme, extensions], ([$currentTheme, $extensions]) =>
   $extensions.themes.find(x => x.themeClassName == $currentTheme)
diff --git a/packages/web/src/utility/common.ts b/packages/web/src/utility/common.ts
index 41df84b1..e047e859 100644
--- a/packages/web/src/utility/common.ts
+++ b/packages/web/src/utility/common.ts
@@ -1,7 +1,8 @@
 import { findDefaultSchema, findEngineDriver, isCompositeDbName } from 'dbgate-tools';
-import { currentDatabase, getExtensions, getOpenedTabs, openedTabs } from '../stores';
+import { currentDatabase, getExtensions, getOpenedTabs, loadingSchemaLists, openedTabs } from '../stores';
 import _ from 'lodash';
 import { getSchemaList } from './metadataLoaders';
+import { showSnackbarError } from './snackbar';
 
 export class LoadingToken {
   isCanceled = false;
@@ -85,13 +86,29 @@ export function isCtrlOrCommandKey(event) {
   return event.ctrlKey;
 }
 
+export async function loadSchemaList(conid, database) {
+  try {
+    loadingSchemaLists.update(x => ({ ...x, [`${conid}::${database}`]: true }));
+    const schemas = await getSchemaList({ conid, database });
+    if (schemas.errorMessage) {
+      showSnackbarError(`Error loading schemas: ${schemas.errorMessage}`);
+      console.error('Error loading schemas', schemas.errorMessage);
+      return;
+    }
+    return schemas;
+  } finally {
+    loadingSchemaLists.update(x => _.omit(x, [`${conid}::${database}`]));
+  }
+}
+
 export async function switchCurrentDatabase(data) {
   if (data?.connection?.useSeparateSchemas && !isCompositeDbName(data.name)) {
     const conid = data.connection._id;
     const database = data.name;
     const storageKey = `selected-schema-${conid}-${database}`;
     const schemaInStorage = localStorage.getItem(storageKey);
-    const schemas = await getSchemaList({ conid, database });
+    const schemas = await loadSchemaList(conid, database);
+    if (!schemas) return;
     const driver = findEngineDriver(data.connection, getExtensions());
     const defaultSchema = findDefaultSchema(schemas, driver?.dialect, schemaInStorage);
     currentDatabase.set({
diff --git a/packages/web/src/widgets/SqlObjectList.svelte b/packages/web/src/widgets/SqlObjectList.svelte
index fb61b491..126d15e5 100644
--- a/packages/web/src/widgets/SqlObjectList.svelte
+++ b/packages/web/src/widgets/SqlObjectList.svelte
@@ -124,7 +124,7 @@
   </WidgetsInnerContainer>
 {:else if objectList.length == 0 && $status && $status.name != 'pending' && $status.name != 'checkStructure' && $status.name != 'loadStructure' && $objects}
   <SchemaSelector
-    schemaList={$schemaList}
+    schemaList={_.isArray($schemaList) ? $schemaList : null}
     objectList={flatFilteredList}
     connection={$connection}
     {conid}
@@ -159,7 +159,7 @@
     </InlineButton>
   </SearchBoxWrapper>
   <SchemaSelector
-    schemaList={$schemaList}
+    schemaList={_.isArray($schemaList) ? $schemaList : null}
     objectList={flatFilteredList}
     connection={$connection}
     {conid}
diff --git a/plugins/dbgate-plugin-mssql/src/backend/driver.js b/plugins/dbgate-plugin-mssql/src/backend/driver.js
index 565d193a..5404a0d6 100644
--- a/plugins/dbgate-plugin-mssql/src/backend/driver.js
+++ b/plugins/dbgate-plugin-mssql/src/backend/driver.js
@@ -159,6 +159,8 @@ const driver = {
     const defaultSchemaRows = await this.query(dbhan, 'SELECT SCHEMA_NAME() as name');
     const defaultSchema = defaultSchemaRows.rows[0]?.name;
 
+    logger.debug(`Loaded ${rows.length} mssql schemas`);
+
     return rows.map(x => ({
       ...x,
       isDefault: x.schemaName == defaultSchema,
diff --git a/plugins/dbgate-plugin-postgres/src/backend/drivers.js b/plugins/dbgate-plugin-postgres/src/backend/drivers.js
index dd01dd0c..9e14f08e 100644
--- a/plugins/dbgate-plugin-postgres/src/backend/drivers.js
+++ b/plugins/dbgate-plugin-postgres/src/backend/drivers.js
@@ -280,6 +280,8 @@ const drivers = driverBases.map(driverBase => ({
     const defaultSchemaRows = await this.query(dbhan, 'SHOW SEARCH_PATH;');
     const searchPath = defaultSchemaRows.rows[0]?.search_path?.replace('"$user",', '')?.trim();
 
+    logger.debug(`Loaded ${schemaRows.rows.length} postgres schemas`);
+
     const schemas = schemaRows.rows.map(x => ({
       schemaName: x.schema_name,
       objectId: x.object_id,