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

fixes #7383 and #7380 (#7384)

Browse Source
This commit is contained in:
Alan Ren
2019-09-26 12:35:44 -07:00
committed by GitHub
parent b4de26a801
commit 3688e9981d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,6 +189,9 @@ export class ResourceTypePickerDialog extends DialogBase {
const toolRequirements = this.getCurrentProvider().requiredTools; const toolRequirements = this.getCurrentProvider().requiredTools;
const headerRowHeight = 28; const headerRowHeight = 28;
this._toolsTable.height = 25 * Math.max(toolRequirements.length, 1) + headerRowHeight; this._toolsTable.height = 25 * Math.max(toolRequirements.length, 1) + headerRowHeight;
this._dialogObject.message = {
text: ''
};
if (toolRequirements.length === 0) { if (toolRequirements.length === 0) {
this._dialogObject.okButton.enabled = true; this._dialogObject.okButton.enabled = true;
this._toolsTable.data = [[localize('deploymentDialog.NoRequiredTool', "No tools required"), '']]; this._toolsTable.data = [[localize('deploymentDialog.NoRequiredTool', "No tools required"), '']];
@@ -198,9 +201,6 @@ export class ResourceTypePickerDialog extends DialogBase {
}); });
this._toolsLoadingComponent.loading = true; this._toolsLoadingComponent.loading = true;
this._dialogObject.okButton.enabled = false; this._dialogObject.okButton.enabled = false;
this._dialogObject.message = {
text: ''
};
Promise.all(tools.map(tool => tool.loadInformation())).then(() => { Promise.all(tools.map(tool => tool.loadInformation())).then(() => {
// If the local timestamp does not match the class level timestamp, it means user has changed options, ignore the results // If the local timestamp does not match the class level timestamp, it means user has changed options, ignore the results
@@ -240,7 +240,8 @@ export class ResourceTypePickerDialog extends DialogBase {
})); }));
const text = this._view.modelBuilder.text().withProperties<azdata.TextComponentProperties>({ const text = this._view.modelBuilder.text().withProperties<azdata.TextComponentProperties>({
value: agreementInfo.template, value: agreementInfo.template,
links: agreementInfo.links links: agreementInfo.links,
requiredIndicator: true
}).component(); }).component();
return createFlexContainer(this._view, [checkbox, text]); return createFlexContainer(this._view, [checkbox, text]);
} }