diff --git a/extensions/sql-assessment/package.json b/extensions/sql-assessment/package.json index e807681eda..cc11f33ee8 100644 --- a/extensions/sql-assessment/package.json +++ b/extensions/sql-assessment/package.json @@ -2,7 +2,7 @@ "name": "sql-assessment", "displayName": "%displayName%", "description": "%description%", - "version": "0.6.0", + "version": "0.6.1", "publisher": "Microsoft", "preview": true, "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt", diff --git a/extensions/sql-assessment/src/assessmentResultGrid.ts b/extensions/sql-assessment/src/assessmentResultGrid.ts index 34a6acd943..fb27dda7fb 100644 --- a/extensions/sql-assessment/src/assessmentResultGrid.ts +++ b/extensions/sql-assessment/src/assessmentResultGrid.ts @@ -159,8 +159,9 @@ export class AssessmentResultGrid implements vscode.Disposable { let filteredValues = this.filterOutNotSupportedKind(asmtResult.items); if (this.dataItems) { this.dataItems.push(...filteredValues); + } - this.table.appendData(filteredValues.map(item => this.convertToDataView(item))); + await this.table.appendData(filteredValues.map(item => this.convertToDataView(item))); } private async showDetails(rowNumber: number) { diff --git a/extensions/sql-assessment/src/tabs/assessmentMainTab.ts b/extensions/sql-assessment/src/tabs/assessmentMainTab.ts index 8bbbd2a51b..b81754373c 100644 --- a/extensions/sql-assessment/src/tabs/assessmentMainTab.ts +++ b/extensions/sql-assessment/src/tabs/assessmentMainTab.ts @@ -135,7 +135,7 @@ export class SqlAssessmentMainTab extends SqlAssessmentTab { if (append) { await this.resultGrid.appendResult(result); } else { - this.displayResults(result, assessmentType); + await this.displayResults(result, assessmentType); } }); } @@ -168,7 +168,7 @@ export class SqlAssessmentMainTab extends SqlAssessmentTab { if (append) { await this.resultGrid.appendResult(result); } else { - this.displayResults(result, assessmentType); + await this.displayResults(result, assessmentType); } }); } @@ -299,11 +299,11 @@ export class SqlAssessmentMainTab extends SqlAssessmentTab { ).component(); } - private displayResults(result: azdata.SqlAssessmentResult, assessmentType: AssessmentType): void { + private async displayResults(result: azdata.SqlAssessmentResult, assessmentType: AssessmentType): Promise { this.apiVersionPropItem.value = result.apiVersion; this.defaultRulesetPropItem.value = result.items?.length > 0 ? result.items[0].rulesetVersion : ''; - this.resultGrid.displayResult(result, assessmentType); + await this.resultGrid.displayResult(result, assessmentType); this.btnExportAsScript.enabled = this.btnHTMLExport.enabled = assessmentType === AssessmentType.InvokeAssessment; } } diff --git a/extensions/sql-assessment/src/utils.ts b/extensions/sql-assessment/src/utils.ts index cf3c93d62e..cd82bf3f46 100644 --- a/extensions/sql-assessment/src/utils.ts +++ b/extensions/sql-assessment/src/utils.ts @@ -47,7 +47,7 @@ export async function readHistoryFileNames(targetName: string): Promise f.endsWith(datePart))); + result.children.push(...files.filter(f => f.endsWith(datePart) && f !== targetFile)); result.children = result.children.map(c => path.join(dirPath, c)); return result; diff --git a/src/sql/azdata.proposed.d.ts b/src/sql/azdata.proposed.d.ts index d71bc95b0d..851f5adafc 100644 --- a/src/sql/azdata.proposed.d.ts +++ b/src/sql/azdata.proposed.d.ts @@ -970,7 +970,7 @@ declare module 'azdata' { /** * Append data to an existing table data. */ - appendData(data: any[][]): void; + appendData(data: any[][]): Thenable; } export interface IconColumnCellValue { diff --git a/src/sql/workbench/api/common/extHostModelView.ts b/src/sql/workbench/api/common/extHostModelView.ts index 80623f841c..ae56e0ac79 100644 --- a/src/sql/workbench/api/common/extHostModelView.ts +++ b/src/sql/workbench/api/common/extHostModelView.ts @@ -1440,8 +1440,8 @@ class TableComponentWrapper extends ComponentWrapper implements azdata.TableComp return emitter && emitter.event; } - public appendData(v: any[][]): void { - this.doAction(ModelViewAction.AppendData, v); + public appendData(v: any[][]): Thenable { + return this.doAction(ModelViewAction.AppendData, v); } }