ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

update new workspace validation to throw errors to make code more reusable (#13856)

Browse Source
This commit is contained in:
Kim Santiago
2020-12-18 13:32:42 -08:00
committed by GitHub
parent 0b8b6064ed
commit c7303803ba
4 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,17 +37,13 @@ export class OpenExistingDialog extends DialogBase {
try {
// the selected location should be an existing directory
if (this._targetTypeRadioCardGroup?.selectedCardId === constants.Project) {
if (!await this.validateFile(this._projectFile, constants.Project.toLowerCase())) {
return false;
}
await this.validateFile(this._projectFile, constants.Project.toLowerCase());
if (this.workspaceInputBox!.enabled && !await this.validateNewWorkspace(false)) {
return false;
if (this.workspaceInputBox!.enabled) {
await this.validateNewWorkspace(false);
}
} else if (this._targetTypeRadioCardGroup?.selectedCardId === constants.Workspace) {
if (!await this.validateFile(this._workspaceFile, constants.Workspace.toLowerCase())) {
return false;
}
await this.validateFile(this._workspaceFile, constants.Workspace.toLowerCase());
}
return true;
@@ -58,14 +54,11 @@ export class OpenExistingDialog extends DialogBase {
}
}
public async validateFile(file: string, fileType: string) {
public async validateFile(file: string, fileType: string): Promise<void> {
const fileExists = await fileExist(file);
if (!fileExists) {
this.showErrorMessage(constants.FileNotExistError(fileType, file));
return false;
throw new Error(constants.FileNotExistError(fileType, file));
}
return true;
}
async onComplete(): Promise<void> {