dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-05-01 08:33:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

db config fix

Browse Source
This commit is contained in:
Jan Prochazka
2021-12-05 17:21:40 +01:00
parent 46ab02f914
commit f690446cee
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/api/src/controllers/connections.js
View File

@@ -174,15 +174,13 @@ module.exports = {
async updateDatabase({ conid, database, values }) { async updateDatabase({ conid, database, values }) {
if (portalConnections) return; if (portalConnections) return;
const conn = await this.datastore.find({ _id: conid }); const conn = await this.datastore.find({ _id: conid });
let databaseConfig = conn.databaseConfig || {}; let databases = conn.databases || [];
databaseConfig = { if (databases.find(x => x.name == database)) {
...databaseConfig, databases = databases.map(x => (x.item == database ? { ...x, ...values } : x));
[database]: { } else {
...databaseConfig[database], databases = [...databases, { name: database, ...values }];
...values, }
}, const res = await this.datastore.update({ _id: conid }, { $set: { databases } });
};
const res = await this.datastore.update({ _id: conid }, { $set: { databaseConfig } });
socket.emitChanged('connection-list-changed'); socket.emitChanged('connection-list-changed');
return res; return res;
}, },

10
packages/web/src/utility/useConnectionColor.ts
View File

@@ -15,13 +15,9 @@ export function getConnectionColor(
const current = connections.find(x => x._id == dbid.conid); const current = connections.find(x => x._id == dbid.conid);
const { database } = dbid; const { database } = dbid;
let colorName = useConnectionFallback || !database ? current?.connectionColor : null; let colorName = useConnectionFallback || !database ? current?.connectionColor : null;
if ( const dbConfig = (current?.databases || []).find(x => x.name == database);
database && if (dbConfig?.databaseColor) {
current.databaseConfig && colorName = dbConfig.databaseColor;
current.databaseConfig[database] &&
current.databaseConfig[database].databaseColor
) {
colorName = current.databaseConfig[database].databaseColor;
} }
if (!colorName) return undefined; if (!colorName) return undefined;
const palettes = themeType == 'dark' ? presetDarkPalettes : presetPalettes; const palettes = themeType == 'dark' ? presetDarkPalettes : presetPalettes;