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

fix editing workspace inputbox not working (#13858)

Browse Source
This commit is contained in:
Kim Santiago
2020-12-21 11:29:22 -08:00
committed by GitHub
parent 57446faa1e
commit bc1fc8527c
2 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,8 +13,6 @@ import { fileExist } from '../common/utils';
import { IconPathHelper } from '../common/iconHelper'; import { IconPathHelper } from '../common/iconHelper';
export class OpenExistingDialog extends DialogBase { export class OpenExistingDialog extends DialogBase {
public _projectFile: string = '';
public _workspaceFile: string = '';
public _targetTypeRadioCardGroup: azdata.RadioCardGroupComponent | undefined; public _targetTypeRadioCardGroup: azdata.RadioCardGroupComponent | undefined;
public _filePathTextBox: azdata.InputBoxComponent | undefined; public _filePathTextBox: azdata.InputBoxComponent | undefined;
public formBuilder: azdata.FormBuilder | undefined; public formBuilder: azdata.FormBuilder | undefined;
@@ -37,13 +35,13 @@ export class OpenExistingDialog extends DialogBase {
try { try {
// the selected location should be an existing directory // the selected location should be an existing directory
if (this._targetTypeRadioCardGroup?.selectedCardId === constants.Project) { if (this._targetTypeRadioCardGroup?.selectedCardId === constants.Project) {
await this.validateFile(this._projectFile, constants.Project.toLowerCase()); await this.validateFile(this._filePathTextBox!.value!, constants.Project.toLowerCase());
if (this.workspaceInputBox!.enabled) { if (this.workspaceInputBox!.enabled) {
await this.validateNewWorkspace(false); await this.validateNewWorkspace(false);
} }
} else if (this._targetTypeRadioCardGroup?.selectedCardId === constants.Workspace) { } else if (this._targetTypeRadioCardGroup?.selectedCardId === constants.Workspace) {
await this.validateFile(this._workspaceFile, constants.Workspace.toLowerCase()); await this.validateFile(this._filePathTextBox!.value!, constants.Workspace.toLowerCase());
} }
return true; return true;
@@ -64,11 +62,11 @@ export class OpenExistingDialog extends DialogBase {
async onComplete(): Promise<void> { async onComplete(): Promise<void> {
try { try {
if (this._targetTypeRadioCardGroup?.selectedCardId === constants.Workspace) { if (this._targetTypeRadioCardGroup?.selectedCardId === constants.Workspace) {
await this.workspaceService.enterWorkspace(vscode.Uri.file(this._workspaceFile)); await this.workspaceService.enterWorkspace(vscode.Uri.file(this._filePathTextBox!.value!));
} else { } else {
const validateWorkspace = await this.workspaceService.validateWorkspace(); const validateWorkspace = await this.workspaceService.validateWorkspace();
if (validateWorkspace) { if (validateWorkspace) {
await this.workspaceService.addProjectsToWorkspace([vscode.Uri.file(this._projectFile)], vscode.Uri.file(this.workspaceInputBox!.value!)); await this.workspaceService.addProjectsToWorkspace([vscode.Uri.file(this._filePathTextBox!.value!)], vscode.Uri.file(this.workspaceInputBox!.value!));
} }
} }
} }
@@ -111,9 +109,8 @@ export class OpenExistingDialog extends DialogBase {
width: constants.DefaultInputWidth width: constants.DefaultInputWidth
}).component(); }).component();
this.register(this._filePathTextBox.onTextChanged(() => { this.register(this._filePathTextBox.onTextChanged(() => {
this._projectFile = this._filePathTextBox!.value!; this._filePathTextBox!.updateProperty('title', this._filePathTextBox!.value!);
this._filePathTextBox!.updateProperty('title', this._projectFile); this.updateWorkspaceInputbox(path.dirname(this._filePathTextBox!.value!), path.basename(this._filePathTextBox!.value!, path.extname(this._filePathTextBox!.value!)));
this.updateWorkspaceInputbox(path.dirname(this._projectFile), path.basename(this._projectFile, path.extname(this._projectFile)));
})); }));
const browseFolderButton = view.modelBuilder.button().withProperties<azdata.ButtonProperties>({ const browseFolderButton = view.modelBuilder.button().withProperties<azdata.ButtonProperties>({
@@ -180,7 +177,6 @@ export class OpenExistingDialog extends DialogBase {
const workspaceFilePath = fileUris[0].fsPath; const workspaceFilePath = fileUris[0].fsPath;
this._filePathTextBox!.value = workspaceFilePath; this._filePathTextBox!.value = workspaceFilePath;
this._workspaceFile = workspaceFilePath;
} }
public async projectBrowse(): Promise<void> { public async projectBrowse(): Promise<void> {
@@ -205,6 +201,5 @@ export class OpenExistingDialog extends DialogBase {
const projectFilePath = fileUris[0].fsPath; const projectFilePath = fileUris[0].fsPath;
this._filePathTextBox!.value = projectFilePath; this._filePathTextBox!.value = projectFilePath;
this._projectFile = projectFilePath;
} }
} }

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

@@ -26,13 +26,13 @@ suite('Open Existing Dialog', function (): void {
await dialog.open(); await dialog.open();
dialog._targetTypeRadioCardGroup?.updateProperty( 'selectedCardId', constants.Project); dialog._targetTypeRadioCardGroup?.updateProperty( 'selectedCardId', constants.Project);
dialog._projectFile = ''; dialog._filePathTextBox!.value = '';
dialog.workspaceInputBox!.value = 'test.code-workspace'; dialog.workspaceInputBox!.value = 'test.code-workspace';
should.equal(await dialog.validate(), false, 'Validation fail because project file does not exist'); should.equal(await dialog.validate(), false, 'Validation fail because project file does not exist');
// create a project file // create a project file
dialog._projectFile = await createProjectFile('testproj'); dialog._filePathTextBox!.value = await createProjectFile('testproj');
should.equal(await dialog.validate(), true, 'Validation pass because project file exists'); should.equal(await dialog.validate(), true, 'Validation pass because project file exists');
}); });
@@ -42,12 +42,12 @@ suite('Open Existing Dialog', function (): void {
await dialog.open(); await dialog.open();
dialog._targetTypeRadioCardGroup?.updateProperty( 'selectedCardId', constants.Workspace); dialog._targetTypeRadioCardGroup?.updateProperty( 'selectedCardId', constants.Workspace);
dialog._workspaceFile = ''; dialog._filePathTextBox!.value = '';
should.equal(await dialog.validate(), false, 'Validation fail because workspace file does not exist'); should.equal(await dialog.validate(), false, 'Validation fail because workspace file does not exist');
// create a workspace file // create a workspace file
dialog._workspaceFile = generateUniqueWorkspaceFilePath(); dialog._filePathTextBox!.value = generateUniqueWorkspaceFilePath();
await fs.writeFile(dialog._workspaceFile, ''); await fs.writeFile(dialog._filePathTextBox!.value , '');
should.equal(await dialog.validate(), true, 'Validation pass because workspace file exists'); should.equal(await dialog.validate(), true, 'Validation pass because workspace file exists');
}); });
@@ -60,7 +60,7 @@ suite('Open Existing Dialog', function (): void {
const dialog = new OpenExistingDialog(workspaceServiceMock.object, mockExtensionContext.object); const dialog = new OpenExistingDialog(workspaceServiceMock.object, mockExtensionContext.object);
await dialog.open(); await dialog.open();
dialog._projectFile = generateUniqueProjectFilePath('testproj'); dialog._filePathTextBox!.value = generateUniqueProjectFilePath('testproj');
should.doesNotThrow(async () => await dialog.onComplete()); should.doesNotThrow(async () => await dialog.onComplete());
workspaceServiceMock.setup(x => x.validateWorkspace()).throws(new Error('test error')); workspaceServiceMock.setup(x => x.validateWorkspace()).throws(new Error('test error'));
@@ -75,15 +75,15 @@ suite('Open Existing Dialog', function (): void {
const dialog = new OpenExistingDialog(workspaceServiceMock.object, mockExtensionContext.object); const dialog = new OpenExistingDialog(workspaceServiceMock.object, mockExtensionContext.object);
await dialog.open(); await dialog.open();
should.equal(dialog._workspaceFile, ''); should.equal(dialog._filePathTextBox!.value, '');
await dialog.workspaceBrowse(); await dialog.workspaceBrowse();
should.equal(dialog._workspaceFile, '', 'Workspace file should not be set when no file is selected'); should.equal(dialog._filePathTextBox!.value, '', 'Workspace file should not be set when no file is selected');
sinon.restore(); sinon.restore();
const workspaceFile = vscode.Uri.file(generateUniqueWorkspaceFilePath()); const workspaceFile = vscode.Uri.file(generateUniqueWorkspaceFilePath());
sinon.stub(vscode.window, 'showOpenDialog').returns(Promise.resolve([workspaceFile])); sinon.stub(vscode.window, 'showOpenDialog').returns(Promise.resolve([workspaceFile]));
await dialog.workspaceBrowse(); await dialog.workspaceBrowse();
should.equal(dialog._workspaceFile, workspaceFile.fsPath, 'Workspace file should get set'); should.equal(dialog._filePathTextBox!.value, workspaceFile.fsPath, 'Workspace file should get set');
should.equal(dialog._filePathTextBox?.value, workspaceFile.fsPath); should.equal(dialog._filePathTextBox?.value, workspaceFile.fsPath);
}); });
@@ -94,15 +94,15 @@ suite('Open Existing Dialog', function (): void {
const dialog = new OpenExistingDialog(workspaceServiceMock.object, mockExtensionContext.object); const dialog = new OpenExistingDialog(workspaceServiceMock.object, mockExtensionContext.object);
await dialog.open(); await dialog.open();
should.equal(dialog._projectFile, ''); should.equal(dialog._filePathTextBox!.value, '');
await dialog.projectBrowse(); await dialog.projectBrowse();
should.equal(dialog._projectFile, '', 'Project file should not be set when no file is selected'); should.equal(dialog._filePathTextBox!.value, '', 'Project file should not be set when no file is selected');
sinon.restore(); sinon.restore();
const projectFile = vscode.Uri.file(generateUniqueProjectFilePath('testproj')); const projectFile = vscode.Uri.file(generateUniqueProjectFilePath('testproj'));
sinon.stub(vscode.window, 'showOpenDialog').returns(Promise.resolve([projectFile])); sinon.stub(vscode.window, 'showOpenDialog').returns(Promise.resolve([projectFile]));
await dialog.projectBrowse(); await dialog.projectBrowse();
should.equal(dialog._projectFile, projectFile.fsPath, 'Project file should be set'); should.equal(dialog._filePathTextBox!.value, projectFile.fsPath, 'Project file should be set');
should.equal(dialog._filePathTextBox?.value, projectFile.fsPath); should.equal(dialog._filePathTextBox?.value, projectFile.fsPath);
}); });
}); });