From 0ff8786885ac302ec231bb1ab6697cc2f2254ec2 Mon Sep 17 00:00:00 2001
From: Udeesha Gautam <46980425+udeeshagautam@users.noreply.github.com>
Date: Thu, 15 Jul 2021 11:15:44 -0700
Subject: [PATCH] Fixing the error order for Project dialog validation (#16141)

* Fixing the error order for Project dialog

* Taking PR review comments and making the change for open project also
---
 extensions/data-workspace/src/dialogs/newProjectDialog.ts | 6 +++---
 .../data-workspace/src/dialogs/openExistingDialog.ts      | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/extensions/data-workspace/src/dialogs/newProjectDialog.ts b/extensions/data-workspace/src/dialogs/newProjectDialog.ts
index 68608523b3..19c86f8eb5 100644
--- a/extensions/data-workspace/src/dialogs/newProjectDialog.ts
+++ b/extensions/data-workspace/src/dialogs/newProjectDialog.ts
@@ -34,9 +34,6 @@ export class NewProjectDialog extends DialogBase {
 	}
 
 	async validate(): Promise<boolean> {
-		if (await this.workspaceService.validateWorkspace() === false) {
-			return false;
-		}
 		try {
 			// the selected location should be an existing directory
 			const parentDirectoryExists = await directoryExist(this.model.location);
@@ -52,6 +49,9 @@ export class NewProjectDialog extends DialogBase {
 				return false;
 			}
 
+			if (await this.workspaceService.validateWorkspace() === false) {
+				return false;
+			}
 			return true;
 		}
 		catch (err) {
diff --git a/extensions/data-workspace/src/dialogs/openExistingDialog.ts b/extensions/data-workspace/src/dialogs/openExistingDialog.ts
index 9c935817f6..72f35cf13c 100644
--- a/extensions/data-workspace/src/dialogs/openExistingDialog.ts
+++ b/extensions/data-workspace/src/dialogs/openExistingDialog.ts
@@ -35,15 +35,15 @@ export class OpenExistingDialog extends DialogBase {
 
 	async validate(): Promise<boolean> {
 		try {
-			if (await this.workspaceService.validateWorkspace() === false) {
-				return false;
-			}
-
 			if (this.localRadioButton?.checked) {
 				await this.validateFile(this.filePathTextBox!.value!, constants.Project.toLowerCase());
 			} else {
 				await this.validateClonePath(<string>this.localClonePathTextBox!.value);
 			}
+
+			if (await this.workspaceService.validateWorkspace() === false) {
+				return false;
+			}
 			return true;
 		}
 		catch (err) {