dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-29 08:43:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Jan Prochazka
2021-12-26 14:16:36 +01:00
parent 991b2fd3c1
commit 1ea9c23576
5 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/api/src/controllers/runners.js
View File

@@ -136,7 +136,7 @@ module.exports = {
if (handleProcessCommunication(message, subprocess)) return; if (handleProcessCommunication(message, subprocess)) return;
this[`handle_${msgtype}`](runid, message); this[`handle_${msgtype}`](runid, message);
}); });
return newOpened; return _.pick(newOpened, ['runid']);
}, },
start_meta: true, start_meta: true,

2
packages/api/src/controllers/sessions.js
View File

@@ -86,7 +86,7 @@ module.exports = {
this[`handle_${msgtype}`](sesid, message); this[`handle_${msgtype}`](sesid, message);
}); });
subprocess.send({ msgtype: 'connect', ...connection, database }); subprocess.send({ msgtype: 'connect', ...connection, database });
return newOpened; return _.pick(newOpened, ['conid', 'database', 'sesid']);
}, },
executeQuery_meta: true, executeQuery_meta: true,

1
packages/api/src/utility/useController.js
View File

@@ -31,6 +31,7 @@ module.exports = function useController(app, electron, route, controller) {
// console.log('REGISTERING HANDLER', handler); // console.log('REGISTERING HANDLER', handler);
electron.ipcMain.handle(handler, async (event, args) => { electron.ipcMain.handle(handler, async (event, args) => {
const data = await controller[key](args); const data = await controller[key](args);
// console.log('HANDLED API', handler, data);
return data; return data;
}); });
} }

2
packages/web/src/query/RunnerOutputFiles.svelte
View File

@@ -33,7 +33,7 @@
$: $effect; $: $effect;
const handleRunnerDone = async () => { const handleRunnerDone = async () => {
const resp = await apiCall(`runners/files?runid=${runnerId}`); const resp = await apiCall('runners/files', { runid: runnerId });
files = resp; files = resp;
}; };
</script> </script>

1
packages/web/src/utility/api.ts
View File

@@ -17,6 +17,7 @@ function wantEventSource() {
export async function apiCall(route: string, args: {} = undefined) { export async function apiCall(route: string, args: {} = undefined) {
const electron = getElectron(); const electron = getElectron();
if (electron) { if (electron) {
// console.log('CALLING API', route.replace('/', '-'), JSON.stringify(args == null ? null : args));
const resp = await electron.invoke(route.replace('/', '-'), args); const resp = await electron.invoke(route.replace('/', '-'), args);
return resp; return resp;
} else { } else {