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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/mssql/config.json
View File

@@ -1,6 +1,6 @@
{ {
"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/v{#version#}/microsoft.sqltools.servicelayer-{#fileName#}", "downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/v{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
"version": "3.0.0-release.127", "version": "3.0.0-release.129",
"downloadFileNames": { "downloadFileNames": {
"Windows_86": "win-x86-net5.0.zip", "Windows_86": "win-x86-net5.0.zip",
"Windows_64": "win-x64-net5.0.zip", "Windows_64": "win-x64-net5.0.zip",

4
extensions/mssql/src/mssql.d.ts vendored
View File

@@ -529,8 +529,7 @@ export interface SqlMigrationAssessmentResultItem {
rulesetVersion: string; rulesetVersion: string;
rulesetName: string; rulesetName: string;
ruleId: string; ruleId: string;
targetType: azdata.sqlAssessment.SqlAssessmentTargetType; targetType: string;
targetName: string;
checkId: string; checkId: string;
tags: string[]; tags: string[];
displayName: string; displayName: string;
@@ -544,6 +543,7 @@ export interface SqlMigrationAssessmentResultItem {
issueCategory: string; issueCategory: string;
databaseName: string; databaseName: string;
impactedObjects: SqlMigrationImpactedObjectInfo[]; impactedObjects: SqlMigrationImpactedObjectInfo[];
databaseRestoreFails: boolean;
} }
export interface ServerTargetReadiness { export interface ServerTargetReadiness {

20
extensions/sql-migration/src/dialog/assessmentResults/sqlDatabasesTree.ts
View File

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