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

database login - ask user - test connection

Browse Source
This commit is contained in:
SPRINX0\prochazka
2025-01-08 16:14:51 +01:00
parent 11201326fd
commit 8a4ec82c4c
2 changed files with 53 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/web/src/tabs/ConnectionTab.svelte
View File

@@ -34,6 +34,7 @@
import { disconnectDatabaseConnection } from '../appobj/DatabaseAppObject.svelte';
import { useConfig } from '../utility/metadataLoaders';
import ConnectionAdvancedDriverFields from '../settings/ConnectionAdvancedDriverFields.svelte';
import DatabaseLoginModal from '../modals/DatabaseLoginModal.svelte';
export let connection;
export let tabid;
@@ -63,11 +64,26 @@
const testIdRef = createRef(0);
async function handleTest(e, requestDbList = false) {
function handleTest(requestDbList = false) {
const connection = getCurrentConnection();
return new Promise((resolve, reject) => {
if (connection.passwordMode == 'askPassword' || connection.passwordMode == 'askUser') {
showModal(DatabaseLoginModal, {
testedConnection: connection,
onConnect: conn => handleTestCore(conn, requestDbList).then(res => resolve(res)),
onCancel: () => resolve(null),
});
} else {
return handleTestCore(connection, requestDbList);
}
});
}
async function handleTestCore(connection, requestDbList = false) {
isTesting = true;
testIdRef.update(x => x + 1);
const testid = testIdRef.get();
const resp = await apiCall('connections/test', { connection: getCurrentConnection(), requestDbList });
const resp = await apiCall('connections/test', { connection, requestDbList });
if (testIdRef.get() != testid) return;
isTesting = false;
@@ -207,7 +223,7 @@
// $: console.log('CONN VALUES', $values);
async function getDatabaseList() {
const resp = await handleTest({ detail: getCurrentConnection() }, true);
const resp = await handleTest(true);
if (resp && resp.msgtype == 'connected') {
return resp.databases;
}
@@ -257,7 +273,11 @@
data-testid="ConnectionTab_buttonCancelTest"
/>
{:else}
<FormButton value="Test connection" on:click={handleTest} data-testid="ConnectionTab_buttonDisconnect" />
<FormButton
value="Test connection"
on:click={() => handleTest(false)}
data-testid="ConnectionTab_buttonDisconnect"
/>
{/if}
{:else if isConnected}
<FormButton value="Disconnect" on:click={handleDisconnect} data-testid="ConnectionTab_buttonDisconnect" />
@@ -266,7 +286,7 @@
{#if isTesting}
<FormButton value="Cancel test" on:click={handleCancelTest} />
{:else}
<FormButton value="Test" on:click={handleTest} data-testid="ConnectionTab_buttonTest" />
<FormButton value="Test" on:click={() => handleTest(false)} data-testid="ConnectionTab_buttonTest" />
{/if}
<FormButton value="Save" on:click={handleSave} data-testid="ConnectionTab_buttonSave" />
{/if}