ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixing the error order for Project dialog validation (#16141) (#16186)

Browse Source 
* Fixing the error order for Project dialog

* Taking PR review comments and making the change for open project also
This commit is contained in:
Udeesha Gautam
2021-07-15 13:13:30 -07:00
committed by GitHub
parent 3f51fa42fd
commit 4d86a62c24
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,9 +34,6 @@ export class NewProjectDialog extends DialogBase {
} }
async validate(): Promise<boolean> { async validate(): Promise<boolean> {
if (await this.workspaceService.validateWorkspace() === false) {
return false;
}
try { try {
// the selected location should be an existing directory // the selected location should be an existing directory
const parentDirectoryExists = await directoryExist(this.model.location); const parentDirectoryExists = await directoryExist(this.model.location);
@@ -52,6 +49,9 @@ export class NewProjectDialog extends DialogBase {
return false; return false;
} }
if (await this.workspaceService.validateWorkspace() === false) {
return false;
}
return true; return true;
} }
catch (err) { catch (err) {

8
extensions/data-workspace/src/dialogs/openExistingDialog.ts
View File

@@ -35,15 +35,15 @@ export class OpenExistingDialog extends DialogBase {
async validate(): Promise<boolean> { async validate(): Promise<boolean> {
try { try {
if (await this.workspaceService.validateWorkspace() === false) {
return false;
}
if (this.localRadioButton?.checked) { if (this.localRadioButton?.checked) {
await this.validateFile(this.filePathTextBox!.value!, constants.Project.toLowerCase()); await this.validateFile(this.filePathTextBox!.value!, constants.Project.toLowerCase());
} else { } else {
await this.validateClonePath(<string>this.localClonePathTextBox!.value); await this.validateClonePath(<string>this.localClonePathTextBox!.value);
} }
if (await this.workspaceService.validateWorkspace() === false) {
return false;
}
return true; return true;
} }
catch (err) { catch (err) {