runAsPortal - connections from env variables, cannot be changed

This commit is contained in:
Jan Prochazka
2020-05-17 08:43:42 +02:00
parent 044d8dc538
commit 0bf44b9a9d
8 changed files with 68 additions and 8 deletions

View File

@@ -6,6 +6,7 @@
],
"scripts": {
"start:api": "yarn workspace @dbgate/api start",
"start:api:portal": "yarn workspace @dbgate/api start:portal",
"start:web": "yarn workspace @dbgate/web start",
"start:sqltree": "yarn workspace @dbgate/sqltree start",
"start:datalib": "yarn workspace @dbgate/datalib start",

View File

@@ -24,6 +24,7 @@
},
"scripts": {
"start": "nodemon src/index.js",
"start:portal": "cross-env CONNECTIONS=mysql LABEL_mysql=localhost-mysql SERVER_mysql=localhost USER_mysql=root PASSWORD_mysql=test PORT_mysql=3307 ENGINE_mysql=mysql nodemon src/index.js",
"ts": "tsc",
"build": "webpack"
},

View File

@@ -0,0 +1,8 @@
module.exports = {
get_meta: 'get',
async get() {
return {
runAsPortal: !!process.env.CONNECTIONS,
};
},
};

View File

@@ -6,19 +6,37 @@ const nedb = require('nedb-promises');
const { datadir } = require('../utility/directories');
const socket = require('../utility/socket');
function getPortalCollections() {
if (process.env.CONNECTIONS) {
return _.compact(process.env.CONNECTIONS.split(',')).map((id) => ({
_id: id,
engine: process.env[`ENGINE_${id}`],
server: process.env[`SERVER_${id}`],
user: process.env[`USER_${id}`],
password: process.env[`PASSWORD_${id}`],
port: process.env[`PORT_${id}`],
displayName: process.env[`LABEL_${id}`],
}));
}
return null;
}
const portalConnections = getPortalCollections();
module.exports = {
datastore: null,
opened: [],
async _init() {
const dir = datadir();
// @ts-ignore
this.datastore = nedb.create(path.join(dir, 'connections.jsonl'));
if (!portalConnections) {
// @ts-ignore
this.datastore = nedb.create(path.join(dir, 'connections.jsonl'));
}
},
list_meta: 'get',
async list() {
return this.datastore.find();
return portalConnections || this.datastore.find();
},
test_meta: {
@@ -39,6 +57,7 @@ module.exports = {
save_meta: 'post',
async save(connection) {
if (portalConnections) return;
let res;
if (connection._id) {
res = await this.datastore.update(_.pick(connection, '_id'), connection);
@@ -51,6 +70,7 @@ module.exports = {
delete_meta: 'post',
async delete(connection) {
if (portalConnections) return;
const res = await this.datastore.remove(_.pick(connection, '_id'));
socket.emitChanged('connection-list-changed');
return res;
@@ -58,6 +78,7 @@ module.exports = {
get_meta: 'get',
async get({ conid }) {
if (portalConnections) return portalConnections.find((x) => x._id == conid);
const res = await this.datastore.find({ _id: conid });
return res[0];
},

View File

@@ -16,6 +16,7 @@ const databaseConnections = require('./controllers/databaseConnections');
const metadata = require('./controllers/metadata');
const sessions = require('./controllers/sessions');
const jsldata = require('./controllers/jsldata');
const config = require('./controllers/config');
function start(argument = null) {
console.log('process.argv', process.argv);
@@ -34,6 +35,7 @@ function start(argument = null) {
useController(app, '/metadata', metadata);
useController(app, '/sessions', sessions);
useController(app, '/jsldata', jsldata);
useController(app, '/config', config);
if (fs.existsSync('/home/dbgate-docker/build')) {
// server static files inside docker container

View File

@@ -7,8 +7,10 @@ import ConnectionModal from '../modals/ConnectionModal';
import axios from '../utility/axios';
import { filterName } from '@dbgate/datalib';
import ConfirmModal from '../modals/ConfirmModal';
import { useConfig } from '../utility/metadataLoaders';
function Menu({ data, setOpenedConnections, openedConnections }) {
const config = useConfig();
const handleEdit = () => {
showModal((modalState) => <ConnectionModal modalState={modalState} connection={data} />);
};
@@ -27,10 +29,18 @@ function Menu({ data, setOpenedConnections, openedConnections }) {
const handleDisconnect = () => {
setOpenedConnections((list) => list.filter((x) => x != data._id));
};
const handleConnect = () => {
setOpenedConnections((list) => [...list, data._id]);
};
return (
<>
<DropDownMenuItem onClick={handleEdit}>Edit</DropDownMenuItem>
<DropDownMenuItem onClick={handleDelete}>Delete</DropDownMenuItem>
{config.runAsPortal == false && (
<>
<DropDownMenuItem onClick={handleEdit}>Edit</DropDownMenuItem>
<DropDownMenuItem onClick={handleDelete}>Delete</DropDownMenuItem>
</>
)}
{!openedConnections.includes(data._id) && <DropDownMenuItem onClick={handleConnect}>Connect</DropDownMenuItem>}
{openedConnections.includes(data._id) && data.status && (
<DropDownMenuItem onClick={handleRefresh}>Refresh</DropDownMenuItem>
)}

View File

@@ -40,6 +40,12 @@ const connectionInfoLoader = ({ conid }) => ({
reloadTrigger: 'connection-list-changed',
});
const configLoader = () => ({
url: 'config/get',
params: {},
reloadTrigger: 'config-changed',
});
// const sqlObjectListLoader = ({ conid, database }) => ({
// url: 'metadata/list-objects',
// params: { conid, database },
@@ -204,3 +210,10 @@ export function getConnectionList() {
export function useConnectionList() {
return useCore(connectionListLoader, {});
}
export function getConfig() {
return getCore(configLoader, {}) || {};
}
export function useConfig() {
return useCore(configLoader, {}) || {};
}

View File

@@ -4,6 +4,7 @@ import ConnectionModal from '../modals/ConnectionModal';
import styled from 'styled-components';
import ToolbarButton from './ToolbarButton';
import useNewQuery from '../query/useNewQuery';
import { useConfig } from '../utility/metadataLoaders';
const ToolbarContainer = styled.div`
display: flex;
@@ -13,13 +14,16 @@ const ToolbarContainer = styled.div`
export default function ToolBar({ toolbarPortalRef }) {
const modalState = useModalState();
const newQuery = useNewQuery();
const config = useConfig();
return (
<ToolbarContainer>
<ConnectionModal modalState={modalState} />
<ToolbarButton onClick={modalState.open} icon="fas fa-database">
Add connection
</ToolbarButton>
{config.runAsPortal == false && (
<ToolbarButton onClick={modalState.open} icon="fas fa-database">
Add connection
</ToolbarButton>
)}
<ToolbarButton onClick={newQuery} icon="fas fa-file-alt">
New Query
</ToolbarButton>