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

shell script scheduler

Browse Source
This commit is contained in:
Jan Prochazka
2020-12-03 18:43:02 +01:00
parent 8d9cb51baa
commit 56eecb0836
7 changed files with 82 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,9 +32,10 @@ export default function QueryTab({ tabid, conid, database, initialArgs, tabVisib
const extensions = useExtensions();
const { editorData, setEditorData, isLoading } = useEditorData({
tabid,
loadFromArgs: initialArgs && initialArgs.sqlTemplate
? () => applySqlTemplate(initialArgs.sqlTemplate, extensions, { conid, database, ...other })
: null,
loadFromArgs:
initialArgs && initialArgs.sqlTemplate
? () => applySqlTemplate(initialArgs.sqlTemplate, extensions, { conid, database, ...other })
: null,
});
const editorRef = React.useRef(null);
@@ -113,12 +114,13 @@ export default function QueryTab({ tabid, conid, database, initialArgs, tabVisib
editorRef.current.editor.clearSelection();
};
if (isLoading)
if (isLoading) {
return (
<div>
<LoadingInfo message="Loading SQL script" />
</div>
);
}
return (
<>

11
packages/web/src/tabs/ShellTab.js
View File

@@ -15,6 +15,7 @@ import ImportExportModal from '../modals/ImportExportModal';
import useEditorData from '../utility/useEditorData';
import SaveTabModal from '../modals/SaveTabModal';
import useModalState from '../modals/useModalState';
import LoadingInfo from '../widgets/LoadingInfo';
const configRegex = /\s*\/\/\s*@ImportExportConfigurator\s*\n\s*\/\/\s*(\{[^\n]+\})\n/;
const requireRegex = /\s*(\/\/\s*@require\s+[^\n]+)\n/g;
@@ -22,7 +23,7 @@ const requireRegex = /\s*(\/\/\s*@require\s+[^\n]+)\n/g;
export default function ShellTab({ tabid, tabVisible, toolbarPortalRef, ...other }) {
const [busy, setBusy] = React.useState(false);
const showModal = useShowModal();
const { editorData, setEditorData } = useEditorData({ tabid });
const { editorData, setEditorData, isLoading } = useEditorData({ tabid });
const saveFileModalState = useModalState();
const setOpenedTabs = useSetOpenedTabs();
@@ -89,6 +90,14 @@ export default function ShellTab({ tabid, tabVisible, toolbarPortalRef, ...other
}
};
if (isLoading) {
return (
<div>
<LoadingInfo message="Loading shell script" />
</div>
);
}
return (
<>
<VerticalSplitter>