From 4d25fef37dc887d858fd3fed517f0da96d8e0f93 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Mon, 17 Jun 2024 17:06:00 +0200 Subject: [PATCH] fixed singledb docker connections --- packages/api/env/portal/.env | 14 +++++++++++--- packages/web/src/stores.ts | 10 +++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/packages/api/env/portal/.env b/packages/api/env/portal/.env index 578102633..774afaf96 100644 --- a/packages/api/env/portal/.env +++ b/packages/api/env/portal/.env @@ -1,6 +1,6 @@ DEVMODE=1 -CONNECTIONS=mysql,postgres,mongo,mongo2,mysqlssh,sqlite,relational +CONNECTIONS=mysql,postgres,postgres1,mongo,mongo2,mysqlssh,sqlite,relational LABEL_mysql=MySql localhost SERVER_mysql=localhost @@ -12,10 +12,18 @@ ENGINE_mysql=mysql@dbgate-plugin-mysql LABEL_postgres=Postgres localhost SERVER_postgres=localhost USER_postgres=postgres -PASSWORD_postgres=test -PORT_postgres=5433 +PASSWORD_postgres=Pwd2020Db +PORT_postgres=5432 ENGINE_postgres=postgres@dbgate-plugin-postgres +LABEL_postgres1=Postgres localhost test DB +SERVER_postgres1=localhost +USER_postgres1=postgres +PASSWORD_postgres1=Pwd2020Db +PORT_postgres1=5432 +ENGINE_postgres1=postgres@dbgate-plugin-postgres +DATABASE_postgres1=test + LABEL_mongo=Mongo URL URL_mongo=mongodb://localhost:27017 ENGINE_mongo=mongo@dbgate-plugin-mongo diff --git a/packages/web/src/stores.ts b/packages/web/src/stores.ts index 0f69fb378..583d86174 100644 --- a/packages/web/src/stores.ts +++ b/packages/web/src/stores.ts @@ -146,9 +146,13 @@ export const currentThemeDefinition = derived([currentTheme, extensions], ([$cur $extensions.themes.find(x => x.themeClassName == $currentTheme) ); export const openedConnectionsWithTemporary = derived( - [openedConnections, temporaryOpenedConnections], - ([$openedConnections, $temporaryOpenedConnections]) => - _.uniq([...$openedConnections, ...$temporaryOpenedConnections.map(x => x.conid)]) + [openedConnections, temporaryOpenedConnections, openedSingleDatabaseConnections], + ([$openedConnections, $temporaryOpenedConnections, $openedSingleDatabaseConnections]) => + _.uniq([ + ...$openedConnections, + ...$temporaryOpenedConnections.map(x => x.conid), + ...$openedSingleDatabaseConnections, + ]) ); let nativeMenuOnStartup = null;