connections UX

packages/api/env/portal/.env

@@ -1,60 +1,47 @@
 DEVMODE=1
 
-CONNECTIONS=mysql,postgres,postgres1,mongo,mongo2,mysqlssh,sqlite,relational
+CONNECTIONS=mysql,postgres,mongo,redis,mssql,oracle
 
-LABEL_mysql=MySql localhost
+LABEL_mysql=MySql
-SERVER_mysql=localhost
+SERVER_mysql=dbgatedckstage1.sprinx.cz
 USER_mysql=root
-PASSWORD_mysql=test
+PASSWORD_mysql=Pwd2020Db
-PORT_mysql=3307
+PORT_mysql=3306
 ENGINE_mysql=mysql@dbgate-plugin-mysql
 
-LABEL_postgres=Postgres localhost
+LABEL_postgres=Postgres
-SERVER_postgres=localhost
+SERVER_postgres=dbgatedckstage1.sprinx.cz
 USER_postgres=postgres
 PASSWORD_postgres=Pwd2020Db
 PORT_postgres=5432
 ENGINE_postgres=postgres@dbgate-plugin-postgres
 
-LABEL_postgres1=Postgres localhost test DB
+LABEL_mongo=Mongo
-SERVER_postgres1=localhost
+SERVER_mongo=dbgatedckstage1.sprinx.cz
-USER_postgres1=postgres
+USER_mongo=root
-PASSWORD_postgres1=Pwd2020Db
+PASSWORD_mongo=Pwd2020Db
-PORT_postgres1=5432
+PORT_mongo=27017
-ENGINE_postgres1=postgres@dbgate-plugin-postgres
-DATABASE_postgres1=test
-
-LABEL_mongo=Mongo URL
-URL_mongo=mongodb://localhost:27017
 ENGINE_mongo=mongo@dbgate-plugin-mongo
 
-LABEL_mongo2=Mongo Server
+LABEL_redis=Redis
-SERVER_mongo2=localhost
+SERVER_redis=dbgatedckstage1.sprinx.cz
-ENGINE_mongo2=mongo@dbgate-plugin-mongo
+ENGINE_redis=redis@dbgate-plugin-redis
+PORT_redis=6379
 
-LABEL_mysqlssh=MySql SSH
+LABEL_mssql=SQL Server
-SERVER_mysqlssh=localhost
+SERVER_mssql=dbgatedckstage1.sprinx.cz
-USER_mysqlssh=root
+USER_mssql=sa
-PASSWORD_mysqlssh=xxx
+PASSWORD_mssql=Pwd2020Db
-PORT_mysqlssh=3316
+PORT_mssql=1433
-ENGINE_mysqlssh=mysql@dbgate-plugin-mysql
+ENGINE_mssql=mssql@dbgate-plugin-mssql
-USE_SSH_mysqlssh=1
-SSH_HOST_mysqlssh=demo.dbgate.org
-SSH_PORT_mysqlssh=22
-SSH_MODE_mysqlssh=userPassword
-SSH_LOGIN_mysqlssh=root
-SSH_PASSWORD_mysqlssh=xxx
 
-LABEL_sqlite=sqlite
+LABEL_oracle=Oracle
-FILE_sqlite=/home/jena/.dbgate/files/sqlite/feeds.sqlite
+SERVER_oracle=dbgatedckstage1.sprinx.cz
-ENGINE_sqlite=sqlite@dbgate-plugin-sqlite
+USER_oracle=system
-
+PASSWORD_oracle=Pwd2020Db
-LABEL_relational=Relational dataset repo
+PORT_oracle=1521
-SERVER_relational=relational.fit.cvut.cz
+ENGINE_oracle=oracle@dbgate-plugin-oracle
-USER_relational=guest
+SERVICE_NAME_oracle=xe
-PASSWORD_relational=relational
-ENGINE_relational=mariadb@dbgate-plugin-mysql
-READONLY_relational=1
 
 # SETTINGS_dataGrid.showHintColumns=1
 

packages/web/src/appobj/ConnectionAppObject.svelte

