Using updated assessment nuget to get blocking issues (#17038)

This commit is contained in:
Aasim Khan
2021-09-09 22:23:02 -07:00
committed by GitHub
parent 8d3b57cb76
commit cbba05f54f
3 changed files with 10 additions and 16 deletions

View File

@@ -42,12 +42,6 @@ const headerRight: azdata.CssStyles = {
'border-bottom': '1px solid'
};
const blockingIssues: Array<string> = [
'MultipleLogFiles',
'FileStream',
'MIDatabaseSize'
];
export class SqlDatabaseTree {
private _view!: azdata.ModelView;
private _instanceTable!: azdata.DeclarativeTableComponent;
@@ -103,8 +97,8 @@ export class SqlDatabaseTree {
this._rootContainer.addItem(selectDbMessage, { flex: '1 1 auto' });
if (this._targetType === MigrationTargetType.SQLMI) {
if (!!this._model._assessmentResults?.issues.find(value => blockingIssues.includes(value.ruleId)) ||
!!this._model._assessmentResults?.databaseAssessments.find(d => !!d.issues.find(issue => blockingIssues.includes(issue.ruleId)))) {
if (!!this._model._assessmentResults?.issues.find(value => value.databaseRestoreFails) ||
!!this._model._assessmentResults?.databaseAssessments.find(d => !!d.issues.find(issue => issue.databaseRestoreFails))) {
dialog.message = {
level: azdata.window.MessageLevel.Warning,
text: constants.ASSESSMENT_MIGRATION_WARNING,
@@ -823,8 +817,8 @@ export class SqlDatabaseTree {
const assessmentResults: azdata.DeclarativeTableCellValue[][] = this._activeIssues
.sort((e1, e2) => {
if (blockingIssues.includes(e1.ruleId)) { return -1; }
if (blockingIssues.includes(e2.ruleId)) { return 1; }
if (e1.databaseRestoreFails) { return -1; }
if (e2.databaseRestoreFails) { return 1; }
return e1.checkId.localeCompare(e2.checkId);
}).map((v) => [
@@ -832,14 +826,14 @@ export class SqlDatabaseTree {
value: this._view.modelBuilder
.image()
.withProps({
iconPath: blockingIssues.includes(v.ruleId)
iconPath: v.databaseRestoreFails
? IconPathHelper.error
: undefined,
iconHeight: 16,
iconWidth: 16,
height: 16,
width: 16,
title: blockingIssues.includes(v.ruleId)
title: v.databaseRestoreFails
? constants.ASSESSMENT_BLOCKING_ISSUE_TITLE
: '',
})
@@ -930,7 +924,7 @@ export class SqlDatabaseTree {
this._dbNames = this._model._assessmentResults.databaseAssessments.map(da => da.name);
this._model._assessmentResults.databaseAssessments.forEach((db) => {
let selectable = true;
if (db.issues.find(item => blockingIssues.includes(item.ruleId))) {
if (db.issues.find(item => item.databaseRestoreFails)) {
selectable = false;
}
this._databaseTableValues.push(