From 1538adf5ed2a3bd8b355bbaae3a765c803c81186 Mon Sep 17 00:00:00 2001 From: brian-harris <61598682+brian-harris@users.noreply.github.com> Date: Tue, 29 Jun 2021 15:35:48 -0700 Subject: [PATCH] add aria label content to dropdown controls (#15940) --- extensions/sql-migration/src/constants/strings.ts | 3 +++ .../createSqlMigrationServiceDialog.ts | 1 + .../src/dialog/migrationStatus/migrationStatusDialog.ts | 1 + extensions/sql-migration/src/wizard/accountsSelectionPage.ts | 2 ++ extensions/sql-migration/src/wizard/databaseBackupPage.ts | 5 +++++ .../sql-migration/src/wizard/integrationRuntimePage.ts | 2 ++ extensions/sql-migration/src/wizard/skuRecommendationPage.ts | 4 ++++ .../sql-migration/src/wizard/subscriptionSelectionPage.ts | 3 +++ 8 files changed, 21 insertions(+) diff --git a/extensions/sql-migration/src/constants/strings.ts b/extensions/sql-migration/src/constants/strings.ts index 297e6c3588..e5e7a2563f 100644 --- a/extensions/sql-migration/src/constants/strings.ts +++ b/extensions/sql-migration/src/constants/strings.ts @@ -249,6 +249,8 @@ export const SUMMARY_AZURE_STORAGE = localize('sql.migration.summary.azure.stora export const SUMMARY_IR_NODE = localize('sql.migration.ir.node', "Integration Runtime node"); export const NETWORK_SHARE = localize('sql.migration.network.share', "Network Share"); export const BLOB_CONTAINER = localize('sql.migration.blob.container.title', "Blob Container"); +export const BLOB_CONTAINER_RESOURCE_GROUP = localize('sql.migration.blob.container.label', "Blob container resource group"); +export const BLOB_CONTAINER_STORAGE_ACCOUNT = localize('sql.migration.blob.container.storage.account.label', "Blob container storage account"); export const FILE_SHARE = localize('sql.migration.file.share.title', "File Share"); export const MIGRATION_STARTED = localize('sql.migration.started.notification', "Migration in progress"); export const SOURCE_DATABASES = localize('sql.migration.source.databases', "Source Database(s)"); @@ -311,6 +313,7 @@ export const TARGET_DATABASE_NAME = localize('sql.migration.target.database.name export const TARGET_SERVER = localize('sql.migration.target.server', "Target server"); export const TARGET_VERSION = localize('sql.migration.target.version', "Target version"); export const MIGRATION_STATUS = localize('sql.migration.migration.status', "Migration status"); +export const MIGRATION_STATUS_FILTER = localize('sql.migration.migration.status.filter', "Migration status filter"); export const FULL_BACKUP_FILES = localize('sql.migration.full.backup.files', "Full backup files"); export const LAST_APPLIED_LSN = localize('sql.migration.last.applied.lsn', "Last applied LSN"); export const LAST_APPLIED_BACKUP_FILES = localize('sql.migration.last.applied.backup.files', "Last applied backup files"); diff --git a/extensions/sql-migration/src/dialog/createSqlMigrationService/createSqlMigrationServiceDialog.ts b/extensions/sql-migration/src/dialog/createSqlMigrationService/createSqlMigrationServiceDialog.ts index ad3320a1bc..59ec033cfc 100644 --- a/extensions/sql-migration/src/dialog/createSqlMigrationService/createSqlMigrationServiceDialog.ts +++ b/extensions/sql-migration/src/dialog/createSqlMigrationService/createSqlMigrationServiceDialog.ts @@ -228,6 +228,7 @@ export class CreateSqlMigrationServiceDialog { }).component(); this.migrationServiceResourceGroupDropdown = this._view.modelBuilder.dropDown().withProps({ + ariaLabel: constants.RESOURCE_GROUP, required: true, editable: true, fireOnTextChange: true, diff --git a/extensions/sql-migration/src/dialog/migrationStatus/migrationStatusDialog.ts b/extensions/sql-migration/src/dialog/migrationStatus/migrationStatusDialog.ts index dd79ca6025..ebbe96e09d 100644 --- a/extensions/sql-migration/src/dialog/migrationStatus/migrationStatusDialog.ts +++ b/extensions/sql-migration/src/dialog/migrationStatus/migrationStatusDialog.ts @@ -37,6 +37,7 @@ export class MigrationStatusDialog { this._view = view; this._statusDropdown = this._view.modelBuilder.dropDown().withProps({ + ariaLabel: loc.MIGRATION_STATUS_FILTER, values: this._model.statusDropdownValues, width: '220px' }).component(); diff --git a/extensions/sql-migration/src/wizard/accountsSelectionPage.ts b/extensions/sql-migration/src/wizard/accountsSelectionPage.ts index ed5ed9155a..033263eb9d 100644 --- a/extensions/sql-migration/src/wizard/accountsSelectionPage.ts +++ b/extensions/sql-migration/src/wizard/accountsSelectionPage.ts @@ -45,6 +45,7 @@ export class AccountsSelectionPage extends MigrationWizardPage { this._azureAccountsDropdown = view.modelBuilder.dropDown() .withProps({ + ariaLabel: constants.ACCOUNTS_SELECTION_PAGE_TITLE, width: WIZARD_INPUT_COMPONENT_WIDTH, editable: true, fireOnTextChange: true, @@ -144,6 +145,7 @@ export class AccountsSelectionPage extends MigrationWizardPage { }).component(); this._accountTenantDropdown = view.modelBuilder.dropDown().withProps({ + ariaLabel: constants.AZURE_TENANT, width: WIZARD_INPUT_COMPONENT_WIDTH, editable: true, fireOnTextChange: true, diff --git a/extensions/sql-migration/src/wizard/databaseBackupPage.ts b/extensions/sql-migration/src/wizard/databaseBackupPage.ts index ee184f267b..0b85786bea 100644 --- a/extensions/sql-migration/src/wizard/databaseBackupPage.ts +++ b/extensions/sql-migration/src/wizard/databaseBackupPage.ts @@ -555,6 +555,7 @@ export class DatabaseBackupPage extends MigrationWizardPage { } }).component(); this._networkShareStorageAccountResourceGroupDropdown = this._view.modelBuilder.dropDown().withProps({ + ariaLabel: constants.RESOURCE_GROUP, width: WIZARD_INPUT_COMPONENT_WIDTH, editable: true, fireOnTextChange: true, @@ -578,6 +579,7 @@ export class DatabaseBackupPage extends MigrationWizardPage { }).component(); this._networkShareContainerStorageAccountDropdown = this._view.modelBuilder.dropDown() .withProps({ + ariaLabel: constants.STORAGE_ACCOUNT, required: true, width: WIZARD_INPUT_COMPONENT_WIDTH, editable: true, @@ -713,6 +715,7 @@ export class DatabaseBackupPage extends MigrationWizardPage { this._blobContainerTargetDatabaseNames.push(blobtargetDatabaseInput); const blobContainerResourceDropdown = this._view.modelBuilder.dropDown().withProps({ + ariaLabel: constants.BLOB_CONTAINER_RESOURCE_GROUP, width: WIZARD_TABLE_COLUMN_WIDTH, editable: true, fireOnTextChange: true, @@ -729,6 +732,7 @@ export class DatabaseBackupPage extends MigrationWizardPage { const blobContainerStorageAccountDropdown = this._view.modelBuilder.dropDown() .withProps({ + ariaLabel: constants.BLOB_CONTAINER_STORAGE_ACCOUNT, width: WIZARD_TABLE_COLUMN_WIDTH, editable: true, fireOnTextChange: true, @@ -745,6 +749,7 @@ export class DatabaseBackupPage extends MigrationWizardPage { const blobContainerDropdown = this._view.modelBuilder.dropDown() .withProps({ + ariaLabel: constants.BLOB_CONTAINER, width: WIZARD_TABLE_COLUMN_WIDTH, editable: true, fireOnTextChange: true, diff --git a/extensions/sql-migration/src/wizard/integrationRuntimePage.ts b/extensions/sql-migration/src/wizard/integrationRuntimePage.ts index 0b26df61e8..58351803b9 100644 --- a/extensions/sql-migration/src/wizard/integrationRuntimePage.ts +++ b/extensions/sql-migration/src/wizard/integrationRuntimePage.ts @@ -181,6 +181,7 @@ export class IntergrationRuntimePage extends MigrationWizardPage { } }).component(); this._resourceGroupDropdown = this._view.modelBuilder.dropDown().withProps({ + ariaLabel: constants.RESOURCE_GROUP, width: WIZARD_INPUT_COMPONENT_WIDTH, editable: true, fireOnTextChange: true, @@ -202,6 +203,7 @@ export class IntergrationRuntimePage extends MigrationWizardPage { }).component(); this._dmsDropdown = this._view.modelBuilder.dropDown().withProps({ + ariaLabel: constants.IR_PAGE_TITLE, width: WIZARD_INPUT_COMPONENT_WIDTH, editable: true, fireOnTextChange: true, diff --git a/extensions/sql-migration/src/wizard/skuRecommendationPage.ts b/extensions/sql-migration/src/wizard/skuRecommendationPage.ts index d726a29abe..44a4137964 100644 --- a/extensions/sql-migration/src/wizard/skuRecommendationPage.ts +++ b/extensions/sql-migration/src/wizard/skuRecommendationPage.ts @@ -291,6 +291,7 @@ export class SKURecommendationPage extends MigrationWizardPage { } }).component(); this._managedInstanceSubscriptionDropdown = this._view.modelBuilder.dropDown().withProps({ + ariaLabel: constants.SUBSCRIPTION, width: WIZARD_INPUT_COMPONENT_WIDTH, editable: true, fireOnTextChange: true, @@ -314,6 +315,7 @@ export class SKURecommendationPage extends MigrationWizardPage { } }).component(); this._azureLocationDropdown = this._view.modelBuilder.dropDown().withProps({ + ariaLabel: constants.LOCATION, width: WIZARD_INPUT_COMPONENT_WIDTH, editable: true, fireOnTextChange: true, @@ -335,6 +337,7 @@ export class SKURecommendationPage extends MigrationWizardPage { } }).component(); this._azureResourceGroupDropdown = this._view.modelBuilder.dropDown().withProps({ + ariaLabel: constants.RESOURCE_GROUP, width: WIZARD_INPUT_COMPONENT_WIDTH, editable: true, fireOnTextChange: true, @@ -356,6 +359,7 @@ export class SKURecommendationPage extends MigrationWizardPage { }).component(); this._resourceDropdown = this._view.modelBuilder.dropDown().withProps({ + ariaLabel: constants.MANAGED_INSTANCE, width: WIZARD_INPUT_COMPONENT_WIDTH, editable: true, fireOnTextChange: true, diff --git a/extensions/sql-migration/src/wizard/subscriptionSelectionPage.ts b/extensions/sql-migration/src/wizard/subscriptionSelectionPage.ts index b3026699fa..3cf704a367 100644 --- a/extensions/sql-migration/src/wizard/subscriptionSelectionPage.ts +++ b/extensions/sql-migration/src/wizard/subscriptionSelectionPage.ts @@ -53,6 +53,7 @@ export class SubscriptionSelectionPage extends MigrationWizardPage { private createAccountDropDown(view: azdata.ModelView): azdata.FormComponent { const dropDown = view.modelBuilder.dropDown().withProperties({ + ariaLabel: SUBSCRIPTION_SELECTION_AZURE_ACCOUNT_TITLE, values: [], editable: true, fireOnTextChange: true, @@ -70,6 +71,7 @@ export class SubscriptionSelectionPage extends MigrationWizardPage { private createSubscriptionDropDown(view: azdata.ModelView): azdata.FormComponent { const dropDown = view.modelBuilder.dropDown().withProperties({ + ariaLabel: SUBSCRIPTION_SELECTION_AZURE_SUBSCRIPTION_TITLE, values: [], editable: true, fireOnTextChange: true, @@ -87,6 +89,7 @@ export class SubscriptionSelectionPage extends MigrationWizardPage { private createProductDropDown(view: azdata.ModelView): azdata.FormComponent { const dropDown = view.modelBuilder.dropDown().withProperties({ + ariaLabel: SUBSCRIPTION_SELECTION_AZURE_PRODUCT_TITLE, values: [], editable: true, fireOnTextChange: true,