ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Populate dbs properly when using publish profile, change connection icon and try enabling buttons (#21968)

Browse Source
This commit is contained in:
Sakshi Sharma
2023-02-16 16:14:40 -08:00
committed by GitHub
parent 7c6ae87fc8
commit 199f280586
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts
View File

@@ -34,6 +34,7 @@ export class PublishDatabaseDialog {
private dataSourcesDropDown: azdataType.DropDownComponent | undefined; private dataSourcesDropDown: azdataType.DropDownComponent | undefined;
private targetDatabaseDropDown: azdataType.DropDownComponent | undefined; private targetDatabaseDropDown: azdataType.DropDownComponent | undefined;
private targetDatabaseTextBox: azdataType.TextComponent | undefined; private targetDatabaseTextBox: azdataType.TextComponent | undefined;
private selectConnectionButton: azdataType.ButtonComponent | undefined;
private connectionsRadioButton: azdataType.RadioButtonComponent | undefined; private connectionsRadioButton: azdataType.RadioButtonComponent | undefined;
private existingServerRadioButton: azdataType.RadioButtonComponent | undefined; private existingServerRadioButton: azdataType.RadioButtonComponent | undefined;
private dockerServerRadioButton: azdataType.RadioButtonComponent | undefined; private dockerServerRadioButton: azdataType.RadioButtonComponent | undefined;
@@ -807,38 +808,34 @@ export class PublishDatabaseDialog {
} }
private createSelectConnectionButton(view: azdataType.ModelView): azdataType.Component { private createSelectConnectionButton(view: azdataType.ModelView): azdataType.Component {
let selectConnectionButton: azdataType.ButtonComponent = view.modelBuilder.button().withProps({ this.selectConnectionButton = view.modelBuilder.button().withProps({
ariaLabel: constants.selectConnection, ariaLabel: constants.selectConnection,
iconPath: IconPathHelper.selectConnection, iconPath: IconPathHelper.selectConnection,
height: '16px', height: '16px',
width: '16px' width: '16px'
}).component(); }).component();
selectConnectionButton.onDidClick(async () => { this.selectConnectionButton.onDidClick(async () => {
let connection = await utils.getAzdataApi()!.connection.openConnectionDialog(); let connection = await utils.getAzdataApi()!.connection.openConnectionDialog();
this.connectionId = connection.connectionId; this.connectionId = connection.connectionId;
this.serverName = connection.options['server']; this.serverName = connection.options['server'];
let connectionTextboxValue: string = getConnectionName(connection); let connectionTextboxValue: string = getConnectionName(connection);
await this.updateConnectionComponents(connectionTextboxValue, this.connectionId); await this.updateConnectionComponents(connectionTextboxValue, this.connectionId, connection.options.database);
// change the database inputbox value to the connection's database if there is one
if (connection.options.database && connection.options.database !== constants.master) {
this.targetDatabaseDropDown!.value = connection.options.database;
}
// change icon to the one without a plus sign
selectConnectionButton.iconPath = IconPathHelper.connect;
}); });
return selectConnectionButton; return this.selectConnectionButton;
} }
private async updateConnectionComponents(connectionTextboxValue: string, connectionId: string) { private async updateConnectionComponents(connectionTextboxValue: string, connectionId: string, database: string) {
this.targetConnectionTextBox!.value = connectionTextboxValue; this.targetConnectionTextBox!.value = connectionTextboxValue;
await this.targetConnectionTextBox!.updateProperty('title', connectionTextboxValue); await this.targetConnectionTextBox!.updateProperty('title', connectionTextboxValue);
if (database && database !== constants.master) {
this.targetDatabaseName = database;
}
// populate database dropdown with the databases for this connection // populate database dropdown with the databases for this connection
if (connectionId) { if (connectionId) {
const databaseValues = (await utils.getAzdataApi()!.connection.listDatabases(connectionId)) const databaseValues = (await utils.getAzdataApi()!.connection.listDatabases(connectionId))
@@ -846,6 +843,9 @@ export class PublishDatabaseDialog {
.filter(db => !constants.systemDbs.includes(db)); .filter(db => !constants.systemDbs.includes(db));
this.targetDatabaseDropDown!.values = databaseValues; this.targetDatabaseDropDown!.values = databaseValues;
// change icon to the one without a plus sign
this.selectConnectionButton!.iconPath = IconPathHelper.connect;
} }
} }
@@ -873,11 +873,7 @@ export class PublishDatabaseDialog {
this.connectionId = result.connectionId; this.connectionId = result.connectionId;
this.serverName = result.serverName; this.serverName = result.serverName;
await this.updateConnectionComponents(result.connection, <string>this.connectionId); await this.updateConnectionComponents(result.connection, <string>this.connectionId, result.databaseName);
if (result.databaseName) {
this.targetDatabaseName = result.databaseName;
}
// set options coming from the publish profiles to deployment options // set options coming from the publish profiles to deployment options
this.setDeploymentOptions(result.options); this.setDeploymentOptions(result.options);
@@ -909,6 +905,8 @@ export class PublishDatabaseDialog {
this.profileUsed = true; this.profileUsed = true;
this.publishProfileUri = fileUris[0]; this.publishProfileUri = fileUris[0];
this.tryEnableGenerateScriptAndOkButtons();
} }
}); });