dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-21 03:36:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

query excecute fixes

Browse Source
This commit is contained in:
Jan Prochazka
2021-01-01 11:05:02 +01:00
parent fbd254bafc
commit fc79f5f07c
4 changed files with 59 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/web/src/query/QueryToolbar.js
View File

@@ -2,16 +2,16 @@ import React from 'react';
import useHasPermission from '../utility/useHasPermission';
import ToolbarButton from '../widgets/ToolbarButton';
export default function QueryToolbar({ execute, cancel, isDatabaseDefined, busy, save, format, isConnected, kill }) {
export default function QueryToolbar({ execute, isDatabaseDefined, busy, save, format, isConnected, kill }) {
const hasPermission = useHasPermission();
return (
<>
<ToolbarButton disabled={!isDatabaseDefined || busy} onClick={execute} icon="icon run">
Execute
</ToolbarButton>
<ToolbarButton disabled={!busy} onClick={cancel} icon="icon close">
{/* <ToolbarButton disabled={!busy} onClick={cancel} icon="icon close">
Cancel
</ToolbarButton>
</ToolbarButton> */}
<ToolbarButton disabled={!isConnected} onClick={kill} icon="icon close">
Kill
</ToolbarButton>

20
packages/web/src/tabs/QueryTab.js
View File

@@ -24,6 +24,7 @@ import useExtensions from '../utility/useExtensions';
export default function QueryTab({ tabid, conid, database, initialArgs, 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();
@@ -63,6 +64,7 @@ export default function QueryTab({ tabid, conid, database, initialArgs, tabVisib
const handleExecute = async () => {
if (busy) return;
setExecuteNumber((num) => num + 1);
setVisibleResultTabs(true);
const selectedText = editorRef.current.editor.getSelectedText();
let sesid = sessionId;
@@ -81,14 +83,14 @@ export default function QueryTab({ tabid, conid, database, initialArgs, tabVisib
});
};
const handleCancel = () => {
axios.post('sessions/cancel', {
sesid: sessionId,
});
};
// 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);
@@ -135,7 +137,7 @@ export default function QueryTab({ tabid, conid, database, initialArgs, tabVisib
conid={conid}
database={database}
/>
{sessionId && (
{visibleResultTabs && (
<ResultTabs sessionId={sessionId} executeNumber={executeNumber}>
<TabPage label="Messages" key="messages">
<SocketMessagesView
@@ -157,7 +159,7 @@ export default function QueryTab({ tabid, conid, database, initialArgs, tabVisib
isDatabaseDefined={conid && database}
execute={handleExecute}
busy={busy}
cancel={handleCancel}
// cancel={handleCancel}
format={handleFormatCode}
save={saveFileModalState.open}
isConnected={!!sessionId}