ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix for history reload upon target change and filter out unsupported … (#13205)

Browse Source 
* fix for history reload upon target change and filter out unsupported asmt messages
This commit is contained in:
Vladimir Chernov
2020-11-04 22:22:56 +03:00
committed by GitHub
parent 3677a69c76
commit 06a4b0d1a2
3 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
extensions/sql-assessment/src/assessmentResultGrid.ts
View File

@@ -121,9 +121,9 @@ export class AssessmentResultGrid implements vscode.Disposable {
public async displayResult(asmtResult: azdata.SqlAssessmentResult, method: AssessmentType) { public async displayResult(asmtResult: azdata.SqlAssessmentResult, method: AssessmentType) {
this.asmtType = method; this.asmtType = method;
this.dataItems = asmtResult.items; this.dataItems = this.filterOutNotSupportedKind(asmtResult.items);
await this.table.updateProperties({ await this.table.updateProperties({
'data': asmtResult.items.map(item => this.convertToDataView(item)) 'data': this.dataItems.map(item => this.convertToDataView(item))
}); });
this.rootContainer.setLayout({ this.rootContainer.setLayout({
flexFlow: 'column', flexFlow: 'column',
@@ -145,20 +145,34 @@ export class AssessmentResultGrid implements vscode.Disposable {
}); });
} }
public async appendResult(asmtResult: azdata.SqlAssessmentResult): Promise<void> { // we need to filter out warnings and error results since we don't have an appropriate way of displaying such messages.
if (this.dataItems) { // have to redone this once required functionality will be added to the core.
this.dataItems.push(...asmtResult.items); private filterOutNotSupportedKind(items: azdata.SqlAssessmentResultItem[]): azdata.SqlAssessmentResultItem[] {
if (this.asmtType === AssessmentType.AvailableRules) {
return items;
} }
this.table.appendData(asmtResult.items.map(item => this.convertToDataView(item)));
return items.filter(i => i.kind === azdata.sqlAssessment.SqlAssessmentResultItemKind.RealResult);
}
public async appendResult(asmtResult: azdata.SqlAssessmentResult): Promise<void> {
let filteredValues = this.filterOutNotSupportedKind(asmtResult.items);
if (this.dataItems) {
this.dataItems.push(...filteredValues);
}
this.table.appendData(filteredValues.map(item => this.convertToDataView(item)));
} }
private async showDetails(rowNumber: number) { private async showDetails(rowNumber: number) {
const selectedRowValues = this.table.data[rowNumber]; const selectedRowValues = this.table.data[rowNumber];
const asmtResultItem = this.dataItems.find(item => const asmtResultItem = this.asmtType === AssessmentType.InvokeAssessment
item.targetName === selectedRowValues[this.targetColOrder] ? this.dataItems.find(item =>
&& item.checkId === selectedRowValues[this.checkIdColOrder] item.targetName === selectedRowValues[this.targetColOrder]
&& item.message === selectedRowValues[this.messageColOrder] && item.checkId === selectedRowValues[this.checkIdColOrder]
); && item.message === selectedRowValues[this.messageColOrder])
: this.dataItems.find(item =>
item.targetName === selectedRowValues[this.targetColOrder]
&& item.checkId === selectedRowValues[this.checkIdColOrder]);
if (!asmtResultItem) { if (!asmtResultItem) {
return; return;

5
extensions/sql-assessment/src/engine.ts
View File

@@ -32,7 +32,7 @@ export class AssessmentEngine {
private connectionUri: string = ''; private connectionUri: string = '';
private connectionProfile!: azdata.connection.ConnectionProfile; private connectionProfile!: azdata.connection.ConnectionProfile;
private lastInvokedResults!: SqlAssessmentResultInfo; private lastInvokedResults!: SqlAssessmentResultInfo;
private historicalRecords!: SqlAssessmentRecord[]; private historicalRecords!: SqlAssessmentRecord[] | undefined;
constructor(service: mssql.ISqlAssessmentService) { constructor(service: mssql.ISqlAssessmentService) {
@@ -56,6 +56,7 @@ export class AssessmentEngine {
public async initialize(connectionId: string) { public async initialize(connectionId: string) {
this.connectionUri = await azdata.connection.getUriForConnection(connectionId); this.connectionUri = await azdata.connection.getUriForConnection(connectionId);
this.connectionProfile = await azdata.connection.getCurrentConnection(); this.connectionProfile = await azdata.connection.getCurrentConnection();
this.historicalRecords = undefined;
} }
public async performAssessment(asmtType: AssessmentType, onResult: OnResultCallback): Promise<void> { public async performAssessment(asmtType: AssessmentType, onResult: OnResultCallback): Promise<void> {
@@ -99,7 +100,7 @@ export class AssessmentEngine {
await this.loadHistory(); await this.loadHistory();
} }
return this.historicalRecords; return this.historicalRecords ?? [];
} }
private async loadHistory(): Promise<void> { private async loadHistory(): Promise<void> {

1
extensions/sql-assessment/src/maincontroller.ts
View File

@@ -31,7 +31,6 @@ export default class MainController {
} }
public async activate(): Promise<boolean> { public async activate(): Promise<boolean> {
this.sqlAssessment = ((await vscode.extensions.getExtension(mssql.extension.name)?.activate() as mssql.IExtension)).sqlAssessment; this.sqlAssessment = ((await vscode.extensions.getExtension(mssql.extension.name)?.activate() as mssql.IExtension)).sqlAssessment;
this.engine = new AssessmentEngine(this.sqlAssessment); this.engine = new AssessmentEngine(this.sqlAssessment);
this.registerModelViewProvider(); this.registerModelViewProvider();