From 93c9426f25e632e8e3dd6e572d48d559ae07a7bf Mon Sep 17 00:00:00 2001 From: Kim Santiago <31145923+kisantia@users.noreply.github.com> Date: Thu, 10 Oct 2019 10:30:43 -0700 Subject: [PATCH] fix aria labels for database text boxes (#7628) --- extensions/dacpac/src/wizard/api/dacFxConfigPage.ts | 6 +++--- extensions/dacpac/src/wizard/pages/deployConfigPage.ts | 3 +-- extensions/dacpac/src/wizard/pages/importConfigPage.ts | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/extensions/dacpac/src/wizard/api/dacFxConfigPage.ts b/extensions/dacpac/src/wizard/api/dacFxConfigPage.ts index 638e0bd1bf..ce205c43cf 100644 --- a/extensions/dacpac/src/wizard/api/dacFxConfigPage.ts +++ b/extensions/dacpac/src/wizard/api/dacFxConfigPage.ts @@ -79,19 +79,19 @@ export abstract class DacFxConfigPage extends BasePage { return true; } - protected async createDatabaseTextBox(): Promise { + protected async createDatabaseTextBox(title: string): Promise { this.databaseTextBox = this.view.modelBuilder.inputBox().withProperties({ required: true }).component(); - this.databaseTextBox.ariaLabel = localize('dacfx.databaseAriaLabel', "Database"); + this.databaseTextBox.ariaLabel = title; this.databaseTextBox.onTextChanged(async () => { this.model.database = this.databaseTextBox.value; }); return { component: this.databaseTextBox, - title: localize('dacFx.databaseNameTextBox', 'Target Database') + title: title }; } diff --git a/extensions/dacpac/src/wizard/pages/deployConfigPage.ts b/extensions/dacpac/src/wizard/pages/deployConfigPage.ts index 57a3af68ee..800667e75f 100644 --- a/extensions/dacpac/src/wizard/pages/deployConfigPage.ts +++ b/extensions/dacpac/src/wizard/pages/deployConfigPage.ts @@ -35,8 +35,7 @@ export class DeployConfigPage extends DacFxConfigPage { async start(): Promise { let serverComponent = await this.createServerDropdown(true); let fileBrowserComponent = await this.createFileBrowser(); - this.databaseComponent = await this.createDatabaseTextBox(); - this.databaseComponent.title = localize('dacFx.databaseNameTextBox', 'Database Name'); + this.databaseComponent = await this.createDatabaseTextBox(localize('dacFx.databaseNameTextBox', "Database Name")); this.databaseDropdownComponent = await this.createDeployDatabaseDropdown(); this.databaseDropdownComponent.title = localize('dacFx.databaseNameDropdown', 'Database Name'); let radioButtons = await this.createRadiobuttons(); diff --git a/extensions/dacpac/src/wizard/pages/importConfigPage.ts b/extensions/dacpac/src/wizard/pages/importConfigPage.ts index 6bc4283c06..c1a5b7dd05 100644 --- a/extensions/dacpac/src/wizard/pages/importConfigPage.ts +++ b/extensions/dacpac/src/wizard/pages/importConfigPage.ts @@ -30,7 +30,7 @@ export class ImportConfigPage extends DacFxConfigPage { } async start(): Promise { - let databaseComponent = await this.createDatabaseTextBox(); + let databaseComponent = await this.createDatabaseTextBox(localize('dacfx.targetDatabaseAriaLabel', "Target Database")); let serverComponent = await this.createServerDropdown(true); let fileBrowserComponent = await this.createFileBrowser();