diff --git a/packages/api/src/controllers/connections.js b/packages/api/src/controllers/connections.js
index cdaf3b0e7..3e2c8d331 100644
--- a/packages/api/src/controllers/connections.js
+++ b/packages/api/src/controllers/connections.js
@@ -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);
}
diff --git a/packages/api/src/proc/connectProcess.js b/packages/api/src/proc/connectProcess.js
index 327da4f78..2a252d483 100644
--- a/packages/api/src/proc/connectProcess.js
+++ b/packages/api/src/proc/connectProcess.js
@@ -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 });
}
});
diff --git a/packages/web/src/appobj/connectionAppObject.js b/packages/web/src/appobj/connectionAppObject.js
index d84fc9e1c..fcbd76564 100644
--- a/packages/web/src/appobj/connectionAppObject.js
+++ b/packages/web/src/appobj/connectionAppObject.js
@@ -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) => );
};
const handleDelete = () => {
- axios.post('connections/delete', data);
+ showModal((modalState) => (
+ axios.post('connections/delete', data)}
+ />
+ ));
};
const handleRefresh = () => {
axios.post('server-connections/refresh', { conid: data._id });
diff --git a/packages/web/src/modals/ConfirmModal.js b/packages/web/src/modals/ConfirmModal.js
new file mode 100644
index 000000000..07f37fcf3
--- /dev/null
+++ b/packages/web/src/modals/ConfirmModal.js
@@ -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 (
+
+ {message}
+
+
+ {
+ modalState.close();
+ onConfirm();
+ }}
+ />
+
+
+
+ );
+}
diff --git a/packages/web/src/modals/ConfirmSqlModal.js b/packages/web/src/modals/ConfirmSqlModal.js
index 97695ec59..ba80c1700 100644
--- a/packages/web/src/modals/ConfirmSqlModal.js
+++ b/packages/web/src/modals/ConfirmSqlModal.js
@@ -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';