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

use of createRef instead of not working { corrent: xxx }

Browse Source
This commit is contained in:
Jan Prochazka
2021-03-17 18:20:26 +01:00
parent 321d5d71de
commit 9c7df42948
9 changed files with 73 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/web/src/modals/ConnectionModal.svelte
View File

@@ -13,27 +13,28 @@
import ModalBase from './ModalBase.svelte';
import { closeCurrentModal, closeModal } from './modalTools';
import createRef from '../utility/createRef';
export let connection;
let isTesting;
let sqlConnectResult;
const testIdRef = { current: 0 };
const testIdRef = createRef(0);
async function handleTest(e) {
isTesting = true;
testIdRef.current += 1;
const testid = testIdRef.current;
testIdRef.update(x => x + 1);
const testid = testIdRef.get();
const resp = await axiosInstance.post('connections/test', e.detail);
if (testIdRef.current != testid) return;
if (testIdRef.get() != testid) return;
isTesting = false;
sqlConnectResult = resp.data;
}
function handleCancelTest() {
testIdRef.current += 1; // invalidate current test
testIdRef.update(x => x + 1); // invalidate current test
isTesting = false;
}

13
packages/web/src/modals/ImportExportModal.svelte
View File

@@ -15,6 +15,7 @@
import SocketMessageView from '../query/SocketMessageView.svelte';
import { currentArchive, extensions, selectedWidget } from '../stores';
import axiosInstance from '../utility/axiosInstance';
import createRef from '../utility/createRef';
import openNewTab from '../utility/openNewTab';
import socket from '../utility/socket';
import useEffect from '../utility/useEffect';
@@ -33,7 +34,7 @@
export let openedFile = undefined;
export let importToArchive = false;
const refreshArchiveFolderRef = { current: null };
const refreshArchiveFolderRef = createRef(null);
$: targetArchiveFolder = importToArchive ? `import-${moment().format('YYYY-MM-DD-hh-mm-ss')}` : $currentArchive;
@@ -54,10 +55,10 @@
const handleRunnerDone = () => {
busy = false;
if (refreshArchiveFolderRef.current) {
if (refreshArchiveFolderRef.get()) {
axiosInstance.post('archive/refresh-folders', {});
axiosInstance.post('archive/refresh-files', { folder: refreshArchiveFolderRef.current });
$currentArchive = refreshArchiveFolderRef.current;
axiosInstance.post('archive/refresh-files', { folder: refreshArchiveFolderRef.get() });
$currentArchive = refreshArchiveFolderRef.get();
$selectedWidget = 'archive';
}
};
@@ -87,9 +88,9 @@
runnerId = runid;
if (values.targetStorageType == 'archive') {
refreshArchiveFolderRef.current = values.targetArchiveFolder;
refreshArchiveFolderRef.set(values.targetArchiveFolder);
} else {
refreshArchiveFolderRef.current = null;
refreshArchiveFolderRef.set(null);
}
};