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

fix dacpac dropdowns selecting first db in dropdown instead of right clicked db (#14285)

Browse Source
This commit is contained in:
Kim Santiago
2021-02-16 10:23:22 -08:00
committed by GitHub
parent f4cf506290
commit 0c1b16d4fb
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
extensions/dacpac/src/wizard/api/dacFxConfigPage.ts
View File

@@ -40,8 +40,13 @@ export abstract class DacFxConfigPage extends BasePage {
// Handle server changes // Handle server changes
this.serverDropdown.onValueChanged(async () => { this.serverDropdown.onValueChanged(async () => {
this.model.server = (this.serverDropdown.value as ConnectionDropdownValue).connection; const serverDropdownValue = this.serverDropdown.value as ConnectionDropdownValue;
this.model.serverName = (this.serverDropdown.value as ConnectionDropdownValue).displayName; if (!serverDropdownValue) {
return;
}
this.model.server = serverDropdownValue.connection;
this.model.serverName = serverDropdownValue.displayName;
if (this.databaseDropdown) { if (this.databaseDropdown) {
await this.populateDatabaseDropdown(); await this.populateDatabaseDropdown();
} else { } else {
@@ -98,8 +103,13 @@ export abstract class DacFxConfigPage extends BasePage {
}).component(); }).component();
// Handle database changes // Handle database changes
this.databaseDropdown.onValueChanged(async () => { this.databaseDropdown.onValueChanged(() => {
this.model.database = <string>this.databaseDropdown.value; const databaseDropdownValue = this.databaseDropdown.value;
if (!databaseDropdownValue) {
return;
}
this.model.database = databaseDropdownValue as string;
this.fileTextBox.value = this.generateFilePathFromDatabaseAndTimestamp(); this.fileTextBox.value = this.generateFilePathFromDatabaseAndTimestamp();
this.model.filePath = this.fileTextBox.value; this.model.filePath = this.fileTextBox.value;
}); });

2
extensions/dacpac/src/wizard/dataTierApplicationWizard.ts
View File

@@ -297,7 +297,7 @@ export class DataTierApplicationWizard {
private cancelDataTierApplicationWizard(): void { private cancelDataTierApplicationWizard(): void {
TelemetryReporter.createActionEvent(TelemetryViews.DataTierApplicationWizard, 'WizardCanceled') TelemetryReporter.createActionEvent(TelemetryViews.DataTierApplicationWizard, 'WizardCanceled')
.withAdditionalProperties({ .withAdditionalProperties({
isPotentialDataLoss: this.model.potentialDataLoss.toString() isPotentialDataLoss: this.model.potentialDataLoss?.toString()
}).send(); }).send();
} }

9
extensions/dacpac/src/wizard/pages/deployConfigPage.ts
View File

@@ -141,8 +141,13 @@ export class DeployConfigPage extends DacFxConfigPage {
}).component(); }).component();
//Handle database changes //Handle database changes
this.databaseDropdown.onValueChanged(async () => { this.databaseDropdown.onValueChanged(() => {
this.model.database = (<azdata.CategoryValue>this.databaseDropdown.value).name; const databaseDropdownValue = this.databaseDropdown.value as azdata.CategoryValue;
if (!databaseDropdownValue) {
return;
}
this.model.database = databaseDropdownValue.name;
}); });
this.databaseLoader = this.view.modelBuilder.loadingComponent().withItem(this.databaseDropdown).withProperties({ this.databaseLoader = this.view.modelBuilder.loadingComponent().withItem(this.databaseDropdown).withProperties({