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

[SQL Migration] Fix assessment UI issues (#20733)

Browse Source 
* Clarify assessment results in card

* Fix incorrect number of dbs ready for migration without issues to MI

* Fix SQL DB assessment results incorrectly greying out dbs with MI blocking issues

* Update error banner for blocked databases

* Reword error message
This commit is contained in:
Raymond Truong
2022-10-05 16:57:49 -07:00
committed by GitHub
parent 1e89df8955
commit 5da4f449d4
3 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/sql-migration/src/constants/strings.ts
View File

@@ -118,9 +118,12 @@ export function ASSESSMENT_TILE(serverName: string): string {
return localize('sql.migration.assessment', "Assessment results for '{0}'", serverName);
}
export function CAN_BE_MIGRATED(eligibleDbs: number, totalDbs: number): string {
return localize('sql.migration.can.be.migrated', "{0}/{1} databases can be migrated", eligibleDbs, totalDbs);
return localize('sql.migration.can.be.migrated', "{0}/{1} databases can be migrated without issues", eligibleDbs, totalDbs);
}
export const ASSESSMENT_MIGRATION_WARNING = localize('sql.migration.assessment.migration.warning', "Databases that are not ready for migration to Azure SQL Managed Instance can be migrated to SQL Server on Azure Virtual Machines.");
export const ASSESSMENT_MIGRATION_WARNING = localize('sql.migration.assessment.migration.warning', "Databases that are not ready for migration to Azure SQL Managed Instance or Azure SQL Database can be migrated to SQL Server on Azure Virtual Machines.");
export const ASSESSMENT_MIGRATION_WARNING_SQLDB = localize('sql.migration.assessment.migration.warning.sqldb', "Databases that are not ready for migration to Azure SQL Database can be migrated to SQL Server on Azure Virtual Machines. Alternatively, review assessment results for Azure SQL Managed Instance migration readiness.");
export const ASSESSMENT_MIGRATION_WARNING_SQLMI = localize('sql.migration.assessment.migration.warning.sqlmi', "Databases that are not ready for migration to Azure SQL Managed Instance can be migrated to SQL Server on Azure Virtual Machines. Alternatively, review assessment results for Azure SQL Database migration readiness.");
export const DATABASES_TABLE_TILE = localize('sql.migration.databases.table.title', "Databases");
export const SQL_SERVER_INSTANCE = localize('sql.migration.sql.server.instance', "SQL Server instance");
export const SAVE_ASSESSMENT_REPORT = localize('sql.migration.save.assessment.report', "Save assessment report");

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

@@ -108,13 +108,18 @@ export class SqlDatabaseTree {
this._rootContainer.addItem(this._resultComponent, { flex: '0 0 auto' });
this._rootContainer.addItem(selectDbMessage, { flex: '1 1 auto' });
if (this._targetType === MigrationTargetType.SQLMI ||
this._targetType === MigrationTargetType.SQLDB) {
if (!!this._model._assessmentResults?.issues.find(value => value.databaseRestoreFails) ||
!!this._model._assessmentResults?.databaseAssessments.find(d => !!d.issues.find(issue => issue.databaseRestoreFails))) {
if (this._targetType === MigrationTargetType.SQLMI) {
if (this._model._assessmentResults?.databaseAssessments.some(db => db.issues.find(issue => issue.databaseRestoreFails && issue.appliesToMigrationTargetPlatform === MigrationTargetType.SQLMI))) {
dialog.message = {
level: azdata.window.MessageLevel.Warning,
text: constants.ASSESSMENT_MIGRATION_WARNING,
text: constants.ASSESSMENT_MIGRATION_WARNING_SQLMI,
};
}
} else if (this._targetType === MigrationTargetType.SQLDB) {
if (this._model._assessmentResults?.databaseAssessments.some(db => db.issues.find(issue => issue.databaseRestoreFails && issue.appliesToMigrationTargetPlatform === MigrationTargetType.SQLDB))) {
dialog.message = {
level: azdata.window.MessageLevel.Warning,
text: constants.ASSESSMENT_MIGRATION_WARNING_SQLDB,
};
}
}
@@ -883,7 +888,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 => item.databaseRestoreFails)) {
if (db.issues.find(issue => issue.databaseRestoreFails && issue.appliesToMigrationTargetPlatform === this._targetType)) {
selectable = false;
}
this._databaseTableValues.push([

15
extensions/sql-migration/src/wizard/skuRecommendationPage.ts
View File

@@ -616,7 +616,14 @@ export class SKURecommendationPage extends MigrationWizardPage {
}
const dbCount = this.migrationStateModel._assessmentResults?.databaseAssessments?.length;
const dbWithoutIssuesCount = this.migrationStateModel._assessmentResults?.databaseAssessments?.filter(db => db.issues?.length === 0).length;
const dbWithoutIssuesForMiCount = this.migrationStateModel._assessmentResults?.databaseAssessments?.filter(db =>
!db.issues?.some(issue => issue.appliesToMigrationTargetPlatform === MigrationTargetType.SQLMI)
).length;
const dbWithoutIssuesForVmCount = dbCount;
const dbWithoutIssuesForDbCount = this.migrationStateModel._assessmentResults?.databaseAssessments?.filter(db =>
!db.issues?.some(issue => issue.appliesToMigrationTargetPlatform === MigrationTargetType.SQLDB)
).length;
this._supportedProducts.forEach((product, index) => {
if (!this.migrationStateModel._assessmentResults) {
this._rbg.cards[index].descriptions[CardDescriptionIndex.ASSESSMENT_STATUS].textValue = '';
@@ -646,7 +653,7 @@ export class SKURecommendationPage extends MigrationWizardPage {
switch (product.type) {
case MigrationTargetType.SQLMI:
this._rbg.cards[index].descriptions[CardDescriptionIndex.ASSESSMENT_STATUS].textValue =
constants.CAN_BE_MIGRATED(dbWithoutIssuesCount, dbCount);
constants.CAN_BE_MIGRATED(dbWithoutIssuesForMiCount, dbCount);
if (this.hasRecommendations()) {
if (this.migrationStateModel._skuEnableElastic) {
@@ -681,7 +688,7 @@ export class SKURecommendationPage extends MigrationWizardPage {
case MigrationTargetType.SQLVM:
this._rbg.cards[index].descriptions[CardDescriptionIndex.ASSESSMENT_STATUS].textValue =
constants.CAN_BE_MIGRATED(dbCount, dbCount);
constants.CAN_BE_MIGRATED(dbWithoutIssuesForVmCount, dbCount);
if (this.hasRecommendations()) {
// elastic model currently doesn't support SQL VM, so show the baseline model results regardless of user preference
@@ -718,7 +725,7 @@ export class SKURecommendationPage extends MigrationWizardPage {
case MigrationTargetType.SQLDB:
this._rbg.cards[index].descriptions[CardDescriptionIndex.ASSESSMENT_STATUS].textValue =
constants.CAN_BE_MIGRATED(dbWithoutIssuesCount, dbCount);
constants.CAN_BE_MIGRATED(dbWithoutIssuesForDbCount, dbCount);
if (this.hasRecommendations()) {
const recommendations = this.migrationStateModel._skuEnableElastic