diff --git a/extensions/sql-migration/src/constants/strings.ts b/extensions/sql-migration/src/constants/strings.ts index 299c19af0d..ec945d99f4 100644 --- a/extensions/sql-migration/src/constants/strings.ts +++ b/extensions/sql-migration/src/constants/strings.ts @@ -531,7 +531,7 @@ export const TABLE_SELECTION_HASROWS_COLUMN = localize('sql.migratino.table.sele // integration runtime page export const SELECT_RESOURCE_GROUP = localize('sql.migration.blob.resourceGroup.select', "Select a resource group."); export const IR_PAGE_TITLE = localize('sql.migration.ir.page.title', "Azure Database Migration Service"); -export const IR_PAGE_DESCRIPTION = localize('sql.migration.ir.page.description', "Azure Database Migration Service orchestrates database migration activities and tracks their progress. You can select an existing Database Migration Service as an Azure SQL target if you have created one previously, or create a new one below."); +export const IR_PAGE_DESCRIPTION = localize('sql.migration.ir.page.description', "Azure Database Migration Service orchestrates database migration activities and tracks their progress. You can select an existing Database Migration Service if you have created one previously, or create a new one below."); export const SQL_MIGRATION_SERVICE_NOT_FOUND_ERROR = localize('sql.migration.ir.page.sql.migration.service.not.found', "No Database Migration Service found. Create a new one."); export const CREATE_NEW = localize('sql.migration.create.new', "Create new"); export const CREATE_NEW_MIGRATION_SERVICE = localize('sql.migration.create.new.migration.service', "Create new migration service"); diff --git a/extensions/sql-migration/src/wizard/integrationRuntimePage.ts b/extensions/sql-migration/src/wizard/integrationRuntimePage.ts index 384d144faf..6136ee0ef7 100644 --- a/extensions/sql-migration/src/wizard/integrationRuntimePage.ts +++ b/extensions/sql-migration/src/wizard/integrationRuntimePage.ts @@ -227,7 +227,9 @@ export class IntergrationRuntimePage extends MigrationWizardPage { const dialog = new CreateSqlMigrationServiceDialog(); const createdDmsResult = await dialog.createNewDms( this.migrationStateModel, - (this._resourceGroupDropdown.value).displayName); + this._resourceGroupDropdown.value + ? (this._resourceGroupDropdown.value).displayName + : ''); this.migrationStateModel._sqlMigrationServiceResourceGroup = createdDmsResult.resourceGroup; this.migrationStateModel._sqlMigrationService = createdDmsResult.service; diff --git a/extensions/sql-migration/src/wizard/summaryPage.ts b/extensions/sql-migration/src/wizard/summaryPage.ts index f6c75de05e..7305ba6da0 100644 --- a/extensions/sql-migration/src/wizard/summaryPage.ts +++ b/extensions/sql-migration/src/wizard/summaryPage.ts @@ -111,8 +111,7 @@ export class SummaryPage extends MigrationWizardPage { : (isSqlMiTarget) ? constants.SUMMARY_MI_TYPE : constants.SUMMARY_SQLDB_TYPE, - await this.migrationStateModel.getLocationDisplayName( - this.migrationStateModel._targetServerInstance.name!)), + this.migrationStateModel._targetServerInstance.name), await createHeadingTextComponent( this._view, constants.DATABASE_BACKUP_MIGRATION_MODE_LABEL),