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

fix issue 7489 and disposable handling (#7491)

Browse Source
This commit is contained in:
Alan Ren
2019-10-03 12:20:54 -07:00
committed by GitHub
parent cf1a09aeaf
commit d2e4e94aec
5 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/resource-deployment/package.nls.json
View File

@@ -3,7 +3,7 @@
"extension-description": "Provides a notebook-based experience to deploy Microsoft SQL Server", "extension-description": "Provides a notebook-based experience to deploy Microsoft SQL Server",
"deploy-sql-image-command-name": "Deploy SQL Server on Docker…", "deploy-sql-image-command-name": "Deploy SQL Server on Docker…",
"deploy-sql-bdc-command-name": "Deploy SQL Server Big Data Cluster…", "deploy-sql-bdc-command-name": "Deploy SQL Server Big Data Cluster…",
"deploy-resource-command-name": "Open SQL Server deployment dialog", "deploy-resource-command-name": "More deployment options…",
"deploy-resource-command-category": "Deployment", "deploy-resource-command-category": "Deployment",
"resource-type-sql-image-display-name": "SQL Server container image", "resource-type-sql-image-display-name": "SQL Server container image",
"resource-type-sql-image-description": "Run SQL Server container image with Docker", "resource-type-sql-image-description": "Run SQL Server container image with Docker",

6
extensions/resource-deployment/src/main.ts
View File

@@ -44,8 +44,12 @@ export function activate(context: vscode.ExtensionContext) {
vscode.commands.registerCommand('azdata.resource.sql-bdc.deploy', () => { vscode.commands.registerCommand('azdata.resource.sql-bdc.deploy', () => {
openDialog('sql-bdc'); openDialog('sql-bdc');
}); });
vscode.commands.registerCommand('azdata.resource.deploy', (resourceType: string = 'sql-image') => { vscode.commands.registerCommand('azdata.resource.deploy', (resourceType: string) => {
if (typeof resourceType === 'string') {
openDialog(resourceType); openDialog(resourceType);
} else {
openDialog('sql-image');
}
}); });
vscode.commands.registerCommand('azdata.openNotebookInputDialog', (dialogInfo: NotebookBasedDialogInfo) => { vscode.commands.registerCommand('azdata.openNotebookInputDialog', (dialogInfo: NotebookBasedDialogInfo) => {
const dialog = new DeploymentInputDialog(notebookService, dialogInfo); const dialog = new DeploymentInputDialog(notebookService, dialogInfo);

4
extensions/resource-deployment/src/ui/deploymentInputDialog.ts
View File

@@ -23,7 +23,6 @@ export class DeploymentInputDialog extends DialogBase {
private dialogInfo: DialogInfo) { private dialogInfo: DialogInfo) {
super(dialogInfo.title, dialogInfo.name, false); super(dialogInfo.title, dialogInfo.name, false);
this._dialogObject.okButton.label = localize('deploymentDialog.OKButtonText', 'Open Notebook'); this._dialogObject.okButton.label = localize('deploymentDialog.OKButtonText', 'Open Notebook');
this._dialogObject.okButton.onClick(() => this.onComplete());
} }
protected initialize() { protected initialize() {
@@ -59,7 +58,7 @@ export class DeploymentInputDialog extends DialogBase {
}); });
} }
private onComplete(): void { protected onComplete(): void {
const model: Model = new Model(); const model: Model = new Model();
setModelValues(this.inputComponents, model); setModelValues(this.inputComponents, model);
if (instanceOfNotebookBasedDialogInfo(this.dialogInfo)) { if (instanceOfNotebookBasedDialogInfo(this.dialogInfo)) {
@@ -70,6 +69,5 @@ export class DeploymentInputDialog extends DialogBase {
} else { } else {
vscode.commands.executeCommand(this.dialogInfo.command, model); vscode.commands.executeCommand(this.dialogInfo.command, model);
} }
this.dispose();
} }
} }

12
extensions/resource-deployment/src/ui/dialogBase.ts
View File

@@ -12,7 +12,8 @@ export abstract class DialogBase {
constructor(dialogTitle: string, dialogName: string, isWide: boolean = false) { constructor(dialogTitle: string, dialogName: string, isWide: boolean = false) {
this._dialogObject = azdata.window.createModelViewDialog(dialogTitle, dialogName, isWide); this._dialogObject = azdata.window.createModelViewDialog(dialogTitle, dialogName, isWide);
this._dialogObject.cancelButton.onClick(() => this.onCancel()); this._toDispose.push(this._dialogObject.cancelButton.onClick(() => this.onCancelButtonClicked()));
this._toDispose.push(this._dialogObject.okButton.onClick(() => this.onOkButtonClicked()));
} }
protected abstract initialize(): void; protected abstract initialize(): void;
@@ -22,10 +23,17 @@ export abstract class DialogBase {
azdata.window.openDialog(this._dialogObject); azdata.window.openDialog(this._dialogObject);
} }
protected onCancel(): void { private onCancelButtonClicked(): void {
this.dispose(); this.dispose();
} }
private onOkButtonClicked(): void {
this.onComplete();
this.dispose();
}
protected onComplete(): void { }
protected dispose(): void { protected dispose(): void {
this._toDispose.forEach(disposable => disposable.dispose()); this._toDispose.forEach(disposable => disposable.dispose());
} }

4
extensions/resource-deployment/src/ui/resourceTypePickerDialog.ts
View File

@@ -35,7 +35,6 @@ export class ResourceTypePickerDialog extends DialogBase {
super(localize('resourceTypePickerDialog.title', "Select the deployment options"), 'ResourceTypePickerDialog', true); super(localize('resourceTypePickerDialog.title', "Select the deployment options"), 'ResourceTypePickerDialog', true);
this._selectedResourceType = resourceType; this._selectedResourceType = resourceType;
this._dialogObject.okButton.label = localize('deploymentDialog.OKButtonText', 'Select'); this._dialogObject.okButton.label = localize('deploymentDialog.OKButtonText', 'Select');
this._dialogObject.okButton.onClick(() => this.onComplete());
} }
initialize() { initialize() {
@@ -259,8 +258,7 @@ export class ResourceTypePickerDialog extends DialogBase {
return this._selectedResourceType.getProvider(options)!; return this._selectedResourceType.getProvider(options)!;
} }
private onComplete(): void { protected onComplete(): void {
this.resourceTypeService.startDeployment(this.getCurrentProvider()); this.resourceTypeService.startDeployment(this.getCurrentProvider());
this.dispose();
} }
} }