mirrors/dbgate
1
0
Fork 0
mirror of https://github.com/dbgate/dbgate synced 2024-11-07 20:26:23 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fixed db url handling

Browse Source
This commit is contained in:
SPRINX0\prochazka 2024-09-02 10:12:03 +02:00
parent ff8a5f1658
commit 2f42319d2b
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/tools/src/getConnectionLabel.ts
View File

@ -12,6 +12,9 @@ function getConnectionLabelCore(connection, { allowExplicitDatabase = true } = {
if (connection.displayName) {
return connection.displayName;
}
if (connection.useDatabaseUrl) {
return `${connection.databaseUrl}`;
}
if (connection.singleDatabase && connection.server && allowExplicitDatabase && connection.defaultDatabase) {
return `${connection.defaultDatabase} on ${connection.server}`;
}
@ -24,9 +27,6 @@ function getConnectionLabelCore(connection, { allowExplicitDatabase = true } = {
if (connection.singleDatabase && connection.defaultDatabase) {
return `${connection.defaultDatabase}`;
}
if (connection.useDatabaseUrl) {
return `${connection.databaseUrl}`;
}
return '';
}

17
packages/web/src/forms/FormRadioGroupField.svelte
View File

@ -4,19 +4,26 @@
export let options = [];
export let name;
export let matchValueToOption = null;
const { values, setFieldValue } = getFormContext();
let group = $values[name] ?? options.find(x => x.default)?.value;
$: setFieldValue(name, group);
$: optionsWithId = options.map(x => ({ ...x, id: uuidv1() }));
function handleChange(event) {
setFieldValue(name, event.currentTarget.value);
}
</script>
{#each optionsWithId as option}
<div>
<input type="radio" bind:group value={option.value} id={option.id} />
<input
type="radio"
checked={matchValueToOption ? matchValueToOption($values[name], option) : $values[name] == option.value}
on:change={handleChange}
value={option.value}
id={option.id}
/>
<label for={option.id}>{option.label}</label>
</div>
{/each}