[SQL Migration] Refactor resource selection filtering logic + misc UI improvements (#19152)

* WIP * WIP * WIP * Fix location dropdown not working properly * Clean up comments * Switch button order in selectMigrationServiceDialog * Vbump to 1.0.1 * Refactor to avoid duplicate API calls * Add null checks * Fix migration status dialog not sorting migrations properly * Address comments, remove unnecessary code * Address comments - separate util methods by resource type, use logError instead of console.log * Remove unused methods * Fix DMS creation on newly created resource group * Fix stale account behavior * Address comments - remove telemetry context from util method calls * Clean up imports * Fix dashboard service monitoring not working * Fix null reference on database backup page, and resources not updating properly when location is changed * Fix dashboard not auto selecting DMS after migration started * Add null checks
2026-01-25 09:35:37 -05:00 · 2022-05-03 16:22:47 -04:00
parent 8cc66dade3
commit b36ee9318f
12 changed files with 909 additions and 1081 deletions
--- a/extensions/sql-migration/src/wizard/databaseBackupPage.ts
+++ b/extensions/sql-migration/src/wizard/databaseBackupPage.ts
@@ -12,7 +12,7 @@ import { Blob, MigrationMode, MigrationSourceAuthenticationType, MigrationStateM
 import * as constants from '../constants/strings';
 import { IconPathHelper } from '../constants/iconPathHelper';
 import { WIZARD_INPUT_COMPONENT_WIDTH } from './wizardController';
-import { findDropDownItemIndex, selectDropDownIndex, selectDefaultDropdownValue } from '../api/utils';
+import * as utils from '../api/utils';
 import { logError, TelemetryViews } from '../telemtery';
 import * as styles from '../constants/styles';

@@ -687,12 +687,14 @@ export class DatabaseBackupPage extends MigrationWizardPage {
 				},
 			}).component();
 		this._disposables.push(this._networkShareStorageAccountResourceGroupDropdown.onValueChanged(async (value) => {
-			const selectedIndex = findDropDownItemIndex(this._networkShareStorageAccountResourceGroupDropdown, value);
-			if (selectedIndex > -1) {
-				for (let i = 0; i < this.migrationStateModel._databaseBackup.networkShares.length; i++) {
-					this.migrationStateModel._databaseBackup.networkShares[i].resourceGroup = this.migrationStateModel.getAzureResourceGroup(selectedIndex);
+			if (value && value !== 'undefined') {
+				const selectedResourceGroup = this.migrationStateModel._resourceGroups.find(rg => rg.name === value);
+				if (selectedResourceGroup) {
+					for (let i = 0; i < this.migrationStateModel._databaseBackup.networkShares.length; i++) {
+						this.migrationStateModel._databaseBackup.networkShares[i].resourceGroup = selectedResourceGroup;
+					}
+					await this.loadNetworkShareStorageDropdown();
 				}
-				await this.loadNetworkShareStorageDropdown();
 			}
 		}));

@@ -714,10 +716,12 @@ export class DatabaseBackupPage extends MigrationWizardPage {
 				fireOnTextChange: true,
 			}).component();
 		this._disposables.push(this._networkShareContainerStorageAccountDropdown.onValueChanged((value) => {
-			const selectedIndex = findDropDownItemIndex(this._networkShareContainerStorageAccountDropdown, value);
-			if (selectedIndex > -1) {
-				for (let i = 0; i < this.migrationStateModel._databaseBackup.networkShares.length; i++) {
-					this.migrationStateModel._databaseBackup.networkShares[i].storageAccount = this.migrationStateModel.getStorageAccount(selectedIndex);
+			if (value && value !== 'undefined') {
+				const selectedStorageAccount = this.migrationStateModel._storageAccounts.find(sa => sa.name === value);
+				if (selectedStorageAccount) {
+					for (let i = 0; i < this.migrationStateModel._databaseBackup.networkShares.length; i++) {
+						this.migrationStateModel._databaseBackup.networkShares[i].storageAccount = selectedStorageAccount;
+					}
 				}
 			}
 		}));
@@ -962,48 +966,58 @@ export class DatabaseBackupPage extends MigrationWizardPage {
 					}).component();

 					this._disposables.push(blobContainerResourceDropdown.onValueChanged(async (value) => {
-						const selectedIndex = findDropDownItemIndex(blobContainerResourceDropdown, value);
-						if (selectedIndex > -1 && !blobResourceGroupErrorStrings.includes(value)) {
-							this.migrationStateModel._databaseBackup.blobs[index].resourceGroup = this.migrationStateModel.getAzureResourceGroup(selectedIndex);
-							await this.loadBlobStorageDropdown(index);
-							await blobContainerStorageAccountDropdown.updateProperties({ enabled: true });
-						} else {
-							await this.disableBlobTableDropdowns(index, constants.RESOURCE_GROUP);
+						if (value && value !== 'undefined' && this.migrationStateModel._resourceGroups) {
+							const selectedResourceGroup = this.migrationStateModel._resourceGroups.find(rg => rg.name === value);
+							if (selectedResourceGroup && !blobResourceGroupErrorStrings.includes(value)) {
+								this.migrationStateModel._databaseBackup.blobs[index].resourceGroup = selectedResourceGroup;
+								await this.loadBlobStorageDropdown(index);
+								await blobContainerStorageAccountDropdown.updateProperties({ enabled: true });
+							} else {
+								await this.disableBlobTableDropdowns(index, constants.RESOURCE_GROUP);
+							}
 						}
 					}));
 					this._blobContainerResourceGroupDropdowns.push(blobContainerResourceDropdown);

 					this._disposables.push(blobContainerStorageAccountDropdown.onValueChanged(async (value) => {
-						const selectedIndex = findDropDownItemIndex(blobContainerStorageAccountDropdown, value);
-						if (selectedIndex > -1 && !blobStorageAccountErrorStrings.includes(value)) {
-							this.migrationStateModel._databaseBackup.blobs[index].storageAccount = this.migrationStateModel.getStorageAccount(selectedIndex);
-							await this.loadBlobContainerDropdown(index);
-							await blobContainerDropdown.updateProperties({ enabled: true });
-						} else {
-							await this.disableBlobTableDropdowns(index, constants.STORAGE_ACCOUNT);
+						if (value && value !== 'undefined') {
+							const selectedStorageAccount = this.migrationStateModel._storageAccounts.find(sa => sa.name === value);
+							if (selectedStorageAccount && !blobStorageAccountErrorStrings.includes(value)) {
+								this.migrationStateModel._databaseBackup.blobs[index].storageAccount = selectedStorageAccount;
+								await this.loadBlobContainerDropdown(index);
+								await blobContainerDropdown.updateProperties({ enabled: true });
+							} else {
+								await this.disableBlobTableDropdowns(index, constants.STORAGE_ACCOUNT);
+							}
 						}
 					}));
 					this._blobContainerStorageAccountDropdowns.push(blobContainerStorageAccountDropdown);

 					this._disposables.push(blobContainerDropdown.onValueChanged(async (value) => {
-						const selectedIndex = findDropDownItemIndex(blobContainerDropdown, value);
-						if (selectedIndex > -1 && !blobContainerErrorStrings.includes(value)) {
-							this.migrationStateModel._databaseBackup.blobs[index].blobContainer = this.migrationStateModel.getBlobContainer(selectedIndex);
-							if (this.migrationStateModel._databaseBackup.migrationMode === MigrationMode.OFFLINE) {
-								await this.loadBlobLastBackupFileDropdown(index);
-								await blobContainerLastBackupFileDropdown.updateProperties({ enabled: true });
+						if (value && value !== 'undefined' && this.migrationStateModel._blobContainers) {
+							const selectedBlobContainer = this.migrationStateModel._blobContainers.find(blob => blob.name === value);
+							if (selectedBlobContainer && !blobContainerErrorStrings.includes(value)) {
+								this.migrationStateModel._databaseBackup.blobs[index].blobContainer = selectedBlobContainer;
+								if (this.migrationStateModel._databaseBackup.migrationMode === MigrationMode.OFFLINE) {
+									await this.loadBlobLastBackupFileDropdown(index);
+									await blobContainerLastBackupFileDropdown.updateProperties({ enabled: true });
+								}
+							} else {
+								await this.disableBlobTableDropdowns(index, constants.BLOB_CONTAINER);
 							}
-						} else {
-							await this.disableBlobTableDropdowns(index, constants.BLOB_CONTAINER);
 						}
 					}));
 					this._blobContainerDropdowns.push(blobContainerDropdown);

 					if (this.migrationStateModel._databaseBackup.migrationMode === MigrationMode.OFFLINE) {
 						this._disposables.push(blobContainerLastBackupFileDropdown.onValueChanged(value => {
-							const selectedIndex = findDropDownItemIndex(blobContainerLastBackupFileDropdown, value);
-							if (selectedIndex > -1 && !blobFileErrorStrings.includes(value)) {
-								this.migrationStateModel._databaseBackup.blobs[index].lastBackupFile = this.migrationStateModel.getBlobLastBackupFileName(selectedIndex);
+							if (value && value !== 'undefined') {
+								if (this.migrationStateModel._lastFileNames) {
+									const selectedLastBackupFile = this.migrationStateModel._lastFileNames.find(fileName => fileName.name === value);
+									if (selectedLastBackupFile && !blobFileErrorStrings.includes(value)) {
+										this.migrationStateModel._databaseBackup.blobs[index].lastBackupFile = selectedLastBackupFile.name;
+									}
+								}
 							}
 						}));
 						this._blobContainerLastBackupFileDropdowns.push(blobContainerLastBackupFileDropdown);
@@ -1276,8 +1290,10 @@ export class DatabaseBackupPage extends MigrationWizardPage {
 	private async loadNetworkStorageResourceGroup(): Promise<void> {
 		this._networkShareStorageAccountResourceGroupDropdown.loading = true;
 		try {
-			this._networkShareStorageAccountResourceGroupDropdown.values = await this.migrationStateModel.getAzureResourceGroupForStorageAccountsDropdownValues(this.migrationStateModel._databaseBackup.subscription);
-			selectDefaultDropdownValue(this._networkShareStorageAccountResourceGroupDropdown, this.migrationStateModel._databaseBackup?.networkShares[0]?.resourceGroup?.id, false);
+			this.migrationStateModel._storageAccounts = await utils.getStorageAccounts(this.migrationStateModel._azureAccount, this.migrationStateModel._databaseBackup.subscription);
+			this.migrationStateModel._resourceGroups = await utils.getStorageAccountResourceGroups(this.migrationStateModel._storageAccounts, this.migrationStateModel._location);
+			this._networkShareStorageAccountResourceGroupDropdown.values = await utils.getAzureResourceGroupsDropdownValues(this.migrationStateModel._resourceGroups);
+			utils.selectDefaultDropdownValue(this._networkShareStorageAccountResourceGroupDropdown, this.migrationStateModel._databaseBackup?.networkShares[0]?.resourceGroup?.id, false);
 		} catch (error) {
 			logError(TelemetryViews.DatabaseBackupPage, 'ErrorLoadingNetworkStorageResourceGroup', error);
 		} finally {
@@ -1290,8 +1306,8 @@ export class DatabaseBackupPage extends MigrationWizardPage {
 		this._networkShareContainerStorageAccountDropdown.loading = true;
 		this._networkShareStorageAccountResourceGroupDropdown.loading = true;
 		try {
-			this._networkShareContainerStorageAccountDropdown.values = await this.migrationStateModel.getStorageAccountValues(this.migrationStateModel._databaseBackup.subscription, this.migrationStateModel._databaseBackup.networkShares[0]?.resourceGroup);
-			selectDefaultDropdownValue(this._networkShareContainerStorageAccountDropdown, this.migrationStateModel?._databaseBackup?.networkShares[0]?.storageAccount?.id, false);
+			this._networkShareContainerStorageAccountDropdown.values = await utils.getStorageAccountsDropdownValues(this.migrationStateModel._storageAccounts, this.migrationStateModel._location, this.migrationStateModel._databaseBackup.networkShares[0]?.resourceGroup);
+			utils.selectDefaultDropdownValue(this._networkShareContainerStorageAccountDropdown, this.migrationStateModel?._databaseBackup?.networkShares[0]?.storageAccount?.id, false);
 		} catch (error) {
 			logError(TelemetryViews.DatabaseBackupPage, 'ErrorLoadingNetworkShareStorageDropdown', error);
 		} finally {
@@ -1303,10 +1319,12 @@ export class DatabaseBackupPage extends MigrationWizardPage {
 	private async loadBlobResourceGroup(): Promise<void> {
 		this._blobContainerResourceGroupDropdowns.forEach(v => v.loading = true);
 		try {
-			const resourceGroupValues = await this.migrationStateModel.getAzureResourceGroupForStorageAccountsDropdownValues(this.migrationStateModel._databaseBackup.subscription);
+			this.migrationStateModel._storageAccounts = await utils.getStorageAccounts(this.migrationStateModel._azureAccount, this.migrationStateModel._databaseBackup.subscription);
+			this.migrationStateModel._resourceGroups = await utils.getStorageAccountResourceGroups(this.migrationStateModel._storageAccounts, this.migrationStateModel._location);
+			const resourceGroupValues = await utils.getAzureResourceGroupsDropdownValues(this.migrationStateModel._resourceGroups);
 			this._blobContainerResourceGroupDropdowns.forEach((dropDown, index) => {
 				dropDown.values = resourceGroupValues;
-				selectDefaultDropdownValue(dropDown, this.migrationStateModel._databaseBackup?.blobs[index]?.resourceGroup?.id, false);
+				utils.selectDefaultDropdownValue(dropDown, this.migrationStateModel._databaseBackup?.blobs[index]?.resourceGroup?.id, false);
 			});
 		} catch (error) {
 			logError(TelemetryViews.DatabaseBackupPage, 'ErrorLoadingBlobResourceGroup', error);
@@ -1318,8 +1336,8 @@ export class DatabaseBackupPage extends MigrationWizardPage {
 	private async loadBlobStorageDropdown(index: number): Promise<void> {
 		this._blobContainerStorageAccountDropdowns[index].loading = true;
 		try {
-			this._blobContainerStorageAccountDropdowns[index].values = await this.migrationStateModel.getStorageAccountValues(this.migrationStateModel._databaseBackup.subscription, this.migrationStateModel._databaseBackup.blobs[index]?.resourceGroup);
-			selectDefaultDropdownValue(this._blobContainerStorageAccountDropdowns[index], this.migrationStateModel._databaseBackup?.blobs[index]?.storageAccount?.id, false);
+			this._blobContainerStorageAccountDropdowns[index].values = await utils.getStorageAccountsDropdownValues(this.migrationStateModel._storageAccounts, this.migrationStateModel._location, this.migrationStateModel._databaseBackup.blobs[index]?.resourceGroup);
+			utils.selectDefaultDropdownValue(this._blobContainerStorageAccountDropdowns[index], this.migrationStateModel._databaseBackup?.blobs[index]?.storageAccount?.id, false);
 		} catch (error) {
 			logError(TelemetryViews.DatabaseBackupPage, 'ErrorLoadingBlobStorageDropdown', error);
 		} finally {
@@ -1330,9 +1348,9 @@ export class DatabaseBackupPage extends MigrationWizardPage {
 	private async loadBlobContainerDropdown(index: number): Promise<void> {
 		this._blobContainerDropdowns[index].loading = true;
 		try {
-			const blobContainerValues = await this.migrationStateModel.getBlobContainerValues(this.migrationStateModel._databaseBackup.subscription, this.migrationStateModel._databaseBackup.blobs[index]?.storageAccount);
-			this._blobContainerDropdowns[index].values = blobContainerValues;
-			selectDefaultDropdownValue(this._blobContainerDropdowns[index], this.migrationStateModel._databaseBackup?.blobs[index]?.blobContainer?.id, false);
+			this.migrationStateModel._blobContainers = await utils.getBlobContainer(this.migrationStateModel._azureAccount, this.migrationStateModel._databaseBackup.subscription, this.migrationStateModel._databaseBackup.blobs[index]?.storageAccount);
+			this._blobContainerDropdowns[index].values = await utils.getBlobContainersValues(this.migrationStateModel._blobContainers);
+			utils.selectDefaultDropdownValue(this._blobContainerDropdowns[index], this.migrationStateModel._databaseBackup?.blobs[index]?.blobContainer?.id, false);
 		} catch (error) {
 			logError(TelemetryViews.DatabaseBackupPage, 'ErrorLoadingBlobContainers', error);
 		} finally {
@@ -1343,9 +1361,9 @@ export class DatabaseBackupPage extends MigrationWizardPage {
 	private async loadBlobLastBackupFileDropdown(index: number): Promise<void> {
 		this._blobContainerLastBackupFileDropdowns[index].loading = true;
 		try {
-			const blobLastBackupFileValues = await this.migrationStateModel.getBlobLastBackupFileNameValues(this.migrationStateModel._databaseBackup.subscription, this.migrationStateModel._databaseBackup.blobs[index]?.storageAccount, this.migrationStateModel._databaseBackup.blobs[index]?.blobContainer);
-			this._blobContainerLastBackupFileDropdowns[index].values = blobLastBackupFileValues;
-			selectDefaultDropdownValue(this._blobContainerLastBackupFileDropdowns[index], this.migrationStateModel._databaseBackup?.blobs[index]?.lastBackupFile, false);
+			this.migrationStateModel._lastFileNames = await utils.getBlobLastBackupFileNames(this.migrationStateModel._azureAccount, this.migrationStateModel._databaseBackup.subscription, this.migrationStateModel._databaseBackup.blobs[index]?.storageAccount, this.migrationStateModel._databaseBackup.blobs[index]?.blobContainer);
+			this._blobContainerLastBackupFileDropdowns[index].values = await utils.getBlobLastBackupFileNamesValues(this.migrationStateModel._lastFileNames);
+			utils.selectDefaultDropdownValue(this._blobContainerLastBackupFileDropdowns[index], this.migrationStateModel._databaseBackup?.blobs[index]?.lastBackupFile, false);
 		} catch (error) {
 			logError(TelemetryViews.DatabaseBackupPage, 'ErrorLoadingBlobLastBackupFiles', error);
 		} finally {
@@ -1363,18 +1381,18 @@ export class DatabaseBackupPage extends MigrationWizardPage {

 		if (this.migrationStateModel._databaseBackup?.migrationMode === MigrationMode.OFFLINE) {
 			this._blobContainerLastBackupFileDropdowns[rowIndex].values = createDropdownValuesWithPrereq(constants.SELECT_BLOB_CONTAINER);
-			selectDropDownIndex(this._blobContainerLastBackupFileDropdowns[rowIndex], 0);
+			utils.selectDropDownIndex(this._blobContainerLastBackupFileDropdowns[rowIndex], 0);
 			await this._blobContainerLastBackupFileDropdowns[rowIndex]?.updateProperties(dropdownProps);
 		}
 		if (columnName === constants.BLOB_CONTAINER) { return; }

 		this._blobContainerDropdowns[rowIndex].values = createDropdownValuesWithPrereq(constants.SELECT_STORAGE_ACCOUNT);
-		selectDropDownIndex(this._blobContainerDropdowns[rowIndex], 0);
+		utils.selectDropDownIndex(this._blobContainerDropdowns[rowIndex], 0);
 		await this._blobContainerDropdowns[rowIndex].updateProperties(dropdownProps);
 		if (columnName === constants.STORAGE_ACCOUNT) { return; }

 		this._blobContainerStorageAccountDropdowns[rowIndex].values = createDropdownValuesWithPrereq(constants.SELECT_RESOURCE_GROUP_PROMPT);
-		selectDropDownIndex(this._blobContainerStorageAccountDropdowns[rowIndex], 0);
+		utils.selectDropDownIndex(this._blobContainerStorageAccountDropdowns[rowIndex], 0);
 		await this._blobContainerStorageAccountDropdowns[rowIndex].updateProperties(dropdownProps);
 	}
 }
--- a/extensions/sql-migration/src/wizard/integrationRuntimePage.ts
+++ b/extensions/sql-migration/src/wizard/integrationRuntimePage.ts
@@ -13,7 +13,7 @@ import { WIZARD_INPUT_COMPONENT_WIDTH } from './wizardController';
 import { getFullResourceGroupFromId, getLocationDisplayName, getSqlMigrationService, getSqlMigrationServiceAuthKeys, getSqlMigrationServiceMonitoringData } from '../api/azure';
 import { IconPathHelper } from '../constants/iconPathHelper';
 import { logError, TelemetryViews } from '../telemtery';
-import { findDropDownItemIndex, selectDefaultDropdownValue } from '../api/utils';
+import * as utils from '../api/utils';
 import * as styles from '../constants/styles';

 export class IntergrationRuntimePage extends MigrationWizardPage {
@@ -170,14 +170,13 @@ export class IntergrationRuntimePage extends MigrationWizardPage {
 			}
 		}).component();
 		this._disposables.push(this._resourceGroupDropdown.onValueChanged(async (value) => {
-			const selectedIndex = findDropDownItemIndex(this._resourceGroupDropdown, value);
-			if (selectedIndex > -1 &&
-				value !== constants.RESOURCE_GROUP_NOT_FOUND) {
-				this.migrationStateModel._sqlMigrationServiceResourceGroup = this.migrationStateModel.getAzureResourceGroup(selectedIndex).name;
-			} else {
-				this.migrationStateModel._sqlMigrationServiceResourceGroup = undefined!;
+			if (value && value !== 'undefined' && value !== constants.RESOURCE_GROUP_NOT_FOUND) {
+				const selectedResourceGroup = this.migrationStateModel._resourceGroups.find(rg => rg.name === value);
+				this.migrationStateModel._sqlMigrationServiceResourceGroup = (selectedResourceGroup)
+					? selectedResourceGroup
+					: undefined!;
+				await this.populateDms();
 			}
-			await this.populateDms();
 		}));

 		const migrationServiceDropdownLabel = this._view.modelBuilder.text().withProps({
@@ -199,16 +198,16 @@ export class IntergrationRuntimePage extends MigrationWizardPage {
 			}
 		}).component();
 		this._disposables.push(this._dmsDropdown.onValueChanged(async (value) => {
-			if (value && value !== constants.SQL_MIGRATION_SERVICE_NOT_FOUND_ERROR) {
+			if (value && value !== 'undefined' && value !== constants.SQL_MIGRATION_SERVICE_NOT_FOUND_ERROR) {
 				if (this.migrationStateModel._databaseBackup.networkContainerType === NetworkContainerType.NETWORK_SHARE) {
 					this._dmsInfoContainer.display = 'inline';
 				}
 				this.wizard.message = {
 					text: ''
 				};
-				const selectedIndex = findDropDownItemIndex(this._dmsDropdown, value);
-				if (selectedIndex > -1) {
-					this.migrationStateModel._sqlMigrationService = this.migrationStateModel.getMigrationService(selectedIndex);
+				const selectedDms = this.migrationStateModel._sqlMigrationServices.find(dms => dms.name === value && dms.properties.resourceGroup.toLowerCase() === this.migrationStateModel._sqlMigrationServiceResourceGroup.name.toLowerCase());
+				if (selectedDms) {
+					this.migrationStateModel._sqlMigrationService = selectedDms;
 					await this.loadMigrationServiceStatus();
 				}
 			} else {
@@ -373,11 +372,13 @@ export class IntergrationRuntimePage extends MigrationWizardPage {
 		this._resourceGroupDropdown.loading = true;
 		this._dmsDropdown.loading = true;
 		try {
-			this._resourceGroupDropdown.values = await this.migrationStateModel.getAzureResourceGroupForSqlMigrationServicesDropdownValues(this.migrationStateModel._targetSubscription);
+			this.migrationStateModel._sqlMigrationServices = await utils.getAzureSqlMigrationServices(this.migrationStateModel._azureAccount, this.migrationStateModel._targetSubscription);
+			this.migrationStateModel._resourceGroups = await utils.getSqlMigrationServiceResourceGroups(this.migrationStateModel._sqlMigrationServices, this.migrationStateModel._location);
+			this._resourceGroupDropdown.values = await utils.getAzureResourceGroupsDropdownValues(this.migrationStateModel._resourceGroups);
 			const resourceGroup = (this.migrationStateModel._sqlMigrationService)
 				? getFullResourceGroupFromId(this.migrationStateModel._sqlMigrationService?.id)
 				: undefined;
-			selectDefaultDropdownValue(this._resourceGroupDropdown, resourceGroup, false);
+			utils.selectDefaultDropdownValue(this._resourceGroupDropdown, resourceGroup, false);
 		} finally {
 			this._resourceGroupDropdown.loading = false;
 			this._dmsDropdown.loading = false;
@@ -387,8 +388,8 @@ export class IntergrationRuntimePage extends MigrationWizardPage {
 	public async populateDms(): Promise<void> {
 		this._dmsDropdown.loading = true;
 		try {
-			this._dmsDropdown.values = await this.migrationStateModel.getSqlMigrationServiceValues(this.migrationStateModel._targetSubscription, this.migrationStateModel._sqlMigrationServiceResourceGroup);
-			selectDefaultDropdownValue(this._dmsDropdown, this.migrationStateModel._sqlMigrationService?.id, false);
+			this._dmsDropdown.values = await utils.getAzureSqlMigrationServicesDropdownValues(this.migrationStateModel._sqlMigrationServices, this.migrationStateModel._location, this.migrationStateModel._sqlMigrationServiceResourceGroup);
+			utils.selectDefaultDropdownValue(this._dmsDropdown, this.migrationStateModel._sqlMigrationService?.id, false);
 		} finally {
 			this._dmsDropdown.loading = false;
 		}
--- a/extensions/sql-migration/src/wizard/skuRecommendationPage.ts
+++ b/extensions/sql-migration/src/wizard/skuRecommendationPage.ts
@@ -466,7 +466,7 @@ export class SKURecommendationPage extends MigrationWizardPage {
 				}
 			} catch (e) {
 				errors.push(constants.SKU_RECOMMENDATION_ASSESSMENT_UNEXPECTED_ERROR(serverName, e));
-				logError(TelemetryViews.MigrationWizardTaSkuRecommendationPage, 'SkuRecommendationUnexpectedError', e);
+				logError(TelemetryViews.MigrationWizardSkuRecommendationPage, 'SkuRecommendationUnexpectedError', e);
 			} finally {
 				this.migrationStateModel._runAssessments = errors.length > 0;
 				if (errors.length > 0) {
--- a/extensions/sql-migration/src/wizard/targetSelectionPage.ts
+++ b/extensions/sql-migration/src/wizard/targetSelectionPage.ts
@@ -11,8 +11,10 @@ import { MigrationStateModel, MigrationTargetType, StateChangeEvent } from '../m
 import * as constants from '../constants/strings';
 import * as styles from '../constants/styles';
 import { WIZARD_INPUT_COMPONENT_WIDTH } from './wizardController';
-import { deepClone, findDropDownItemIndex, selectDropDownIndex, selectDefaultDropdownValue } from '../api/utils';
+import * as utils from '../api/utils';
 import { azureResource } from 'azurecore';
+import { SqlVMServer } from '../api/azure';
+import { ProvisioningState } from '../models/migrationLocalStorage';

 export class TargetSelectionPage extends MigrationWizardPage {
 	private _view!: azdata.ModelView;
@@ -28,6 +30,8 @@ export class TargetSelectionPage extends MigrationWizardPage {
 	private _azureResourceDropdownLabel!: azdata.TextComponent;
 	private _azureResourceDropdown!: azdata.DropDownComponent;

+	private _migrationTargetPlatform!: MigrationTargetType;
+
 	constructor(wizard: azdata.window.Wizard, migrationStateModel: MigrationStateModel) {
 		super(wizard, azdata.window.createWizardPage(constants.AZURE_SQL_TARGET_PAGE_TITLE), migrationStateModel);
 	}
@@ -87,8 +91,15 @@ export class TargetSelectionPage extends MigrationWizardPage {
 				break;
 		}

-		await this.populateResourceInstanceDropdown();
 		await this.populateAzureAccountsDropdown();
+		if (this._migrationTargetPlatform !== this.migrationStateModel._targetType) {
+			// if the user had previously selected values on this page, then went back to change the migration target platform
+			// and came back, forcibly reload the location/resource group/resource values since they will now be different
+			this._migrationTargetPlatform = this.migrationStateModel._targetType;
+			await this.populateLocationDropdown();
+			await this.populateResourceGroupDropdown();
+			await this.populateResourceInstanceDropdown();
+		}

 		this.wizard.registerNavigationValidator((pageChangeInfo) => {
 			const errors: string[] = [];
@@ -121,7 +132,7 @@ export class TargetSelectionPage extends MigrationWizardPage {
 			const resourceDropdownValue = (<azdata.CategoryValue>this._azureResourceDropdown.value)?.displayName;
 			switch (this.migrationStateModel._targetType) {
 				case MigrationTargetType.SQLMI: {
-					let targetMi = this.migrationStateModel._targetServerInstance as azureResource.AzureSqlManagedInstance;
+					const targetMi = this.migrationStateModel._targetServerInstance as azureResource.AzureSqlManagedInstance;
 					if (!targetMi || resourceDropdownValue === constants.NO_MANAGED_INSTANCE_FOUND) {
 						errors.push(constants.INVALID_MANAGED_INSTANCE_ERROR);
 						break;
@@ -133,9 +144,14 @@ export class TargetSelectionPage extends MigrationWizardPage {
 					break;
 				}
 				case MigrationTargetType.SQLVM: {
-					if (!this.migrationStateModel._targetServerInstance ||
-						resourceDropdownValue === constants.NO_VIRTUAL_MACHINE_FOUND) {
+					const targetVm = this.migrationStateModel._targetServerInstance as SqlVMServer;
+					if (!targetVm || resourceDropdownValue === constants.NO_VIRTUAL_MACHINE_FOUND) {
 						errors.push(constants.INVALID_VIRTUAL_MACHINE_ERROR);
+						break;
+					}
+					if (targetVm.properties.provisioningState !== ProvisioningState.Succeeded) {
+						errors.push(constants.VM_NOT_READY_ERROR(targetVm.name, targetVm.properties.provisioningState));
+						break;
 					}
 					break;
 				}
@@ -176,34 +192,20 @@ export class TargetSelectionPage extends MigrationWizardPage {
 			width: WIZARD_INPUT_COMPONENT_WIDTH,
 			editable: true,
 			required: true,
+			fireOnTextChange: true,
+			placeholder: constants.SELECT_AN_ACCOUNT,
 			CSSStyles: {
 				'margin-top': '-1em'
 			},
 		}).component();
 		this._disposables.push(this._azureAccountsDropdown.onValueChanged(async (value) => {
-			const selectedIndex = findDropDownItemIndex(this._azureAccountsDropdown, value);
-			if (selectedIndex > -1) {
-				const selectedAzureAccount = this.migrationStateModel.getAccount(selectedIndex);
-				// Making a clone of the account object to preserve the original tenants
-				this.migrationStateModel._azureAccount = deepClone(selectedAzureAccount);
-				if (selectedAzureAccount.isStale === false &&
-					this.migrationStateModel._azureAccount.properties.tenants.length > 1) {
-					this.migrationStateModel._accountTenants = selectedAzureAccount.properties.tenants;
-					this._accountTenantDropdown.values = await this.migrationStateModel.getTenantValues();
-					selectDropDownIndex(this._accountTenantDropdown, 0);
-					await this._accountTenantFlexContainer.updateCssStyles({
-						'display': 'inline'
-					});
-				} else {
-					await this._accountTenantFlexContainer.updateCssStyles({
-						'display': 'none'
-					});
-				}
-				await this._azureAccountsDropdown.validate();
-			} else {
-				this.migrationStateModel._azureAccount = undefined!;
+			if (value && value !== 'undefined') {
+				const selectedAccount = this.migrationStateModel._azureAccounts.find(account => account.displayInfo.displayName === value);
+				this.migrationStateModel._azureAccount = (selectedAccount)
+					? utils.deepClone(selectedAccount)!
+					: undefined!;
+				await this.populateTenantsDropdown();
 			}
-			await this.populateSubscriptionDropdown();
 		}));

 		const linkAccountButton = this._view.modelBuilder.hyperlink()
@@ -251,20 +253,22 @@ export class TargetSelectionPage extends MigrationWizardPage {
 			width: WIZARD_INPUT_COMPONENT_WIDTH,
 			editable: true,
 			fireOnTextChange: true,
+			placeholder: constants.SELECT_A_TENANT
 		}).component();

 		this._disposables.push(this._accountTenantDropdown.onValueChanged(async (value) => {
-			/**
-			 * Replacing all the tenants in azure account with the tenant user has selected.
-			 * All azure requests will only run on this tenant from now on
-			 */
-			const selectedIndex = findDropDownItemIndex(this._accountTenantDropdown, value);
-			const selectedTenant = this.migrationStateModel.getTenant(selectedIndex);
-			this.migrationStateModel._azureTenant = deepClone(selectedTenant);
-			if (selectedIndex > -1) {
-				this.migrationStateModel._azureAccount.properties.tenants = [this.migrationStateModel.getTenant(selectedIndex)];
+			if (value && value !== 'undefined') {
+				/**
+				 * Replacing all the tenants in azure account with the tenant user has selected.
+				 * All azure requests will only run on this tenant from now on
+				 */
+				const selectedTenant = this.migrationStateModel._accountTenants.find(tenant => tenant.displayName === value);
+				if (selectedTenant) {
+					this.migrationStateModel._azureTenant = utils.deepClone(selectedTenant)!;
+					this.migrationStateModel._azureAccount.properties.tenants = [this.migrationStateModel._azureTenant];
+				}
+				await this.populateSubscriptionDropdown();
 			}
-			await this.populateSubscriptionDropdown();
 		}));

 		this._accountTenantFlexContainer = this._view.modelBuilder.flexContainer()
@@ -300,21 +304,20 @@ export class TargetSelectionPage extends MigrationWizardPage {
 			editable: true,
 			required: true,
 			fireOnTextChange: true,
+			placeholder: constants.SELECT_A_SUBSCRIPTION,
 			CSSStyles: {
 				'margin-top': '-1em'
 			},
 		}).component();
 		this._disposables.push(this._azureSubscriptionDropdown.onValueChanged(async (value) => {
-			const selectedIndex = findDropDownItemIndex(this._azureSubscriptionDropdown, value);
-			if (selectedIndex > -1 &&
-				value !== constants.NO_SUBSCRIPTIONS_FOUND) {
-				this.migrationStateModel._targetSubscription = this.migrationStateModel.getSubscription(selectedIndex);
-			} else {
-				this.migrationStateModel._targetSubscription = undefined!;
+			if (value && value !== 'undefined' && value !== constants.NO_SUBSCRIPTIONS_FOUND) {
+				const selectedSubscription = this.migrationStateModel._subscriptions.find(subscription => `${subscription.name} - ${subscription.id}` === value);
+				this.migrationStateModel._targetSubscription = (selectedSubscription)
+					? utils.deepClone(selectedSubscription)!
+					: undefined!;
+				this.migrationStateModel.refreshDatabaseBackupPage = true;
+				await this.populateLocationDropdown();
 			}
-			this.migrationStateModel.refreshDatabaseBackupPage = true;
-			await this.populateLocationDropdown();
-			await this.populateResourceGroupDropdown();
 		}));

 		const azureLocationLabel = this._view.modelBuilder.text().withProps({
@@ -332,20 +335,21 @@ export class TargetSelectionPage extends MigrationWizardPage {
 			editable: true,
 			required: true,
 			fireOnTextChange: true,
+			placeholder: constants.SELECT_A_LOCATION,
 			CSSStyles: {
 				'margin-top': '-1em'
 			},
 		}).component();
 		this._disposables.push(this._azureLocationDropdown.onValueChanged(async (value) => {
-			const selectedIndex = findDropDownItemIndex(this._azureLocationDropdown, value);
-			if (selectedIndex > -1 &&
-				value !== constants.NO_LOCATION_FOUND) {
-				this.migrationStateModel._location = this.migrationStateModel.getLocation(selectedIndex);
-			} else {
-				this.migrationStateModel._location = undefined!;
+			if (value && value !== 'undefined' && value !== constants.NO_LOCATION_FOUND) {
+				const selectedLocation = this.migrationStateModel._locations.find(location => location.displayName === value);
+				this.migrationStateModel._location = (selectedLocation)
+					? utils.deepClone(selectedLocation)!
+					: undefined!;
+				this.migrationStateModel.refreshDatabaseBackupPage = true;
+				await this.populateResourceGroupDropdown();
+				await this.populateResourceInstanceDropdown();
 			}
-			this.migrationStateModel.refreshDatabaseBackupPage = true;
-			await this.populateResourceInstanceDropdown();
 		}));

 		const azureResourceGroupLabel = this._view.modelBuilder.text().withProps({
@@ -363,19 +367,19 @@ export class TargetSelectionPage extends MigrationWizardPage {
 			editable: true,
 			required: true,
 			fireOnTextChange: true,
+			placeholder: constants.SELECT_A_RESOURCE_GROUP,
 			CSSStyles: {
 				'margin-top': '-1em'
 			},
 		}).component();
 		this._disposables.push(this._azureResourceGroupDropdown.onValueChanged(async (value) => {
-			const selectedIndex = findDropDownItemIndex(this._azureResourceGroupDropdown, value);
-			if (selectedIndex > -1 &&
-				value !== constants.RESOURCE_GROUP_NOT_FOUND) {
-				this.migrationStateModel._resourceGroup = this.migrationStateModel.getAzureResourceGroup(selectedIndex);
-			} else {
-				this.migrationStateModel._resourceGroup = undefined!;
+			if (value && value !== 'undefined' && value !== constants.RESOURCE_GROUP_NOT_FOUND) {
+				const selectedResourceGroup = this.migrationStateModel._resourceGroups.find(rg => rg.name === value);
+				this.migrationStateModel._resourceGroup = (selectedResourceGroup)
+					? utils.deepClone(selectedResourceGroup)!
+					: undefined!;
+				await this.populateResourceInstanceDropdown();
 			}
-			await this.populateResourceInstanceDropdown();
 		}));

 		this._azureResourceDropdownLabel = this._view.modelBuilder.text().withProps({
@@ -393,39 +397,54 @@ export class TargetSelectionPage extends MigrationWizardPage {
 			editable: true,
 			required: true,
 			fireOnTextChange: true,
+			placeholder: constants.SELECT_A_SERVICE,
 			CSSStyles: {
 				'margin-top': '-1em'
 			},
 		}).component();
 		this._disposables.push(this._azureResourceDropdown.onValueChanged(async (value) => {
-			const selectedIndex = findDropDownItemIndex(this._azureResourceDropdown, value);
-			if (selectedIndex > -1 &&
-				value !== constants.NO_MANAGED_INSTANCE_FOUND &&
-				value !== constants.NO_VIRTUAL_MACHINE_FOUND) {
+			if (value && value !== 'undefined' && value !== constants.NO_MANAGED_INSTANCE_FOUND && value !== constants.NO_VIRTUAL_MACHINE_FOUND) {
 				this.migrationStateModel._sqlMigrationServices = undefined!;

 				switch (this.migrationStateModel._targetType) {
 					case MigrationTargetType.SQLVM:
-						this.migrationStateModel._targetServerInstance = this.migrationStateModel.getVirtualMachine(selectedIndex);
+						const selectedVm = this.migrationStateModel._targetSqlVirtualMachines.find(vm => vm.name === value || constants.UNAVAILABLE_TARGET_PREFIX(vm.name) === value);
+						if (selectedVm) {
+							this.migrationStateModel._targetServerInstance = utils.deepClone(selectedVm)! as SqlVMServer;
+
+							if (this.migrationStateModel._targetServerInstance.properties.provisioningState !== ProvisioningState.Succeeded) {
+								this.wizard.message = {
+									text: constants.VM_NOT_READY_ERROR(this.migrationStateModel._targetServerInstance.name, this.migrationStateModel._targetServerInstance.properties.provisioningState),
+									level: azdata.window.MessageLevel.Error
+								};
+							} else {
+								this.wizard.message = {
+									text: '',
+									level: azdata.window.MessageLevel.Error
+								};
+							}
+						}
 						break;

 					case MigrationTargetType.SQLMI:
-						this.migrationStateModel._targetServerInstance = this.migrationStateModel.getManagedInstance(selectedIndex);
-						if (this.migrationStateModel._targetServerInstance.properties.state !== 'Ready') {
-							this.wizard.message = {
-								text: constants.MI_NOT_READY_ERROR(this.migrationStateModel._targetServerInstance.name, this.migrationStateModel._targetServerInstance.properties.state),
-								level: azdata.window.MessageLevel.Error
-							};
-						} else {
-							this.wizard.message = {
-								text: '',
-								level: azdata.window.MessageLevel.Error
-							};
+						const selectedMi = this.migrationStateModel._targetManagedInstances.find(mi => mi.name === value || constants.UNAVAILABLE_TARGET_PREFIX(mi.name) === value);
+						if (selectedMi) {
+							this.migrationStateModel._targetServerInstance = utils.deepClone(selectedMi)! as azureResource.AzureSqlManagedInstance;
+
+							if (this.migrationStateModel._targetServerInstance.properties.state !== 'Ready') {
+								this.wizard.message = {
+									text: constants.MI_NOT_READY_ERROR(this.migrationStateModel._targetServerInstance.name, this.migrationStateModel._targetServerInstance.properties.state),
+									level: azdata.window.MessageLevel.Error
+								};
+							} else {
+								this.wizard.message = {
+									text: '',
+									level: azdata.window.MessageLevel.Error
+								};
+							}
 						}
 						break;
 				}
-			} else {
-				this.migrationStateModel._targetServerInstance = undefined!;
 			}
 		}));

@@ -448,18 +467,40 @@ export class TargetSelectionPage extends MigrationWizardPage {
 	private async populateAzureAccountsDropdown(): Promise<void> {
 		try {
 			this.updateDropdownLoadingStatus(TargetDropDowns.AzureAccount, true);
-			this._azureAccountsDropdown.values = await this.migrationStateModel.getAccountValues();
-			selectDefaultDropdownValue(this._azureAccountsDropdown, this.migrationStateModel._azureAccount?.displayInfo?.userId, false);
+			this.migrationStateModel._azureAccounts = await utils.getAzureAccounts();
+			this._azureAccountsDropdown.values = await utils.getAzureAccountsDropdownValues(this.migrationStateModel._azureAccounts);
+			utils.selectDefaultDropdownValue(this._azureAccountsDropdown, this.migrationStateModel._azureAccount?.displayInfo?.userId, false);
 		} finally {
 			this.updateDropdownLoadingStatus(TargetDropDowns.AzureAccount, false);
 		}
 	}

+	private async populateTenantsDropdown(): Promise<void> {
+		try {
+			this.updateDropdownLoadingStatus(TargetDropDowns.Tenant, true);
+			if (this.migrationStateModel._azureAccount && this.migrationStateModel._azureAccount.isStale === false && this.migrationStateModel._azureAccount.properties.tenants.length > 0) {
+				this.migrationStateModel._accountTenants = utils.getAzureTenants(this.migrationStateModel._azureAccount);
+				this._accountTenantDropdown.values = await utils.getAzureTenantsDropdownValues(this.migrationStateModel._accountTenants);
+				utils.selectDefaultDropdownValue(this._accountTenantDropdown, this.migrationStateModel._azureTenant?.id, true);
+			}
+			await this._accountTenantFlexContainer.updateCssStyles(this.migrationStateModel._azureAccount.properties.tenants.length > 1
+				? { 'display': 'inline' }
+				: { 'display': 'none' }
+			);
+			await this._azureAccountsDropdown.validate();
+		} finally {
+			this.updateDropdownLoadingStatus(TargetDropDowns.Tenant, false);
+			await this.populateSubscriptionDropdown();
+		}
+	}
+
+
 	private async populateSubscriptionDropdown(): Promise<void> {
 		try {
 			this.updateDropdownLoadingStatus(TargetDropDowns.Subscription, true);
-			this._azureSubscriptionDropdown.values = await this.migrationStateModel.getSubscriptionsDropdownValues();
-			selectDefaultDropdownValue(this._azureSubscriptionDropdown, this.migrationStateModel._targetSubscription?.id, false);
+			this.migrationStateModel._subscriptions = await utils.getAzureSubscriptions(this.migrationStateModel._azureAccount);
+			this._azureSubscriptionDropdown.values = await utils.getAzureSubscriptionsDropdownValues(this.migrationStateModel._subscriptions);
+			utils.selectDefaultDropdownValue(this._azureSubscriptionDropdown, this.migrationStateModel._targetSubscription?.id, false);
 		} catch (e) {
 			console.log(e);
 		} finally {
@@ -470,8 +511,18 @@ export class TargetSelectionPage extends MigrationWizardPage {
 	public async populateLocationDropdown(): Promise<void> {
 		try {
 			this.updateDropdownLoadingStatus(TargetDropDowns.Location, true);
-			this._azureLocationDropdown.values = await this.migrationStateModel.getAzureLocationDropdownValues(this.migrationStateModel._targetSubscription);
-			selectDefaultDropdownValue(this._azureLocationDropdown, this.migrationStateModel._location?.displayName, true);
+			switch (this.migrationStateModel._targetType) {
+				case MigrationTargetType.SQLMI:
+					this.migrationStateModel._targetManagedInstances = await utils.getManagedInstances(this.migrationStateModel._azureAccount, this.migrationStateModel._targetSubscription);
+					this.migrationStateModel._locations = await utils.getSqlManagedInstanceLocations(this.migrationStateModel._azureAccount, this.migrationStateModel._targetSubscription, this.migrationStateModel._targetManagedInstances);
+					break;
+				case MigrationTargetType.SQLVM:
+					this.migrationStateModel._targetSqlVirtualMachines = await utils.getVirtualMachines(this.migrationStateModel._azureAccount, this.migrationStateModel._targetSubscription);
+					this.migrationStateModel._locations = await utils.getSqlVirtualMachineLocations(this.migrationStateModel._azureAccount, this.migrationStateModel._targetSubscription, this.migrationStateModel._targetSqlVirtualMachines);
+					break;
+			}
+			this._azureLocationDropdown.values = await utils.getAzureLocationsDropdownValues(this.migrationStateModel._locations);
+			utils.selectDefaultDropdownValue(this._azureLocationDropdown, this.migrationStateModel._location?.displayName, true);
 		} catch (e) {
 			console.log(e);
 		} finally {
@@ -484,13 +535,14 @@ export class TargetSelectionPage extends MigrationWizardPage {
 			this.updateDropdownLoadingStatus(TargetDropDowns.ResourceGroup, true);
 			switch (this.migrationStateModel._targetType) {
 				case MigrationTargetType.SQLMI:
-					this._azureResourceGroupDropdown.values = await this.migrationStateModel.getAzureResourceGroupForManagedInstancesDropdownValues(this.migrationStateModel._targetSubscription);
+					this.migrationStateModel._resourceGroups = await utils.getSqlManagedInstanceResourceGroups(this.migrationStateModel._targetManagedInstances, this.migrationStateModel._location);
 					break;
 				case MigrationTargetType.SQLVM:
-					this._azureResourceGroupDropdown.values = await this.migrationStateModel.getAzureResourceGroupForVirtualMachinesDropdownValues(this.migrationStateModel._targetSubscription);
+					this.migrationStateModel._resourceGroups = await utils.getSqlVirtualMachineResourceGroups(this.migrationStateModel._targetSqlVirtualMachines, this.migrationStateModel._location);
 					break;
 			}
-			selectDefaultDropdownValue(this._azureResourceGroupDropdown, this.migrationStateModel._resourceGroup?.id, false);
+			this._azureResourceGroupDropdown.values = await utils.getAzureResourceGroupsDropdownValues(this.migrationStateModel._resourceGroups);
+			utils.selectDefaultDropdownValue(this._azureResourceGroupDropdown, this.migrationStateModel._resourceGroup?.id, false);
 		} catch (e) {
 			console.log(e);
 		} finally {
@@ -503,15 +555,15 @@ export class TargetSelectionPage extends MigrationWizardPage {
 			this.updateDropdownLoadingStatus(TargetDropDowns.ResourceInstance, true);
 			switch (this.migrationStateModel._targetType) {
 				case MigrationTargetType.SQLMI: {
-					this._azureResourceDropdown.values = await this.migrationStateModel.getManagedInstanceValues(this.migrationStateModel._targetSubscription, this.migrationStateModel._location, this.migrationStateModel._resourceGroup);
+					this._azureResourceDropdown.values = await utils.getManagedInstancesDropdownValues(this.migrationStateModel._targetManagedInstances, this.migrationStateModel._location, this.migrationStateModel._resourceGroup);
 					break;
 				}
 				case MigrationTargetType.SQLVM: {
-					this._azureResourceDropdown.values = await this.migrationStateModel.getSqlVirtualMachineValues(this.migrationStateModel._targetSubscription, this.migrationStateModel._location, this.migrationStateModel._resourceGroup);
+					this._azureResourceDropdown.values = await utils.getVirtualMachinesDropdownValues(this.migrationStateModel._targetSqlVirtualMachines, this.migrationStateModel._location, this.migrationStateModel._resourceGroup);
 					break;
 				}
 			}
-			selectDefaultDropdownValue(this._azureResourceDropdown, this.migrationStateModel._targetServerInstance?.name, true);
+			utils.selectDefaultDropdownValue(this._azureResourceDropdown, this.migrationStateModel._targetServerInstance?.name, true);
 		} catch (e) {
 			console.log(e);
 		} finally {
@@ -537,6 +589,7 @@ export class TargetSelectionPage extends MigrationWizardPage {

 export enum TargetDropDowns {
 	AzureAccount,
+	Tenant,
 	Subscription,
 	Location,
 	ResourceGroup,