This commit is contained in:
Jan Prochazka
2020-05-01 14:11:47 +02:00
parent bfef6b57dd
commit 3e07c2b76e
5 changed files with 40 additions and 8 deletions

View File

@@ -28,7 +28,8 @@ module.exports = {
test(req, res) {
const subprocess = fork(process.argv[1], ['connectProcess']);
subprocess.on('message', (resp) => {
const { msgtype } = res;
// @ts-ignore
const { msgtype } = resp;
if (msgtype == 'connected' || msgtype == 'error') {
res.json(resp);
}

View File

@@ -11,7 +11,7 @@ function start() {
const res = await driver.getVersion(conn);
process.send({ msgtype: 'connected', ...res });
} catch (e) {
console.log(e);
console.error(e);
process.send({ msgtype: 'error', error: e.message });
}
});

View File

@@ -6,13 +6,20 @@ import showModal from '../modals/showModal';
import ConnectionModal from '../modals/ConnectionModal';
import axios from '../utility/axios';
import { filterName } from '@dbgate/datalib';
import ConfirmModal from '../modals/ConfirmModal';
function Menu({ data, setOpenedConnections, openedConnections }) {
const handleEdit = () => {
showModal((modalState) => <ConnectionModal modalState={modalState} connection={data} />);
};
const handleDelete = () => {
axios.post('connections/delete', data);
showModal((modalState) => (
<ConfirmModal
modalState={modalState}
message={`Really delete connection ${data.displayName || data.server}?`}
onConfirm={() => axios.post('connections/delete', data)}
/>
));
};
const handleRefresh = () => {
axios.post('server-connections/refresh', { conid: data._id });

View File

@@ -0,0 +1,28 @@
import React from 'react';
import ModalBase from './ModalBase';
import { FormButtonRow } from '../utility/forms';
import FormStyledButton from '../widgets/FormStyledButton';
import styled from 'styled-components';
const MessageWrapper = styled.div`
margin: 20px;
`;
export default function ConfirmModal({ message, modalState, onConfirm }) {
return (
<ModalBase modalState={modalState}>
<MessageWrapper>{message}</MessageWrapper>
<FormButtonRow>
<FormStyledButton
value="OK"
onClick={() => {
modalState.close();
onConfirm();
}}
/>
<FormStyledButton type="button" value="Close" onClick={modalState.close} />
</FormButtonRow>
</ModalBase>
);
}

View File

@@ -1,12 +1,8 @@
import React from 'react';
import axios from '../utility/axios';
import ModalBase from './ModalBase';
import { FormRow, FormButtonRow, FormTextField, FormSelectField, FormSubmit } from '../utility/forms';
import { FormButtonRow } from '../utility/forms';
import FormStyledButton from '../widgets/FormStyledButton';
import { TextField } from '../utility/inputs';
import { Formik, Form } from 'formik';
import SqlEditor from '../sqleditor/SqlEditor';
// import FormikForm from '../utility/FormikForm';
import styled from 'styled-components';
import keycodes from '../utility/keycodes';