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

withProperties -> withProps (#15876)

Browse Source 
* withProperties -> withProps

* Fix errors

* remove ,

* fixes

* Update azdata-test

* Fix dacpac tests

* Add required and remove added layout
This commit is contained in:
Charles Gagnon
2021-06-23 14:26:14 -07:00
committed by GitHub
parent e21f56d719
commit 3a3d7f5271
73 changed files with 417 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
extensions/resource-deployment/src/ui/deployAzureSQLDBWizard/pages/azureSettingsPage.ts
View File

@@ -159,7 +159,7 @@ export class AzureSettingsPage extends BasePage {
private async createAzureAccountsDropdown(view: azdata.ModelView) {
this._azureAccountsDropdown = view.modelBuilder.dropDown().withProperties({}).component();
this._azureAccountsDropdown = view.modelBuilder.dropDown().withProps({}).component();
this._azureAccountsDropdown.onValueChanged(async (value) => {
this._model.azureAccount = this._accountsMap.get(value.selected)!;
@@ -296,7 +296,7 @@ export class AzureSettingsPage extends BasePage {
}
private async createServerDropdown(view: azdata.ModelView) {
this._serverGroupDropdown = view.modelBuilder.dropDown().withProperties({
this._serverGroupDropdown = view.modelBuilder.dropDown().withProps({
required: true,
}).component();
this._serverGroupDropdown.onValueChanged(async (value) => {
@@ -360,7 +360,7 @@ export class AzureSettingsPage extends BasePage {
//@todo alma1 9/8/2020 functions below are used for upcoming server creation feature.
// private async createResourceDropdown(view: azdata.ModelView) {
// this._resourceGroupDropdown = view.modelBuilder.dropDown().withProperties({
// this._resourceGroupDropdown = view.modelBuilder.dropDown().withProps({
// required: true
// }).component();
// this._resourceGroupDropdown.onValueChanged(async (value) => {
@@ -408,7 +408,7 @@ export class AzureSettingsPage extends BasePage {
// }
// private async createAzureRegionsDropdown(view: azdata.ModelView) {
// this._azureRegionsDropdown = view.modelBuilder.dropDown().withProperties({
// this._azureRegionsDropdown = view.modelBuilder.dropDown().withProps({
// required: true
// }).component();
@@ -446,13 +446,13 @@ export class AzureSettingsPage extends BasePage {
// private createDatabaseHardwareSettingsText(view: azdata.ModelView) {
// this._dbHardwareInfoText = view.modelBuilder.text()
// .withProperties({
// .withProps({
// value: constants.DatabaseHardwareInfoLabel
// }).component();
// }
// private async createManagedInstanceDropdown(view: azdata.ModelView) {
// this._dbManagedInstanceDropdown = view.modelBuilder.dropDown().withProperties({
// this._dbManagedInstanceDropdown = view.modelBuilder.dropDown().withProps({
// required: true,
// }).component();
// this._dbManagedInstanceDropdown.onValueChanged(async (value) => {
@@ -528,7 +528,7 @@ export class AzureSettingsPage extends BasePage {
// }
// private async createSupportedEditionsDropdown(view: azdata.ModelView) {
// this._dbSupportedEditionsDropdown = view.modelBuilder.dropDown().withProperties({
// this._dbSupportedEditionsDropdown = view.modelBuilder.dropDown().withProps({
// required: true,
// }).component();
// this._dbSupportedEditionsDropdown.onValueChanged(async (value) => {
@@ -595,7 +595,7 @@ export class AzureSettingsPage extends BasePage {
// }
// private async createSupportedFamilyDropdown(view: azdata.ModelView) {
// this._dbSupportedFamilyDropdown = view.modelBuilder.dropDown().withProperties({
// this._dbSupportedFamilyDropdown = view.modelBuilder.dropDown().withProps({
// required: true,
// }).component();
// this._dbSupportedFamilyDropdown.onValueChanged(async (value) => {
@@ -662,7 +662,7 @@ export class AzureSettingsPage extends BasePage {
// }
// private async createVCoreDropdown(view: azdata.ModelView) {
// this._dbVCoreDropdown = view.modelBuilder.dropDown().withProperties({
// this._dbVCoreDropdown = view.modelBuilder.dropDown().withProps({
// required: true,
// }).component();
// this._dbVCoreDropdown.onValueChanged(async (value) => {
@@ -733,7 +733,7 @@ export class AzureSettingsPage extends BasePage {
// }
// private createMaxMemoryText(view: azdata.ModelView) {
// this._dbMemoryTextBox = view.modelBuilder.inputBox().withProperties(<azdata.InputBoxProperties>{
// this._dbMemoryTextBox = view.modelBuilder.inputBox().withProps(<azdata.InputBoxProperties>{
// inputType: 'number',
// max: 1024,
// min: 1,

8
extensions/resource-deployment/src/ui/deployAzureSQLDBWizard/pages/databaseSettingsPage.ts
View File

@@ -108,13 +108,13 @@ export class DatabaseSettingsPage extends BasePage {
private createIpAddressText(view: azdata.ModelView) {
this._IpInfoText = view.modelBuilder.text()
.withProperties({
.withProps({
value: constants.IpAddressInfoLabel
}).component();
//Start IP Address Section:
this._startIpAddressTextbox = view.modelBuilder.inputBox().withProperties(<azdata.InputBoxProperties>{
this._startIpAddressTextbox = view.modelBuilder.inputBox().withProps(<azdata.InputBoxProperties>{
inputType: 'text'
}).component();
@@ -126,7 +126,7 @@ export class DatabaseSettingsPage extends BasePage {
//End IP Address Section:
this._endIpAddressTextbox = view.modelBuilder.inputBox().withProperties(<azdata.InputBoxProperties>{
this._endIpAddressTextbox = view.modelBuilder.inputBox().withProps(<azdata.InputBoxProperties>{
inputType: 'text'
}).component();
@@ -191,7 +191,7 @@ export class DatabaseSettingsPage extends BasePage {
}
private createCollationText(view: azdata.ModelView) {
this._collationTextbox = view.modelBuilder.inputBox().withProperties(<azdata.InputBoxProperties>{
this._collationTextbox = view.modelBuilder.inputBox().withProps(<azdata.InputBoxProperties>{
inputType: 'text',
value: 'SQL_Latin1_General_CP1_CI_AS'
}).component();

8
extensions/resource-deployment/src/ui/deployAzureSQLVMWizard/pages/azureSettingsPage.ts
View File

@@ -100,7 +100,7 @@ export class AzureSettingsPage extends BasePage {
private async createAzureAccountsDropdown(view: azdata.ModelView) {
this._azureAccountsDropdown = view.modelBuilder.dropDown().withProperties({}).component();
this._azureAccountsDropdown = view.modelBuilder.dropDown().withProps({}).component();
this._azureAccountsDropdown.onValueChanged(async (value) => {
if (!this._azureAccountsDropdown.value) {
@@ -164,7 +164,7 @@ export class AzureSettingsPage extends BasePage {
}
private async createAzureSubscriptionsDropdown(view: azdata.ModelView) {
this._azureSubscriptionsDropdown = view.modelBuilder.dropDown().withProperties({}).component();
this._azureSubscriptionsDropdown = view.modelBuilder.dropDown().withProps({}).component();
this._azureSubscriptionsDropdown.onValueChanged(async value => {
if (!this._azureSubscriptionsDropdown.value) {
@@ -234,7 +234,7 @@ export class AzureSettingsPage extends BasePage {
}
private async createResourceDropdown(view: azdata.ModelView) {
this._resourceGroupDropdown = view.modelBuilder.dropDown().withProperties({
this._resourceGroupDropdown = view.modelBuilder.dropDown().withProps({
required: true
}).component();
this._resourceGroupDropdown.onValueChanged(async (value) => {
@@ -278,7 +278,7 @@ export class AzureSettingsPage extends BasePage {
}
private async createAzureRegionsDropdown(view: azdata.ModelView) {
this._azureRegionsDropdown = view.modelBuilder.dropDown().withProperties({
this._azureRegionsDropdown = view.modelBuilder.dropDown().withProps({
required: true
}).component();

18
extensions/resource-deployment/src/ui/deployAzureSQLVMWizard/pages/networkSettingsPage.ts
View File

@@ -110,7 +110,7 @@ export class NetworkSettingsPage extends BasePage {
private async createVirtualNetworkDropdown(view: azdata.ModelView) {
this._newVirtualNetworkCheckbox = view.modelBuilder.checkBox().withProperties(<azdata.CheckBoxProperties>{
this._newVirtualNetworkCheckbox = view.modelBuilder.checkBox().withProps(<azdata.CheckBoxProperties>{
label: constants.NetworkSettingsNewVirtualNetwork,
checked: false
}).component();
@@ -119,7 +119,7 @@ export class NetworkSettingsPage extends BasePage {
this.toggleNewVirtualNetwork();
});
this._virtualNetworkDropdown = view.modelBuilder.dropDown().withProperties({
this._virtualNetworkDropdown = view.modelBuilder.dropDown().withProps({
width: constants.standardWidth,
required: true
}).component();
@@ -132,7 +132,7 @@ export class NetworkSettingsPage extends BasePage {
this.populateSubnetDropdown();
});
this._newVirtualNetworkText = view.modelBuilder.inputBox().withProperties(<azdata.InputBoxProperties>{
this._newVirtualNetworkText = view.modelBuilder.inputBox().withProps(<azdata.InputBoxProperties>{
width: constants.standardWidth,
required: true,
placeHolder: localize('deployAzureSQLVM.NewVnetPlaceholder', "Enter name for new virtual network")
@@ -222,7 +222,7 @@ export class NetworkSettingsPage extends BasePage {
});
this._subnetDropdown = view.modelBuilder.dropDown().withProperties(<azdata.DropDownProperties>{
this._subnetDropdown = view.modelBuilder.dropDown().withProps(<azdata.DropDownProperties>{
width: constants.standardWidth,
required: true
}).component();
@@ -234,7 +234,7 @@ export class NetworkSettingsPage extends BasePage {
this._model.subnetName = (this._subnetDropdown.value as azdata.CategoryValue).name;
});
this._newsubnetText = view.modelBuilder.inputBox().withProperties(<azdata.InputBoxProperties>{
this._newsubnetText = view.modelBuilder.inputBox().withProps(<azdata.InputBoxProperties>{
width: constants.standardWidth,
required: true,
placeHolder: localize('deployAzureSQLVM.NewSubnetPlaceholder', "Enter name for new subnet")
@@ -299,7 +299,7 @@ export class NetworkSettingsPage extends BasePage {
private async createPublicIPDropdown(view: azdata.ModelView) {
this._newPublicIpCheckbox = view.modelBuilder.checkBox().withProperties(<azdata.CheckBoxProperties>{
this._newPublicIpCheckbox = view.modelBuilder.checkBox().withProps(<azdata.CheckBoxProperties>{
label: constants.NetworkSettingsNewPublicIp,
checked: false
}).component();
@@ -308,7 +308,7 @@ export class NetworkSettingsPage extends BasePage {
this.toggleNewPublicIp();
});
this._publicIpDropdown = view.modelBuilder.dropDown().withProperties({
this._publicIpDropdown = view.modelBuilder.dropDown().withProps({
required: true,
width: constants.standardWidth,
}).component();
@@ -320,7 +320,7 @@ export class NetworkSettingsPage extends BasePage {
this._model.publicIpName = (this._publicIpDropdown.value as azdata.CategoryValue).name;
});
this._publicIpNetworkText = view.modelBuilder.inputBox().withProperties(<azdata.InputBoxProperties>{
this._publicIpNetworkText = view.modelBuilder.inputBox().withProps(<azdata.InputBoxProperties>{
placeHolder: localize('deployAzureSQLVM.NewPipPlaceholder', "Enter name for new public IP"),
width: constants.standardWidth
}).component();
@@ -385,7 +385,7 @@ export class NetworkSettingsPage extends BasePage {
}
private async createVmRDPAllowCheckbox(view: azdata.ModelView) {
this._vmRDPAllowCheckbox = view.modelBuilder.checkBox().withProperties({
this._vmRDPAllowCheckbox = view.modelBuilder.checkBox().withProps({
label: constants.RDPAllowCheckboxLabel,
}).component();
this._vmRDPAllowCheckbox.onChanged((value) => {

10
extensions/resource-deployment/src/ui/deployAzureSQLVMWizard/pages/sqlServerSettingsPage.ts
View File

@@ -109,7 +109,7 @@ export class SqlServerSettingsPage extends BasePage {
private createSqlConnectivityDropdown(view: azdata.ModelView) {
const privateOptionDisplayName = localize('deployAzureSQLVM.PrivateConnectivityDropdownOptionDefault', "Private (within Virtual Network)");
this._sqlConnectivityDropdown = view.modelBuilder.dropDown().withProperties(<azdata.DropDownProperties>
this._sqlConnectivityDropdown = view.modelBuilder.dropDown().withProps(<azdata.DropDownProperties>
{
values: [
{
@@ -148,7 +148,7 @@ export class SqlServerSettingsPage extends BasePage {
}
private createPortText(view: azdata.ModelView) {
this._portTextBox = view.modelBuilder.inputBox().withProperties(<azdata.InputBoxProperties>{
this._portTextBox = view.modelBuilder.inputBox().withProps(<azdata.InputBoxProperties>{
inputType: 'number',
max: 65535,
min: 1024,
@@ -165,7 +165,7 @@ export class SqlServerSettingsPage extends BasePage {
private createSqlAuthentication(view: azdata.ModelView) {
this._sqlAuthenticationDropdown = view.modelBuilder.dropDown().withProperties(<azdata.DropDownComponent>{
this._sqlAuthenticationDropdown = view.modelBuilder.dropDown().withProps(<azdata.DropDownComponent>{
values: [
{
displayName: localizedConstants.yes,
@@ -194,13 +194,13 @@ export class SqlServerSettingsPage extends BasePage {
this._sqlAuthenticationTextRow = this._model.createFormRowComponent(view, constants.SqlAuthenticationUsernameLabel, '', this._sqlAuthenticationTextbox, true);
this._sqlAuthenticationPasswordTextbox = view.modelBuilder.inputBox().withProperties(<azdata.InputBoxProperties>{
this._sqlAuthenticationPasswordTextbox = view.modelBuilder.inputBox().withProps(<azdata.InputBoxProperties>{
inputType: 'password'
}).component();
this._sqlAuthenticationPasswordTextRow = this._model.createFormRowComponent(view, constants.SqlAuthenticationPasswordLabel, '', this._sqlAuthenticationPasswordTextbox, true);
this._sqlAuthenticationPasswordConfirmationTextbox = view.modelBuilder.inputBox().withProperties(<azdata.InputBoxProperties>{
this._sqlAuthenticationPasswordConfirmationTextbox = view.modelBuilder.inputBox().withProps(<azdata.InputBoxProperties>{
inputType: 'password'
}).component();

18
extensions/resource-deployment/src/ui/deployAzureSQLVMWizard/pages/vmSettingsPage.ts
View File

@@ -140,7 +140,7 @@ export class VmSettingsPage extends BasePage {
private async createVmNameTextBox(view: azdata.ModelView) {
this._vmNameTextBox = view.modelBuilder.inputBox().withProperties({
this._vmNameTextBox = view.modelBuilder.inputBox().withProps({
}).component();
this._vmNameTextBox.onTextChanged((value) => {
@@ -150,7 +150,7 @@ export class VmSettingsPage extends BasePage {
}
private async createAdminUsernameTextBox(view: azdata.ModelView) {
this._adminUsernameTextBox = view.modelBuilder.inputBox().withProperties({
this._adminUsernameTextBox = view.modelBuilder.inputBox().withProps({
}).component();
this._adminUsernameTextBox.onTextChanged((value) => {
@@ -160,7 +160,7 @@ export class VmSettingsPage extends BasePage {
}
private async createAdminPasswordTextBox(view: azdata.ModelView) {
this._adminPasswordTextBox = view.modelBuilder.inputBox().withProperties({
this._adminPasswordTextBox = view.modelBuilder.inputBox().withProps({
inputType: 'password',
}).component();
@@ -171,7 +171,7 @@ export class VmSettingsPage extends BasePage {
}
private async createAdminPasswordConfirmTextBox(view: azdata.ModelView) {
this._adminComfirmPasswordTextBox = view.modelBuilder.inputBox().withProperties({
this._adminComfirmPasswordTextBox = view.modelBuilder.inputBox().withProps({
inputType: 'password',
}).component();
@@ -181,7 +181,7 @@ export class VmSettingsPage extends BasePage {
}
private async createVmImageDropdown(view: azdata.ModelView) {
this._vmImageDropdown = view.modelBuilder.dropDown().withProperties({
this._vmImageDropdown = view.modelBuilder.dropDown().withProps({
}).component();
this._vmImageDropdown.onValueChanged(value => {
@@ -236,7 +236,7 @@ export class VmSettingsPage extends BasePage {
}
private async createVMImageSkuDropdown(view: azdata.ModelView) {
this._vmImageSkuDropdown = view.modelBuilder.dropDown().withProperties({
this._vmImageSkuDropdown = view.modelBuilder.dropDown().withProps({
}).component();
this._vmImageSkuDropdown.onValueChanged(value => {
@@ -277,7 +277,7 @@ export class VmSettingsPage extends BasePage {
}
private async createVMImageVersionDropdown(view: azdata.ModelView) {
this._vmImageVersionDropdown = view.modelBuilder.dropDown().withProperties({
this._vmImageVersionDropdown = view.modelBuilder.dropDown().withProps({
}).component();
this._vmImageVersionDropdown.onValueChanged(value => {
@@ -317,7 +317,7 @@ export class VmSettingsPage extends BasePage {
private async createVmSizeDropdown(view: azdata.ModelView) {
this._vmSizeDropdown = view.modelBuilder.dropDown().withProperties({
this._vmSizeDropdown = view.modelBuilder.dropDown().withProps({
editable: true
}).component();
@@ -325,7 +325,7 @@ export class VmSettingsPage extends BasePage {
this._model.vmSize = (this._vmSizeDropdown.value as azdata.CategoryValue).name;
});
this._vmSizeLearnMoreLink = view.modelBuilder.hyperlink().withProperties(<azdata.HyperlinkComponent>{
this._vmSizeLearnMoreLink = view.modelBuilder.hyperlink().withProps(<azdata.HyperlinkComponent>{
label: constants.VmSizeLearnMoreLabel,
url: 'https://go.microsoft.com/fwlink/?linkid=2143101'

10
extensions/resource-deployment/src/ui/deployClusterWizard/pages/targetClusterPage.ts
View File

@@ -83,17 +83,17 @@ export class TargetClusterContextPage extends ResourceTypePage {
private initExistingClusterControl(): void {
let self = this;
const labelWidth = '150px';
let configFileLabel = this.view!.modelBuilder.text().withProperties({ value: localize('deployCluster.kubeConfigFileLabelText', "Kube config file path") }).component();
let configFileLabel = this.view!.modelBuilder.text().withProps({ value: localize('deployCluster.kubeConfigFileLabelText', "Kube config file path") }).component();
configFileLabel.width = labelWidth;
this.configFileInput = this.view!.modelBuilder.inputBox().withProperties({ width: '300px' }).component();
this.configFileInput = this.view!.modelBuilder.inputBox().withProps({ width: '300px' }).component();
this.configFileInput.enabled = false;
this.browseFileButton = this.view!.modelBuilder.button().withProperties({ label: localize('deployCluster.browseText', "Browse"), width: '100px', secondary: true }).component();
this.browseFileButton = this.view!.modelBuilder.button().withProps({ label: localize('deployCluster.browseText', "Browse"), width: '100px', secondary: true }).component();
let configFileContainer = this.view!.modelBuilder.flexContainer()
.withLayout({ flexFlow: 'row', alignItems: 'baseline' })
.withItems([configFileLabel, this.configFileInput, this.browseFileButton], { CSSStyles: { 'margin-right': '10px' } }).component();
this.clusterContextsLabel = this.view!.modelBuilder.text().withProperties({ value: localize('deployCluster.clusterContextsLabelText', "Cluster Contexts") }).component();
this.clusterContextsLabel = this.view!.modelBuilder.text().withProps({ value: localize('deployCluster.clusterContextsLabelText', "Cluster Contexts") }).component();
this.clusterContextsLabel.width = labelWidth;
this.errorLoadingClustersLabel = this.view!.modelBuilder.text().withProperties({ value: localize('deployCluster.errorLoadingClustersText', "No cluster information is found in the config file or an error ocurred while loading the config file") }).component();
this.errorLoadingClustersLabel = this.view!.modelBuilder.text().withProps({ value: localize('deployCluster.errorLoadingClustersText', "No cluster information is found in the config file or an error ocurred while loading the config file") }).component();
this.clusterContextList = this.view!.modelBuilder.divContainer().component();
this.clusterContextLoadingComponent = this.view!.modelBuilder.loadingComponent().withItem(this.clusterContextList).component();
this.existingClusterControl = this.view!.modelBuilder.divContainer().withProperties<azdata.DivContainerProperties>({ clickable: false }).component();

6
extensions/resource-deployment/src/ui/radioGroupLoadingComponentBuilder.ts
View File

@@ -22,11 +22,11 @@ export class RadioGroupLoadingComponentBuilder implements azdata.ComponentBuilde
}
withProperties<U>(properties: U): azdata.ComponentBuilder<azdata.LoadingComponent, azdata.LoadingComponentProperties> {
return this._optionsLoadingBuilder.withProperties(properties);
return this._optionsLoadingBuilder.withProps(properties);
}
withProps(properties: azdata.LoadingComponentProperties): azdata.ComponentBuilder<azdata.LoadingComponent, azdata.LoadingComponentProperties> {
return this._optionsLoadingBuilder.withProperties(properties);
return this._optionsLoadingBuilder.withProps(properties);
}
withValidation(validation: (component: azdata.LoadingComponent) => boolean): azdata.ComponentBuilder<azdata.LoadingComponent, azdata.LoadingComponentProperties> {
@@ -68,7 +68,7 @@ export class RadioGroupLoadingComponentBuilder implements azdata.ComponentBuilde
});
}
catch (e) {
const errorLoadingRadioOptionsLabel = this._view!.modelBuilder.text().withProperties({ value: getErrorMessage(e), CSSStyles: { 'color': 'Red' } }).component();
const errorLoadingRadioOptionsLabel = this._view!.modelBuilder.text().withProps({ value: getErrorMessage(e), CSSStyles: { 'color': 'Red' } }).component();
this._optionsDivContainer.addItem(errorLoadingRadioOptionsLabel);
}
this.component().loading = false;

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

@@ -75,7 +75,7 @@ export class ResourceTypePickerDialog extends DialogBase {
this._resourceTagsListView = this.createTagsListView();
resourceComponents.push(this._resourceTagsListView);
}
this._resourceSearchBox = view.modelBuilder.inputBox().withProperties({
this._resourceSearchBox = view.modelBuilder.inputBox().withProps({
placeHolder: loc.resourceTypeSearchBoxDescription,
ariaLabel: loc.resourceTypeSearchBoxDescription
}).component();