extracted getConnectionLabel functionality

packages/web/src/appobj/ConnectionAppObject.svelte

@@ -16,6 +16,7 @@
   import openNewTab from '../utility/openNewTab';
   import { getDatabaseMenuItems } from './DatabaseAppObject.svelte';
   import getElectron from '../utility/getElectron';
+  import getConnectionLabel from '../utility/getConnectionLabel';
 
   export let data;
 
@@ -66,7 +67,7 @@
     };
     const handleDelete = () => {
       showModal(ConfirmModal, {
-        message: `Really delete connection ${data.displayName || data.server}?`,
+        message: `Really delete connection ${getConnectionLabel(data)}?`,
         onConfirm: () => axiosInstance.post('connections/delete', data),
       });
     };
@@ -74,7 +75,7 @@
       axiosInstance.post('connections/save', {
         ...data,
         _id: undefined,
-        displayName: `${data.displayName || data.server} - copy`,
+        displayName: `${getConnectionLabel(data)} - copy`,
       });
     };
     const handleCreateDatabase = () => {
@@ -90,7 +91,7 @@
       });
     };
     const handleNewQuery = () => {
-      const tooltip = `${data.displayName || data.server}`;
+      const tooltip = `${getConnectionLabel(data)}`;
       openNewTab({
         title: 'Query #',
         icon: 'img sql-file',
@@ -172,30 +173,12 @@
       statusTitle = null;
     }
   }
-
-  // const handleEdit = () => {
-  //   showModal(modalState => <ConnectionModal modalState={modalState} connection={data} />);
-  // };
-  // const handleDelete = () => {
-  //   showModal(modalState => (
-  //     <ConfirmModal
-  //       modalState={modalState}
-  //       message={`Really delete connection ${data.displayName || data.server}?`}
-  //       onConfirm={() => axios.post('connections/delete', data)}
-  //     />
-  //   ));
-  // };
-  // const handleCreateDatabase = () => {
-  //   showModal(modalState => <CreateDatabaseModal modalState={modalState} conid={data._id} />);
-  // };
 </script>
 
 <AppObjectCore
   {...$$restProps}
   {data}
-  title={data.singleDatabase
-    ? data.displayName || `${data.defaultDatabase} on ${data.server}`
-    : data.displayName || data.server}
+  title={getConnectionLabel(data)}
   icon={data.singleDatabase ? 'img database' : 'img server'}
   isBold={data.singleDatabase
     ? _.get($currentDatabase, 'connection._id') == data._id && _.get($currentDatabase, 'name') == data.defaultDatabase

packages/web/src/appobj/DatabaseAppObject.svelte

@@ -4,7 +4,7 @@
 
   export function getDatabaseMenuItems(connection, name, $extensions, $currentDatabase) {
     const handleNewQuery = () => {
-      const tooltip = `${connection.displayName || connection.server}\n${name}`;
+      const tooltip = `${getConnectionLabel(connection)}\n${name}`;
       openNewTab({
         title: 'Query #',
         icon: 'img sql-file',
@@ -66,6 +66,8 @@
 </script>
 
 <script lang="ts">
+  import getConnectionLabel from '../utility/getConnectionLabel';
+
   import _ from 'lodash';
   import ImportExportModal from '../modals/ImportExportModal.svelte';
   import { showModal } from '../modals/modalTools';

packages/web/src/appobj/DatabaseObjectAppObject.svelte

@@ -228,7 +228,7 @@
     initialData
   ) {
     const connection = await getConnectionInfo({ conid });
-    const tooltip = `${connection.displayName || connection.server}\n${database}\n${fullDisplayName({
+    const tooltip = `${getConnectionLabel(connection)}\n${database}\n${fullDisplayName({
       schemaName,
       pureName,
     })}`;
@@ -267,6 +267,7 @@
   import { findEngineDriver } from 'dbgate-tools';
   import uuidv1 from 'uuid/v1';
   import SqlGeneratorModal from '../modals/SqlGeneratorModal.svelte';
+import getConnectionLabel from '../utility/getConnectionLabel';
 
   export let data;
 

packages/web/src/appobj/SavedFileAppObject.svelte

@@ -67,6 +67,7 @@
   import { currentDatabase } from '../stores';
 
   import axiosInstance from '../utility/axiosInstance';
+  import getConnectionLabel from '../utility/getConnectionLabel';
   import hasPermission from '../utility/hasPermission';
   import openNewTab from '../utility/openNewTab';
 
@@ -130,7 +131,7 @@
       const database = _.get($currentDatabase, 'name');
       connProps.conid = connection._id;
       connProps.database = database;
-      tooltip = `${connection.displayName || connection.server}\n${database}`;
+      tooltip = `${getConnectionLabel(connection)}\n${database}`;
     }
 
     openNewTab(