ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-24 09:35:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Schema Compare cleanup (#11418)

Browse Source 
* cleanup async and await stuff

* remove awaits

* remove more awaits
This commit is contained in:
Kim Santiago
2020-07-21 09:47:14 -07:00
committed by GitHub
parent 92c8d890c4
commit d533af3019
6 changed files with 61 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
extensions/schema-compare/src/dialogs/schemaCompareOptionsDialog.ts
View File

@@ -35,19 +35,19 @@ export class SchemaCompareOptionsDialog {
this.optionsModel = new SchemaCompareOptionsModel(defaultOptions);
}
protected async initializeDialog() {
protected initializeDialog(): void {
this.generalOptionsTab = azdata.window.createTab(loc.GeneralOptionsLabel);
this.objectTypesTab = azdata.window.createTab(loc.ObjectTypesOptionsLabel);
await this.initializeSchemaCompareOptionsDialogTab();
await this.initializeSchemaCompareObjectTypesDialogTab();
this.initializeSchemaCompareOptionsDialogTab();
this.initializeSchemaCompareObjectTypesDialogTab();
this.dialog.content = [this.generalOptionsTab, this.objectTypesTab];
}
public async openDialog() {
public openDialog(): void {
let event = null;
this.dialog = azdata.window.createModelViewDialog(loc.OptionsLabel, event);
await this.initializeDialog();
this.initializeDialog();
this.dialog.okButton.label = loc.OkButtonText;
this.dialog.okButton.onClick(async () => await this.execute());
@@ -63,7 +63,7 @@ export class SchemaCompareOptionsDialog {
azdata.window.openDialog(this.dialog);
}
protected async execute() {
protected execute(): void {
this.optionsModel.setDeploymentOptions();
this.optionsModel.setObjectTypeOptions();
this.schemaComparison.setDeploymentOptions(this.deploymentOptions);
@@ -78,26 +78,26 @@ export class SchemaCompareOptionsDialog {
this.disposeListeners();
}
protected async cancel() {
protected cancel(): void {
this.disposeListeners();
}
private async reset() {
private async reset(): Promise<void> {
let service = (vscode.extensions.getExtension(mssql.extension.name).exports as mssql.IExtension).schemaCompare;
let result = await service.schemaCompareGetDefaultOptions();
this.deploymentOptions = result.defaultDeploymentOptions;
this.optionsChanged = true;
this.updateOptionsTable();
await this.updateOptionsTable();
this.optionsFlexBuilder.removeItem(this.optionsTable);
this.optionsFlexBuilder.insertItem(this.optionsTable, 0, { CSSStyles: { 'overflow': 'scroll', 'height': '65vh' } });
this.updateObjectsTable();
await this.updateObjectsTable();
this.objectTypesFlexBuilder.removeItem(this.objectsTable);
this.objectTypesFlexBuilder.addItem(this.objectsTable, { CSSStyles: { 'overflow': 'scroll', 'height': '80vh' } });
}
private async initializeSchemaCompareOptionsDialogTab() {
private initializeSchemaCompareOptionsDialogTab(): void {
this.generalOptionsTab.registerContent(async view => {
this.descriptionHeading = view.modelBuilder.table().withProperties({
@@ -116,17 +116,17 @@ export class SchemaCompareOptionsDialog {
this.optionsTable = view.modelBuilder.table().component();
this.updateOptionsTable();
await this.updateOptionsTable();
this.disposableListeners.push(this.optionsTable.onRowSelected(async () => {
let row = this.optionsTable.selectedRows[0];
let label = this.optionsModel.optionsLabels[row];
this.descriptionText.updateProperties({
await this.descriptionText.updateProperties({
value: this.optionsModel.getDescription(label)
});
}));
this.disposableListeners.push(this.optionsTable.onCellAction(async (rowState) => {
this.disposableListeners.push(this.optionsTable.onCellAction((rowState) => {
let checkboxState = <azdata.ICheckboxCellActionEventArgs>rowState;
if (checkboxState && checkboxState.row !== undefined) {
let label = this.optionsModel.optionsLabels[checkboxState.row];
@@ -144,11 +144,11 @@ export class SchemaCompareOptionsDialog {
this.optionsFlexBuilder.addItem(this.descriptionHeading, { CSSStyles: { 'font-weight': 'bold', 'height': '30px' } });
this.optionsFlexBuilder.addItem(this.descriptionText, { CSSStyles: { 'padding': '4px', 'margin-right': '10px', 'overflow': 'scroll', 'height': '10vh' } });
await view.initializeModel(this.optionsFlexBuilder);
this.optionsTable.focus();
await this.optionsTable.focus();
});
}
private async initializeSchemaCompareObjectTypesDialogTab() {
private initializeSchemaCompareObjectTypesDialogTab(): void {
this.objectTypesTab.registerContent(async view => {
this.objectTypesFlexBuilder = view.modelBuilder.flexContainer()
@@ -157,9 +157,9 @@ export class SchemaCompareOptionsDialog {
}).component();
this.objectsTable = view.modelBuilder.table().component();
this.updateObjectsTable();
await this.updateObjectsTable();
this.disposableListeners.push(this.objectsTable.onCellAction(async (rowState) => {
this.disposableListeners.push(this.objectsTable.onCellAction((rowState) => {
let checkboxState = <azdata.ICheckboxCellActionEventArgs>rowState;
if (checkboxState && checkboxState.row !== undefined) {
let label = this.optionsModel.objectTypeLabels[checkboxState.row];
@@ -180,9 +180,9 @@ export class SchemaCompareOptionsDialog {
}
}
private updateOptionsTable(): void {
private async updateOptionsTable(): Promise<void> {
let data = this.optionsModel.getOptionsData();
this.optionsTable.updateProperties({
await this.optionsTable.updateProperties({
data: data,
columns: [
{
@@ -204,9 +204,9 @@ export class SchemaCompareOptionsDialog {
});
}
private updateObjectsTable(): void {
private async updateObjectsTable(): Promise<void> {
let data = this.optionsModel.getObjectsData();
this.objectsTable.updateProperties({
await this.objectsTable.updateProperties({
data: data,
columns: [
{