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

added missing await, removed duplicate okay button checks (#15450)

Browse Source
This commit is contained in:
Benjin Dubishar
2021-05-13 09:47:29 -07:00
committed by GitHub
parent 1d55facfe3
commit ca81290aa1
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/schema-compare/src/dialogs/schemaCompareDialog.ts
View File

@@ -221,8 +221,8 @@ export class SchemaCompareDialog {
this.sourceDacpacComponent = this.createFileBrowser(false, this.schemaCompareMainWindow.sourceEndpointInfo); this.sourceDacpacComponent = this.createFileBrowser(false, this.schemaCompareMainWindow.sourceEndpointInfo);
this.targetDacpacComponent = this.createFileBrowser(true, this.schemaCompareMainWindow.targetEndpointInfo); this.targetDacpacComponent = this.createFileBrowser(true, this.schemaCompareMainWindow.targetEndpointInfo);
let sourceRadioButtons = this.createSourceRadiobuttons(); let sourceRadioButtons = this.createSourceRadioButtons();
let targetRadioButtons = this.createTargetRadiobuttons(); let targetRadioButtons = this.createTargetRadioButtons();
let sourceComponents = []; let sourceComponents = [];
let targetComponents = []; let targetComponents = [];
@@ -336,7 +336,7 @@ export class SchemaCompareDialog {
}; };
} }
private createSourceRadiobuttons(): azdata.FormComponent { private createSourceRadioButtons(): azdata.FormComponent {
this.sourceDacpacRadioButton = this.view.modelBuilder.radioButton() this.sourceDacpacRadioButton = this.view.modelBuilder.radioButton()
.withProperties({ .withProperties({
name: 'source', name: 'source',
@@ -365,8 +365,7 @@ export class SchemaCompareDialog {
this.formBuilder.insertFormItem(this.sourceDatabaseComponent, 3, { horizontal: true, titleFontSize: titleFontSize }); this.formBuilder.insertFormItem(this.sourceDatabaseComponent, 3, { horizontal: true, titleFontSize: titleFontSize });
this.formBuilder.removeFormItem(this.sourceDacpacComponent); this.formBuilder.removeFormItem(this.sourceDacpacComponent);
this.populateServerDropdown(false); await this.populateServerDropdown(false);
this.dialog.okButton.enabled = await this.shouldEnableOkayButton();
}); });
// if source is currently a db, show it in the server and db dropdowns // if source is currently a db, show it in the server and db dropdowns
@@ -389,7 +388,7 @@ export class SchemaCompareDialog {
}; };
} }
private createTargetRadiobuttons(): azdata.FormComponent { private createTargetRadioButtons(): azdata.FormComponent {
let dacpacRadioButton = this.view.modelBuilder.radioButton() let dacpacRadioButton = this.view.modelBuilder.radioButton()
.withProperties({ .withProperties({
name: 'target', name: 'target',
@@ -418,8 +417,7 @@ export class SchemaCompareDialog {
this.formBuilder.addFormItem(this.targetServerComponent, { horizontal: true, titleFontSize: titleFontSize }); this.formBuilder.addFormItem(this.targetServerComponent, { horizontal: true, titleFontSize: titleFontSize });
this.formBuilder.addFormItem(this.targetDatabaseComponent, { horizontal: true, titleFontSize: titleFontSize }); this.formBuilder.addFormItem(this.targetDatabaseComponent, { horizontal: true, titleFontSize: titleFontSize });
this.populateServerDropdown(true); await this.populateServerDropdown(true);
this.dialog.okButton.enabled = await this.shouldEnableOkayButton();
}); });
// if target is currently a db, show it in the server and db dropdowns // if target is currently a db, show it in the server and db dropdowns
@@ -445,7 +443,6 @@ export class SchemaCompareDialog {
} }
private async shouldEnableOkayButton(): Promise<boolean> { private async shouldEnableOkayButton(): Promise<boolean> {
let sourcefilled = (this.sourceIsDacpac && await this.existsDacpac(this.sourceTextBox.value)) let sourcefilled = (this.sourceIsDacpac && await this.existsDacpac(this.sourceTextBox.value))
|| (!this.sourceIsDacpac && !isNullOrUndefined(this.sourceDatabaseDropdown.value) && this.sourceDatabaseDropdown.values.findIndex(x => this.matchesValue(x, this.sourceDbEditable)) !== -1); || (!this.sourceIsDacpac && !isNullOrUndefined(this.sourceDatabaseDropdown.value) && this.sourceDatabaseDropdown.values.findIndex(x => this.matchesValue(x, this.sourceDbEditable)) !== -1);
let targetfilled = (this.targetIsDacpac && await this.existsDacpac(this.targetTextBox.value)) let targetfilled = (this.targetIsDacpac && await this.existsDacpac(this.targetTextBox.value))
@@ -720,6 +717,7 @@ export class SchemaCompareDialog {
}); });
} }
this.dialog.okButton.enabled = await this.shouldEnableOkayButton();
currentDropdown.loading = false; currentDropdown.loading = false;
} }