ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-01 09:35:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add target platform dropdown to new project dialog (#16091)

Browse Source 
* add target platform as an option in create project api

* move constant

* WIP

* show versions in dialog and create project with selected version

* validate version

* add error messages

* add test

* change version to target platform

* cleanup

* more cleanup

* use withProps
This commit is contained in:
Kim Santiago
2021-07-15 13:43:48 -07:00
committed by GitHub
parent 2a74ad4190
commit 5059c94adc
9 changed files with 150 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
extensions/data-workspace/src/dialogs/newProjectDialog.ts
View File

@@ -20,9 +20,13 @@ class NewProjectDialogModel {
projectFileExtension: string = '';
name: string = '';
location: string = '';
targetPlatform?: string;
}
export class NewProjectDialog extends DialogBase {
public model: NewProjectDialogModel = new NewProjectDialogModel();
public formBuilder: azdataType.FormBuilder | undefined;
public targetPlatformDropdownFormComponent: azdataType.FormComponent | undefined;
constructor(private workspaceService: IWorkspaceService) {
super(constants.NewProjectDialogTitle, 'NewProject', constants.CreateButtonText);
@@ -67,7 +71,7 @@ export class NewProjectDialog extends DialogBase {
.withAdditionalProperties({ projectFileExtension: this.model.projectFileExtension, projectTemplateId: this.model.projectTypeId })
.send();
await this.workspaceService.createProject(this.model.name, vscode.Uri.file(this.model.location), this.model.projectTypeId);
await this.workspaceService.createProject(this.model.name, vscode.Uri.file(this.model.location), this.model.projectTypeId, this.model.targetPlatform);
}
catch (err) {
@@ -81,7 +85,7 @@ export class NewProjectDialog extends DialogBase {
protected async initialize(view: azdataType.ModelView): Promise<void> {
const allProjectTypes = await this.workspaceService.getAllProjectTypes();
const projectTypeRadioCardGroup = view.modelBuilder.radioCardGroup().withProperties<azdataType.RadioCardGroupComponentProperties>({
const projectTypeRadioCardGroup = view.modelBuilder.radioCardGroup().withProps({
cards: allProjectTypes.map((projectType: IProjectType) => {
return <azdataType.RadioCard>{
id: projectType.id,
@@ -112,9 +116,22 @@ export class NewProjectDialog extends DialogBase {
this.register(projectTypeRadioCardGroup.onSelectionChanged((e) => {
this.model.projectTypeId = e.cardId;
const selectedProject = allProjectTypes.find(p => p.id === e.cardId);
if (selectedProject?.targetPlatforms) {
// update the target platforms dropdown for the selected project type
targetPlatformDropdown.values = selectedProject?.targetPlatforms;
targetPlatformDropdown.value = this.getDefaultTargetPlatform(selectedProject);
this.formBuilder?.addFormItem(this.targetPlatformDropdownFormComponent!);
} else {
// remove the target version dropdown if the selected project type didn't provide values for this
this.formBuilder?.removeFormItem(this.targetPlatformDropdownFormComponent!);
this.model.targetPlatform = undefined;
}
}));
const projectNameTextBox = view.modelBuilder.inputBox().withProperties<azdataType.InputBoxProperties>({
const projectNameTextBox = view.modelBuilder.inputBox().withProps({
ariaLabel: constants.ProjectNameTitle,
placeHolder: constants.ProjectNamePlaceholder,
required: true,
@@ -126,7 +143,7 @@ export class NewProjectDialog extends DialogBase {
projectNameTextBox.updateProperty('title', projectNameTextBox.value);
}));
const locationTextBox = view.modelBuilder.inputBox().withProperties<azdataType.InputBoxProperties>({
const locationTextBox = view.modelBuilder.inputBox().withProps({
ariaLabel: constants.ProjectLocationTitle,
placeHolder: constants.ProjectLocationPlaceholder,
required: true,
@@ -138,7 +155,7 @@ export class NewProjectDialog extends DialogBase {
locationTextBox.updateProperty('title', locationTextBox.value);
}));
const browseFolderButton = view.modelBuilder.button().withProperties<azdataType.ButtonProperties>({
const browseFolderButton = view.modelBuilder.button().withProps({
ariaLabel: constants.BrowseButtonText,
iconPath: IconPathHelper.folder,
height: '16px',
@@ -159,7 +176,26 @@ export class NewProjectDialog extends DialogBase {
this.model.location = selectedFolder;
}));
const form = view.modelBuilder.formContainer().withFormItems([
const targetPlatformDropdown = view.modelBuilder.dropDown().withProps({
values: allProjectTypes[0].targetPlatforms,
value: this.getDefaultTargetPlatform(allProjectTypes[0]),
ariaLabel: constants.TargetPlatform,
required: true,
width: constants.DefaultInputWidth
}).component();
this.register(targetPlatformDropdown.onValueChanged(() => {
this.model.targetPlatform = targetPlatformDropdown.value! as string;
}));
this.targetPlatformDropdownFormComponent = {
title: constants.TargetPlatform,
required: true,
component: targetPlatformDropdown
};
this.formBuilder = view.modelBuilder.formContainer().withFormItems([
{
title: constants.TypeTitle,
required: true,
@@ -169,13 +205,34 @@ export class NewProjectDialog extends DialogBase {
title: constants.ProjectNameTitle,
required: true,
component: this.createHorizontalContainer(view, [projectNameTextBox])
}, {
},
{
title: constants.ProjectLocationTitle,
required: true,
component: this.createHorizontalContainer(view, [locationTextBox, browseFolderButton])
}
]).component();
await view.initializeModel(form);
]);
// add version dropdown if the first project type has one
if (allProjectTypes[0].targetPlatforms) {
this.formBuilder.addFormItem(this.targetPlatformDropdownFormComponent);
}
await view.initializeModel(this.formBuilder.component());
this.initDialogComplete?.resolve();
}
/**
* Gets the default target platform of the project type if there is one
* @param projectType
* @returns
*/
getDefaultTargetPlatform(projectType: IProjectType): string | undefined {
// only return the specified default target platform if it's also included in the project type's array of target platforms
if (projectType.defaultTargetPlatform && projectType.targetPlatforms?.includes(projectType.defaultTargetPlatform)) {
return projectType.defaultTargetPlatform;
} else {
return undefined;
}
}
}