@@ -182,11 +182,9 @@
       connection: data,
       database: data.singleDatabase ? data.defaultDatabase : null,
     });
-    console.log('SET focusedConnectionOrDatabase', {
+
-      conid: data?._id,
+    const config = getCurrentConfig();
-      connection: data,
+    if (config.runAsPortal == false && !config.storageDatabase) {
-      database: data.singleDatabase ? data.defaultDatabase : null,
-    });
       openNewTab({
         title: getConnectionLabel(data),
         icon: 'img connection',
@@ -196,6 +194,7 @@
           conid: data._id,
         },
       });
+    }
   };
 
   const handleSqlRestore = () => {

packages/web/src/query/newQuery.ts

@@ -24,6 +24,7 @@ export default function newQuery({
       tooltip,
       tabComponent,
       multiTabIndex,
+      focused: true,
       props: {
         ...props,
         conid: connection._id,

packages/web/src/widgets/ConnectionList.svelte

@@ -19,6 +19,7 @@
     focusedConnectionOrDatabase,
     getFocusedConnectionOrDatabase,
     currentDatabase,
+    getCurrentConfig,
   } from '../stores';
   import runCommand from '../commands/runCommand';
   import { filterName, getConnectionLabel } from 'dbgate-tools';
@@ -231,6 +232,8 @@
         if (options.focusTab) {
           openConnection(data.connection);
         } else {
+          const config = getCurrentConfig();
+          if (config.runAsPortal == false && !config.storageDatabase) {
             openNewTab({
               title: getConnectionLabel(data.connection),
               icon: 'img connection',
@@ -242,6 +245,7 @@
             });
           }
         }
+      }
     }}
   >
     <AppObjectList

packages/web/src/widgets/SqlObjectList.svelte

@@ -35,7 +35,7 @@
   import DropDownButton from '../buttons/DropDownButton.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
   import CloseSearchButton from '../buttons/CloseSearchButton.svelte';
-  import { findEngineDriver } from 'dbgate-tools';
+  import { findEngineDriver, getConnectionLabel } from 'dbgate-tools';
   import {
     currentDatabase,
     extensions,
@@ -53,6 +53,7 @@
   import { matchDatabaseObjectAppObject } from '../appobj/appObjectTools';
   import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import clickOutside from '../utility/clickOutside';
+  import { openConnection } from '../appobj/ConnectionAppObject.svelte';
 
   export let conid;
   export let database;
@@ -135,8 +136,8 @@
 
   $: differentFocusedDb =
     $focusedConnectionOrDatabase &&
-    $focusedConnectionOrDatabase?.database &&
+    ($focusedConnectionOrDatabase.conid != conid ||
-    ($focusedConnectionOrDatabase.conid != conid || $focusedConnectionOrDatabase?.database != database);
+      ($focusedConnectionOrDatabase?.database && $focusedConnectionOrDatabase?.database != database));
 </script>
 
 {#if $status && $status.name == 'error'}
@@ -199,6 +200,7 @@
 
   {#if differentFocusedDb}
     <div class="no-focused-info">
+      {#if $focusedConnectionOrDatabase?.database}
         <div class="m-1">Current database:</div>
         <div class="m-1 ml-3 mb-3">
           <b>{database}</b>
@@ -223,6 +225,27 @@
             };
           }}
         />
+      {:else}
+        <div class="m-1">Current connection:</div>
+        <div class="m-1 ml-3 mb-3">
+          <b>{getConnectionLabel($connection)}</b>
+        </div>
+        <FormStyledButton
+          value={`Connect to ${getConnectionLabel($focusedConnectionOrDatabase?.connection)}`}
+          skipWidth
+          on:click={() => openConnection($focusedConnectionOrDatabase?.connection)}
+        />
+        <FormStyledButton
+          value={`Show ${getConnectionLabel($connection)}`}
+          skipWidth
+          on:click={() => {
+            $focusedConnectionOrDatabase = {
+              conid,
+              connection: $connection,
+            };
+          }}
+        />
+      {/if}
     </div>
   {/if}