From 69361b5c973b06be5ca2d5bd97f42419e8136c81 Mon Sep 17 00:00:00 2001 From: Sakshi Sharma <57200045+SakshiS-harma@users.noreply.github.com> Date: Mon, 29 Mar 2021 16:45:08 -0700 Subject: [PATCH] Update button texts for Create New project and Open existing project UIs (#14900) --- extensions/data-workspace/src/common/constants.ts | 2 ++ extensions/data-workspace/src/dialogs/dialogBase.ts | 4 ++-- extensions/data-workspace/src/dialogs/newProjectDialog.ts | 2 +- extensions/data-workspace/src/dialogs/openExistingDialog.ts | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/extensions/data-workspace/src/common/constants.ts b/extensions/data-workspace/src/common/constants.ts index 0be62279c2..7591fedb3c 100644 --- a/extensions/data-workspace/src/common/constants.ts +++ b/extensions/data-workspace/src/common/constants.ts @@ -30,6 +30,8 @@ export const showNotAddedProjectsMessageKey = 'showNotAddedProjectsInWorkspacePr export const OkButtonText = localize('dataworkspace.ok', "OK"); export const CancelButtonText = localize('dataworkspace.cancel', "Cancel"); export const BrowseButtonText = localize('dataworkspace.browse', "Browse"); +export const OpenButtonText = localize('dataworkspace.open', "Open"); +export const CreateButtonText = localize('dataworkspace.create', "Create"); export const WorkspaceFileExtension = '.code-workspace'; export const DefaultInputWidth = '400px'; export const DefaultButtonWidth = '80px'; diff --git a/extensions/data-workspace/src/dialogs/dialogBase.ts b/extensions/data-workspace/src/dialogs/dialogBase.ts index 3dc52ce80a..d340289245 100644 --- a/extensions/data-workspace/src/dialogs/dialogBase.ts +++ b/extensions/data-workspace/src/dialogs/dialogBase.ts @@ -24,9 +24,9 @@ export abstract class DialogBase { public workspaceInputBox: azdata.InputBoxComponent | undefined; protected workspaceInputFormComponent: azdata.FormComponent | undefined; - constructor(dialogTitle: string, dialogName: string, dialogWidth: azdata.window.DialogWidth = 600) { + constructor(dialogTitle: string, dialogName: string, okButtonText: string, dialogWidth: azdata.window.DialogWidth = 600) { this.dialogObject = azdata.window.createModelViewDialog(dialogTitle, dialogName, dialogWidth); - this.dialogObject.okButton.label = constants.OkButtonText; + this.dialogObject.okButton.label = okButtonText; this.register(this.dialogObject.cancelButton.onClick(() => this.onCancelButtonClicked())); this.register(this.dialogObject.okButton.onClick(() => this.onOkButtonClicked())); this.dialogObject.registerCloseValidator(async () => { diff --git a/extensions/data-workspace/src/dialogs/newProjectDialog.ts b/extensions/data-workspace/src/dialogs/newProjectDialog.ts index 9c597a41f8..7fdd12e8c9 100644 --- a/extensions/data-workspace/src/dialogs/newProjectDialog.ts +++ b/extensions/data-workspace/src/dialogs/newProjectDialog.ts @@ -25,7 +25,7 @@ export class NewProjectDialog extends DialogBase { public model: NewProjectDialogModel = new NewProjectDialogModel(); constructor(private workspaceService: IWorkspaceService) { - super(constants.NewProjectDialogTitle, 'NewProject'); + super(constants.NewProjectDialogTitle, 'NewProject', constants.CreateButtonText); // dialog launched from Welcome message button (only visible when no current workspace) vs. "add project" button TelemetryReporter.createActionEvent(TelemetryViews.NewProjectDialog, TelemetryActions.NewProjectDialogLaunched) diff --git a/extensions/data-workspace/src/dialogs/openExistingDialog.ts b/extensions/data-workspace/src/dialogs/openExistingDialog.ts index 10053346db..327581c377 100644 --- a/extensions/data-workspace/src/dialogs/openExistingDialog.ts +++ b/extensions/data-workspace/src/dialogs/openExistingDialog.ts @@ -37,7 +37,7 @@ export class OpenExistingDialog extends DialogBase { ]; constructor(private workspaceService: IWorkspaceService, private extensionContext: vscode.ExtensionContext) { - super(constants.OpenExistingDialogTitle, 'OpenProject'); + super(constants.OpenExistingDialogTitle, 'OpenProject', constants.OpenButtonText); // dialog launched from Welcome message button (only visible when no current workspace) vs. "add project" button TelemetryReporter.createActionEvent(TelemetryViews.OpenExistingDialog, TelemetryActions.OpenExistingDialogLaunched)