Merge pull request dbgate#1451 from dbgate/feature/display-schema

Added schema name for tables

Author: janproch

packages/web/src/commands/CommandPalette.svelte

@@ -25,11 +25,17 @@
   });
 
   function extractDbItems(db, dbConnectionInfo, connectionList, $extensions, currentThemeType) {
+    const allObjects = _.flatten(
+      ['tables', 'collections', 'views', 'matviews', 'procedures', 'functions'].map(objectTypeField =>
+        ((db || {})[objectTypeField] || []).map(obj => ({ objectTypeField, obj }))
+      )
+    );
+    const pureNameCounts = _.countBy(allObjects, ({ obj }) => obj.pureName);
     const objectList = _.flatten(
       ['tables', 'collections', 'views', 'matviews', 'procedures', 'functions'].map(objectTypeField =>
         _.sortBy(
           ((db || {})[objectTypeField] || []).map(obj => ({
-            text: obj.pureName,
+            text: pureNameCounts[obj.pureName] > 1 ? fullNameToLabel(obj) : obj.pureName,
             onClick: () => handleDatabaseObjectClick({ objectTypeField, ...dbConnectionInfo, ...obj }),
             icon: databaseObjectIcons[objectTypeField],
           })),
@@ -43,11 +49,11 @@
       if (connection.singleDatabase) continue;
       if (getCurrentConfig()?.singleDbConnection) continue;
       const databases = getLocalStorage(`database_list_${conid}`) || [];
-      
+
       const driver = findEngineDriver(connection, $extensions);
       const driverIcon = getDriverIcon(driver, currentThemeType);
       const connectionIcon = driverIcon || 'img database';
-      
+
       for (const db of databases) {
         databaseList.push({
           text: `${db.name} on ${getConnectionLabel(connection)}`,
@@ -66,7 +72,7 @@
 </script>
 
 <script>
-  import { filterName, getConnectionLabel, findEngineDriver } from 'dbgate-tools';
+  import { filterName, getConnectionLabel, findEngineDriver, fullNameToLabel } from 'dbgate-tools';
 
   import _ from 'lodash';
   import { onMount } from 'svelte';
@@ -190,7 +196,8 @@
           domInput.focus();
         }}
       >
-        <FontIcon icon="icon menu" /> {_t('commandPalette.commands', { defaultMessage: 'Commands' })}
+        <FontIcon icon="icon menu" />
+        {_t('commandPalette.commands', { defaultMessage: 'Commands' })}
       </div>
       <div
         class="page"
@@ -200,7 +207,8 @@
           domInput.focus();
         }}
       >
-        <FontIcon icon="icon database" /> {_t('common.database', { defaultMessage: 'Database' })}
+        <FontIcon icon="icon database" />
+        {_t('common.database', { defaultMessage: 'Database' })}
       </div>
     </div>
     <div class="mainInner">
@@ -211,7 +219,9 @@
           bind:value={filter}
           on:keydown={handleKeyDown}
           placeholder={_tval(parentCommand?.text) ||
-            ($visibleCommandPalette == 'database' ? _t('commandPalette.searchInDatabase', { defaultMessage: 'Search in database' }) : _t('commandPalette.searchInCommands', { defaultMessage: 'Search in commands' }))}
+            ($visibleCommandPalette == 'database'
+              ? _t('commandPalette.searchInDatabase', { defaultMessage: 'Search in database' })
+              : _t('commandPalette.searchInCommands', { defaultMessage: 'Search in commands' }))}
         />
       </div>
       <div class="content">
@@ -360,7 +370,9 @@
     display: flex;
     align-items: center;
     gap: 6px;
-    transition: color 150ms ease-in-out, border-color 150ms ease-in-out;
+    transition:
+      color 150ms ease-in-out,
+      border-color 150ms ease-in-out;
   }
 
   .page:hover {