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

replaced call socket() with apiOn/apiOff

Browse Source
This commit is contained in:
Jan Prochazka
2021-12-22 11:24:48 +01:00
parent 05ea435820
commit 2ace0bdb34
13 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
import resolveApi, { resolveApiHeaders } from './resolveApi';
import { writable } from 'svelte/store';
import socket from './socket';
export async function apiCall(route: string, args: {} = undefined) {
const resp = await fetch(`${resolveApi()}/${route}`, {
@@ -14,9 +15,13 @@ export async function apiCall(route: string, args: {} = undefined) {
return resp.json();
}
export function apiOn(event: string, hander: Function) {}
export function apiOn(event: string, handler: Function) {
socket().on(event, handler);
}
export function apiOff(event: string, hander: Function) {}
export function apiOff(event: string, handler: Function) {
socket().off(event, handler);
}
import _ from 'lodash';

7
packages/web/src/utility/exportElectronFile.ts
View File

@@ -1,9 +1,8 @@
import ScriptWriter from '../impexp/ScriptWriter';
import getElectron from './getElectron';
import socket from '../utility/socket';
import { showSnackbar, showSnackbarInfo, showSnackbarError, closeSnackbar } from '../utility/snackbar';
import resolveApi from './resolveApi';
import { apiCall } from './api';
import { apiCall, apiOff, apiOn } from './api';
export async function exportElectronFile(dataName, reader, format) {
const electron = getElectron();
@@ -48,12 +47,12 @@ export async function exportElectronFile(dataName, reader, format) {
function handleRunnerDone() {
closeSnackbar(snackId);
socket().off(`runner-done-${runid}`, handleRunnerDone);
apiOff(`runner-done-${runid}`, handleRunnerDone);
if (isCanceled) showSnackbarError(`Export ${dataName} canceled`);
else showSnackbarInfo(`Export ${dataName} finished`);
}
socket().on(`runner-done-${runid}`, handleRunnerDone);
apiOn(`runner-done-${runid}`, handleRunnerDone);
}
export async function saveFileToDisk(

6
packages/web/src/utility/metadataLoaders.ts
View File

@@ -8,7 +8,7 @@ import { DatabaseInfo } from 'dbgate-types';
import { derived } from 'svelte/store';
import { extendDatabaseInfo } from 'dbgate-tools';
import { setLocalStorage } from '../utility/storageCache';
import { apiCall } from './api';
import { apiCall, apiOff, apiOn } from './api';
const databaseInfoLoader = ({ conid, database }) => ({
url: 'database-connections/structure',
@@ -200,11 +200,11 @@ function useCore(loader, args) {
handleReload();
if (reloadTrigger && socket) {
for (const item of getAsArray(reloadTrigger)) {
socket().on(item, handleReload);
apiOn(item, handleReload);
}
return () => {
for (const item of getAsArray(reloadTrigger)) {
socket().off(item, handleReload);
apiOff(item, handleReload);
}
};
}