mirror of
https://github.com/DeNNiiInc/dbgate.git
synced 2026-04-20 01:55:59 +00:00
Merge branch 'master' into ai-assistant
This commit is contained in:
@@ -30,8 +30,8 @@
|
||||
{/if}
|
||||
|
||||
<div class="button">
|
||||
<FormStyledButton value="Log In" on:click={handleLogin} />
|
||||
<FormStyledButton value="Log Out" on:click={doLogout} />
|
||||
<FormStyledButton value="Log In" on:click={handleLogin} data-testid="NotLoggedPage_loginButton" />
|
||||
<FormStyledButton value="Log Out" on:click={doLogout} data-testid="NotLoggedPage_logoutButton" />
|
||||
</div>
|
||||
</div>
|
||||
</SpecialPageLayout>
|
||||
|
||||
@@ -97,6 +97,10 @@ await dbgateApi.deployDb(${JSON.stringify(
|
||||
title: 'Compare',
|
||||
icon: 'img compare',
|
||||
tabComponent: 'CompareModelTab',
|
||||
props: {
|
||||
conid: $currentDatabase?.connection?._id,
|
||||
database: $currentDatabase?.name,
|
||||
}
|
||||
},
|
||||
{
|
||||
editor: {
|
||||
|
||||
@@ -196,13 +196,17 @@
|
||||
title: 'Compare',
|
||||
icon: 'img compare',
|
||||
tabComponent: 'CompareModelTab',
|
||||
props: {
|
||||
conid: $currentDatabase?.connection?._id,
|
||||
database: $currentDatabase?.name,
|
||||
},
|
||||
},
|
||||
{
|
||||
editor: {
|
||||
sourceConid: _.get($currentDatabase, 'connection._id'),
|
||||
sourceDatabase: _.get($currentDatabase, 'name'),
|
||||
targetConid: _.get(connection, '_id'),
|
||||
targetDatabase: name,
|
||||
sourceConid: connection?._id,
|
||||
sourceDatabase: name,
|
||||
targetConid: $currentDatabase?.connection?._id,
|
||||
targetDatabase: $currentDatabase?.name,
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
</script>
|
||||
|
||||
<div class="button" class:disabled {title}>
|
||||
<div class="inner" class:disabled on:click={handleClick}>
|
||||
<div class="inner" class:disabled on:click={handleClick} data-testid={$$props['data-testid']}>
|
||||
<span class="icon" class:disabled><FontIcon {icon} /></span>
|
||||
<slot />
|
||||
{#if iconAfter}
|
||||
|
||||
@@ -22,7 +22,7 @@ const doServerPing = value => {
|
||||
}
|
||||
|
||||
apiCall('server-connections/ping', {
|
||||
conidArray,
|
||||
conidArray: _.compact(conidArray),
|
||||
strmid,
|
||||
});
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user