dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-26 19:06:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

kill from query designer

Browse Source
This commit is contained in:
Jan Prochazka
2021-01-03 14:39:03 +01:00
parent 1b44050c37
commit 1736934a1b
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/web/src/designer/QueryDesignToolbar.js
View File

@@ -2,13 +2,25 @@ import React from 'react';
import useHasPermission from '../utility/useHasPermission';
import ToolbarButton from '../widgets/ToolbarButton';
export default function QueryDesignToolbar({ execute, isDatabaseDefined, busy, save, modelState, dispatchModel }) {
export default function QueryDesignToolbar({
execute,
isDatabaseDefined,
busy,
save,
modelState,
dispatchModel,
isConnected,
kill,
}) {
const hasPermission = useHasPermission();
return (
<>
<ToolbarButton disabled={!isDatabaseDefined || busy} onClick={execute} icon="icon run">
Execute
</ToolbarButton>
<ToolbarButton disabled={!isConnected} onClick={kill} icon="icon close">
Kill
</ToolbarButton>
{hasPermission('files/query/write') && (
<ToolbarButton onClick={save} icon="icon save">
Save

18
packages/web/src/tabs/QueryDesignTab.js
View File

@@ -28,6 +28,7 @@ import useUndoReducer from '../utility/useUndoReducer';
export default function QueryDesignTab({ tabid, conid, database, tabVisible, toolbarPortalRef, ...other }) {
const [sessionId, setSessionId] = React.useState(null);
const [visibleResultTabs, setVisibleResultTabs] = React.useState(false);
const [executeNumber, setExecuteNumber] = React.useState(0);
const setOpenedTabs = useSetOpenedTabs();
const socket = useSocket();
@@ -101,6 +102,7 @@ export default function QueryDesignTab({ tabid, conid, database, tabVisible, too
const handleExecute = React.useCallback(async () => {
if (busy) return;
setExecuteNumber((num) => num + 1);
setVisibleResultTabs(true);
let sesid = sessionId;
if (!sesid) {
@@ -118,14 +120,8 @@ export default function QueryDesignTab({ tabid, conid, database, tabVisible, too
});
}, [busy, conid, sessionId, database, sqlPreview]);
const handleCancel = () => {
axios.post('sessions/cancel', {
sesid: sessionId,
});
};
const handleKill = () => {
axios.post('sessions/kill', {
const handleKill = async () => {
await axios.post('sessions/kill', {
sesid: sessionId,
});
setSessionId(null);
@@ -176,7 +172,7 @@ export default function QueryDesignTab({ tabid, conid, database, tabVisible, too
<TabPage label="SQL" key="sql">
<SqlEditor value={sqlPreview} engine={engine} readOnly />
</TabPage>
{sessionId && (
{visibleResultTabs && (
<TabPage label="Messages" key="messages">
<SocketMessagesView
eventName={sessionId ? `session-info-${sessionId}` : null}
@@ -199,8 +195,8 @@ export default function QueryDesignTab({ tabid, conid, database, tabVisible, too
// cancel={handleCancel}
// format={handleFormatCode}
save={saveFileModalState.open}
// isConnected={!!sessionId}
// kill={handleKill}
isConnected={!!sessionId}
kill={handleKill}
/>,
toolbarPortalRef.current
)}