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

If no 'agreements' item, do not generate 'Accept terms of use' title in wizards (#20047)

Browse Source 
* If no agreements item, then do not generate an Accept Terms of Use title. Remove sql miaa agreement.

* Added back the arc-specific change

* Added back nls

Co-authored-by: Candice Ye <canye@microsoft.com>
This commit is contained in:
Candice Ye
2022-07-15 13:45:03 -07:00
committed by GitHub
parent 9c85baa824
commit adcb7b6aa7
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
extensions/resource-deployment/src/ui/toolsAndEulaSettingsPage.ts
View File

@@ -172,20 +172,6 @@ export class ToolsAndEulaPage extends ResourceTypePage {
); );
return view.initializeModel(this.form!.withLayout({ width: '100%' }).component()).then(() => { return view.initializeModel(this.form!.withLayout({ width: '100%' }).component()).then(() => {
this._agreementContainer.clearItems(); this._agreementContainer.clearItems();
if (this._resourceType.agreements) {
const agreementTitle = this.view.modelBuilder.text().withProps({
value: localize('resourceDeployment.AgreementTitle', "Accept terms of use"),
CSSStyles: {
'font-size': '14px',
'padding': '0'
}
}).component();
this._agreementContainer.addItem(agreementTitle);
} else {
this.form.removeFormItem({
component: this._agreementContainer
});
}
this._optionsContainer.clearItems(); this._optionsContainer.clearItems();
this._optionDropDownMap.clear(); this._optionDropDownMap.clear();
@@ -243,6 +229,20 @@ export class ToolsAndEulaPage extends ResourceTypePage {
const agreementInfo = this._resourceType.getAgreementInfo(this.getSelectedOptions()); const agreementInfo = this._resourceType.getAgreementInfo(this.getSelectedOptions());
if (agreementInfo) { if (agreementInfo) {
if (this._resourceType.agreements) {
const agreementTitle = this.view.modelBuilder.text().withProps({
value: localize('resourceDeployment.AgreementTitle', "Accept terms of use"),
CSSStyles: {
'font-size': '14px',
'padding': '0'
}
}).component();
this._agreementContainer.addItem(agreementTitle);
} else {
this.form.removeFormItem({
component: this._agreementContainer
});
}
this._agreementContainer.addItem(this.createAgreementCheckbox(agreementInfo)); this._agreementContainer.addItem(this.createAgreementCheckbox(agreementInfo));
} }