ckaczor/azuredatastudio
Archived
1
0
Fork 0
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
extensions/agent/src/dialogs/alertDialog.ts
+19 -19
View File
@@ -200,28 +200,28 @@ export class AlertDialog extends AgentDialog<AlertData> {
} }
}); });
this.enabledCheckBox = view.modelBuilder.checkBox() this.enabledCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: AlertDialog.EnabledCheckboxLabel label: AlertDialog.EnabledCheckboxLabel
}).component(); }).component();
this.enabledCheckBox.checked = true; this.enabledCheckBox.checked = true;
this.databaseDropDown = view.modelBuilder.dropDown() this.databaseDropDown = view.modelBuilder.dropDown()
.withProperties({ .withProps({
value: databases[0], value: databases[0],
values: databases, values: databases,
width: '100%' width: '100%'
}).component(); }).component();
this.typeDropDown = view.modelBuilder.dropDown() this.typeDropDown = view.modelBuilder.dropDown()
.withProperties({ .withProps({
value: '', value: '',
values: AlertDialog.AlertTypes, values: AlertDialog.AlertTypes,
width: '100%' width: '100%'
}).component(); }).component();
this.severityRadioButton = view.modelBuilder.radioButton() this.severityRadioButton = view.modelBuilder.radioButton()
.withProperties({ .withProps({
value: 'serverity', value: 'serverity',
name: 'alertTypeOptions', name: 'alertTypeOptions',
label: AlertDialog.SeverityLabel, label: AlertDialog.SeverityLabel,
@@ -230,21 +230,21 @@ export class AlertDialog extends AgentDialog<AlertData> {
this.severityRadioButton.checked = true; this.severityRadioButton.checked = true;
this.severityDropDown = view.modelBuilder.dropDown() this.severityDropDown = view.modelBuilder.dropDown()
.withProperties({ .withProps({
value: AlertDialog.AlertSeverities[0], value: AlertDialog.AlertSeverities[0],
values: AlertDialog.AlertSeverities, values: AlertDialog.AlertSeverities,
width: '100%' width: '100%'
}).component(); }).component();
this.errorNumberRadioButton = view.modelBuilder.radioButton() this.errorNumberRadioButton = view.modelBuilder.radioButton()
.withProperties({ .withProps({
value: 'errorNumber', value: 'errorNumber',
name: 'alertTypeOptions', name: 'alertTypeOptions',
label: AlertDialog.ErrorNumberLabel label: AlertDialog.ErrorNumberLabel
}).component(); }).component();
this.errorNumberTextBox = view.modelBuilder.inputBox() this.errorNumberTextBox = view.modelBuilder.inputBox()
.withProperties({ .withProps({
width: '100%' width: '100%'
}) })
.component(); .component();
@@ -261,7 +261,7 @@ export class AlertDialog extends AgentDialog<AlertData> {
}); });
this.raiseAlertMessageCheckBox = view.modelBuilder.checkBox() this.raiseAlertMessageCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: AlertDialog.RaiseIfMessageContainsLabel label: AlertDialog.RaiseIfMessageContainsLabel
}).component(); }).component();
@@ -344,12 +344,12 @@ export class AlertDialog extends AgentDialog<AlertData> {
private initializeResponseTab() { private initializeResponseTab() {
this.responseTab.registerContent(async view => { this.responseTab.registerContent(async view => {
this.executeJobCheckBox = view.modelBuilder.checkBox() this.executeJobCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: AlertDialog.ExecuteJobCheckBoxLabel label: AlertDialog.ExecuteJobCheckBoxLabel
}).component(); }).component();
this.executeJobTextBox = view.modelBuilder.inputBox() this.executeJobTextBox = view.modelBuilder.inputBox()
.withProperties({ width: 375 }) .withProps({ width: 375 })
.component(); .component();
this.executeJobTextBox.enabled = false; this.executeJobTextBox.enabled = false;
this.newJobButton = view.modelBuilder.button().withProps({ this.newJobButton = view.modelBuilder.button().withProps({
@@ -383,19 +383,19 @@ export class AlertDialog extends AgentDialog<AlertData> {
}], { componentWidth: '100%' }).component(); }], { componentWidth: '100%' }).component();
let previewTag = view.modelBuilder.text() let previewTag = view.modelBuilder.text()
.withProperties({ .withProps({
value: 'Feature Preview' value: 'Feature Preview'
}).component(); }).component();
this.notifyOperatorsCheckBox = view.modelBuilder.checkBox() this.notifyOperatorsCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: AlertDialog.NotifyOperatorsTextBoxLabel label: AlertDialog.NotifyOperatorsTextBoxLabel
}).component(); }).component();
this.notifyOperatorsCheckBox.enabled = false; this.notifyOperatorsCheckBox.enabled = false;
this.operatorsTable = view.modelBuilder.table() this.operatorsTable = view.modelBuilder.table()
.withProperties({ .withProps({
columns: [ columns: [
AlertDialog.OperatorNameColumnLabel, AlertDialog.OperatorNameColumnLabel,
AlertDialog.OperatorEmailColumnLabel, AlertDialog.OperatorEmailColumnLabel,
@@ -466,28 +466,28 @@ export class AlertDialog extends AgentDialog<AlertData> {
this.optionsTab.registerContent(async view => { this.optionsTab.registerContent(async view => {
this.includeErrorInEmailTextBox = view.modelBuilder.checkBox() this.includeErrorInEmailTextBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: AlertDialog.IncludeErrorInEmailCheckBoxLabel label: AlertDialog.IncludeErrorInEmailCheckBoxLabel
}).component(); }).component();
this.includeErrorInPagerTextBox = view.modelBuilder.checkBox() this.includeErrorInPagerTextBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: AlertDialog.IncludeErrorInPagerCheckBoxLabel label: AlertDialog.IncludeErrorInPagerCheckBoxLabel
}).component(); }).component();
this.additionalMessageTextBox = view.modelBuilder.inputBox().component(); this.additionalMessageTextBox = view.modelBuilder.inputBox().component();
this.delayMinutesTextBox = view.modelBuilder.inputBox() this.delayMinutesTextBox = view.modelBuilder.inputBox()
.withProperties({ .withProps({
inputType: 'number', inputType: 'number',
placeHolder: 0 placeHolder: '0'
}) })
.component(); .component();
this.delaySecondsTextBox = view.modelBuilder.inputBox() this.delaySecondsTextBox = view.modelBuilder.inputBox()
.withProperties({ .withProps({
inputType: 'number', inputType: 'number',
placeHolder: 0 placeHolder: '0'
}) })
.component(); .component();
extensions/agent/src/dialogs/jobDialog.ts
+16 -16
View File
@@ -175,12 +175,12 @@ export class JobDialog extends AgentDialog<JobData> {
}); });
this.ownerTextBox = view.modelBuilder.inputBox().component(); this.ownerTextBox = view.modelBuilder.inputBox().component();
this.categoryDropdown = view.modelBuilder.dropDown().component(); this.categoryDropdown = view.modelBuilder.dropDown().component();
this.descriptionTextBox = view.modelBuilder.inputBox().withProperties({ this.descriptionTextBox = view.modelBuilder.inputBox().withProps({
multiline: true, multiline: true,
height: 200 height: 200
}).component(); }).component();
this.enabledCheckBox = view.modelBuilder.checkBox() this.enabledCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: this.EnabledCheckboxLabel label: this.EnabledCheckboxLabel
}).component(); }).component();
let formModel = view.modelBuilder.formContainer() let formModel = view.modelBuilder.formContainer()
@@ -222,7 +222,7 @@ export class JobDialog extends AgentDialog<JobData> {
this.stepsTab.registerContent(async view => { this.stepsTab.registerContent(async view => {
let data = this.steps ? this.convertStepsToData(this.steps) : []; let data = this.steps ? this.convertStepsToData(this.steps) : [];
this.stepsTable = view.modelBuilder.table() this.stepsTable = view.modelBuilder.table()
.withProperties({ .withProps({
columns: [ columns: [
this.StepsTable_StepColumnString, this.StepsTable_StepColumnString,
this.StepsTable_NameColumnString, this.StepsTable_NameColumnString,
@@ -234,7 +234,7 @@ export class JobDialog extends AgentDialog<JobData> {
height: 500 height: 500
}).component(); }).component();
this.startStepDropdown = view.modelBuilder.dropDown().withProperties({ width: 180 }).component(); this.startStepDropdown = view.modelBuilder.dropDown().withProps({ width: 180 }).component();
this.startStepDropdown.enabled = this.steps.length >= 1; this.startStepDropdown.enabled = this.steps.length >= 1;
this.steps.forEach((step) => { this.steps.forEach((step) => {
this.startStepDropdownValues.push({ displayName: step.id + ': ' + step.stepName, name: step.id.toString() }); this.startStepDropdownValues.push({ displayName: step.id + ': ' + step.stepName, name: step.id.toString() });
@@ -438,7 +438,7 @@ export class JobDialog extends AgentDialog<JobData> {
let alerts = this.model.alerts ? this.model.alerts : []; let alerts = this.model.alerts ? this.model.alerts : [];
let data = this.convertAlertsToData(alerts); let data = this.convertAlertsToData(alerts);
this.alertsTable = view.modelBuilder.table() this.alertsTable = view.modelBuilder.table()
.withProperties({ .withProps({
columns: [ columns: [
this.AlertNameLabelString, this.AlertNameLabelString,
this.AlertEnabledLabelString, this.AlertEnabledLabelString,
@@ -485,7 +485,7 @@ export class JobDialog extends AgentDialog<JobData> {
private initializeSchedulesTab() { private initializeSchedulesTab() {
this.schedulesTab.registerContent(async view => { this.schedulesTab.registerContent(async view => {
this.schedulesTable = view.modelBuilder.table() this.schedulesTable = view.modelBuilder.table()
.withProperties({ .withProps({
columns: [ columns: [
PickScheduleDialog.SchedulesIDText, PickScheduleDialog.SchedulesIDText,
PickScheduleDialog.ScheduleNameLabelText, PickScheduleDialog.ScheduleNameLabelText,
@@ -554,20 +554,20 @@ export class JobDialog extends AgentDialog<JobData> {
private initializeNotificationsTab() { private initializeNotificationsTab() {
this.notificationsTab.registerContent(async view => { this.notificationsTab.registerContent(async view => {
this.emailCheckBox = view.modelBuilder.checkBox().withProperties({ this.emailCheckBox = view.modelBuilder.checkBox().withProps({
label: this.EmailCheckBoxString, label: this.EmailCheckBoxString,
width: '20%' width: '20%'
}).component(); }).component();
this.pagerCheckBox = view.modelBuilder.checkBox().withProperties({ this.pagerCheckBox = view.modelBuilder.checkBox().withProps({
label: this.PagerCheckBoxString, label: this.PagerCheckBoxString,
width: '20%' width: '20%'
}).component(); }).component();
this.eventLogCheckBox = view.modelBuilder.checkBox().withProperties({ this.eventLogCheckBox = view.modelBuilder.checkBox().withProps({
label: this.EventLogCheckBoxString, label: this.EventLogCheckBoxString,
width: '5%' width: '5%'
}).component(); }).component();
this.deleteJobCheckBox = view.modelBuilder.checkBox().withProperties({ this.deleteJobCheckBox = view.modelBuilder.checkBox().withProps({
label: this.DeleteJobCheckBoxString, label: this.DeleteJobCheckBoxString,
width: '7%' width: '7%'
}).component(); }).component();
@@ -589,12 +589,12 @@ export class JobDialog extends AgentDialog<JobData> {
this.deleteJobConditionDropdown.enabled = this.deleteJobCheckBox.checked; this.deleteJobConditionDropdown.enabled = this.deleteJobCheckBox.checked;
}); });
this.emailOperatorDropdown = view.modelBuilder.dropDown().withProperties({ width: '90%' }).component(); this.emailOperatorDropdown = view.modelBuilder.dropDown().withProps({ width: '90%' }).component();
this.pagerOperatorDropdown = view.modelBuilder.dropDown().withProperties({ width: '90%' }).component(); this.pagerOperatorDropdown = view.modelBuilder.dropDown().withProps({ width: '90%' }).component();
this.emailConditionDropdown = view.modelBuilder.dropDown().withProperties({ width: '80%' }).component(); this.emailConditionDropdown = view.modelBuilder.dropDown().withProps({ width: '80%' }).component();
this.pagerConditionDropdown = view.modelBuilder.dropDown().withProperties({ width: '80%' }).component(); this.pagerConditionDropdown = view.modelBuilder.dropDown().withProps({ width: '80%' }).component();
this.eventLogConditionDropdown = view.modelBuilder.dropDown().withProperties({ width: '80%' }).component(); this.eventLogConditionDropdown = view.modelBuilder.dropDown().withProps({ width: '80%' }).component();
this.deleteJobConditionDropdown = view.modelBuilder.dropDown().withProperties({ width: '85%' }).component(); this.deleteJobConditionDropdown = view.modelBuilder.dropDown().withProps({ width: '85%' }).component();
let emailContainer = this.createRowContainer(view).withItems([this.emailCheckBox, this.emailOperatorDropdown, this.emailConditionDropdown]).component(); let emailContainer = this.createRowContainer(view).withItems([this.emailCheckBox, this.emailOperatorDropdown, this.emailConditionDropdown]).component();
extensions/agent/src/dialogs/jobStepDialog.ts
+20 -20
View File
@@ -185,7 +185,7 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
} }
}); });
this.commandTextBox = view.modelBuilder.inputBox() this.commandTextBox = view.modelBuilder.inputBox()
.withProperties({ .withProps({
height: 300, height: 300,
width: 400, width: 400,
multiline: true, multiline: true,
@@ -199,7 +199,7 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
private createGeneralTab(databases: string[], queryProvider: azdata.QueryProvider) { private createGeneralTab(databases: string[], queryProvider: azdata.QueryProvider) {
this.generalTab.registerContent(async (view) => { this.generalTab.registerContent(async (view) => {
this.nameTextBox = view.modelBuilder.inputBox() this.nameTextBox = view.modelBuilder.inputBox()
.withProperties({ .withProps({
ariaLabel: this.StepNameLabelString, ariaLabel: this.StepNameLabelString,
placeHolder: this.StepNameLabelString placeHolder: this.StepNameLabelString
}).component(); }).component();
@@ -211,26 +211,26 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
}); });
this.typeDropdown = view.modelBuilder.dropDown() this.typeDropdown = view.modelBuilder.dropDown()
.withProperties({ .withProps({
value: JobStepDialog.TSQLScript, value: JobStepDialog.TSQLScript,
values: [JobStepDialog.TSQLScript, JobStepDialog.CmdExec, JobStepDialog.Powershell] values: [JobStepDialog.TSQLScript, JobStepDialog.CmdExec, JobStepDialog.Powershell]
}) })
.component(); .component();
this.runAsDropdown = view.modelBuilder.dropDown() this.runAsDropdown = view.modelBuilder.dropDown()
.withProperties({ .withProps({
value: '', value: '',
values: [''] values: ['']
}) })
.component(); .component();
this.runAsDropdown.enabled = false; this.runAsDropdown.enabled = false;
this.databaseDropdown = view.modelBuilder.dropDown() this.databaseDropdown = view.modelBuilder.dropDown()
.withProperties({ .withProps({
value: databases[0], value: databases[0],
values: databases values: databases
}).component(); }).component();
this.processExitCodeBox = view.modelBuilder.inputBox() this.processExitCodeBox = view.modelBuilder.inputBox()
.withProperties({ .withProps({
ariaLabel: this.ProcessExitCodeText, ariaLabel: this.ProcessExitCodeText,
placeHolder: this.ProcessExitCodeText placeHolder: this.ProcessExitCodeText
}).component(); }).component();
@@ -315,7 +315,7 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
private createAdvancedTab() { private createAdvancedTab() {
this.advancedTab.registerContent(async (view) => { this.advancedTab.registerContent(async (view) => {
this.successActionDropdown = view.modelBuilder.dropDown() this.successActionDropdown = view.modelBuilder.dropDown()
.withProperties({ .withProps({
width: '100%', width: '100%',
value: JobStepDialog.NextStep, value: JobStepDialog.NextStep,
values: [JobStepDialog.NextStep, JobStepDialog.QuitJobReportingSuccess, JobStepDialog.QuitJobReportingFailure] values: [JobStepDialog.NextStep, JobStepDialog.QuitJobReportingSuccess, JobStepDialog.QuitJobReportingFailure]
@@ -324,18 +324,18 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
let retryFlexContainer = this.createRetryCounters(view); let retryFlexContainer = this.createRetryCounters(view);
this.failureActionDropdown = view.modelBuilder.dropDown() this.failureActionDropdown = view.modelBuilder.dropDown()
.withProperties({ .withProps({
value: JobStepDialog.QuitJobReportingFailure, value: JobStepDialog.QuitJobReportingFailure,
values: [JobStepDialog.QuitJobReportingFailure, JobStepDialog.NextStep, JobStepDialog.QuitJobReportingSuccess] values: [JobStepDialog.QuitJobReportingFailure, JobStepDialog.NextStep, JobStepDialog.QuitJobReportingSuccess]
}) })
.component(); .component();
let optionsGroup = this.createTSQLOptions(view); let optionsGroup = this.createTSQLOptions(view);
this.logToTableCheckbox = view.modelBuilder.checkBox() this.logToTableCheckbox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: this.LogToTableLabel label: this.LogToTableLabel
}).component(); }).component();
let appendToExistingEntryInTableCheckbox = view.modelBuilder.checkBox() let appendToExistingEntryInTableCheckbox = view.modelBuilder.checkBox()
.withProperties({ label: this.AppendExistingTableEntryLabel }).component(); .withProps({ label: this.AppendExistingTableEntryLabel }).component();
appendToExistingEntryInTableCheckbox.enabled = false; appendToExistingEntryInTableCheckbox.enabled = false;
this.logToTableCheckbox.onChanged(e => { this.logToTableCheckbox.onChanged(e => {
appendToExistingEntryInTableCheckbox.enabled = e; appendToExistingEntryInTableCheckbox.enabled = e;
@@ -346,9 +346,9 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
.withLayout({ flexFlow: 'row', justifyContent: 'space-between', width: 300 }) .withLayout({ flexFlow: 'row', justifyContent: 'space-between', width: 300 })
.withItems([this.logToTableCheckbox]).component(); .withItems([this.logToTableCheckbox]).component();
this.logStepOutputHistoryCheckbox = view.modelBuilder.checkBox() this.logStepOutputHistoryCheckbox = view.modelBuilder.checkBox()
.withProperties({ label: this.IncludeStepOutputHistoryLabel }).component(); .withProps({ label: this.IncludeStepOutputHistoryLabel }).component();
this.userInputBox = view.modelBuilder.inputBox() this.userInputBox = view.modelBuilder.inputBox()
.withProperties({ inputType: 'text', width: '100%' }).component(); .withProps({ inputType: 'text', width: '100%' }).component();
let formModel = view.modelBuilder.formContainer() let formModel = view.modelBuilder.formContainer()
.withFormItems( .withFormItems(
[{ [{
@@ -400,7 +400,7 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
private createRetryCounters(view: azdata.ModelView) { private createRetryCounters(view: azdata.ModelView) {
this.retryAttemptsBox = view.modelBuilder.inputBox() this.retryAttemptsBox = view.modelBuilder.inputBox()
.withValidation(component => Number(component.value) >= 0) .withValidation(component => Number(component.value) >= 0)
.withProperties({ .withProps({
inputType: 'number', inputType: 'number',
width: '100%', width: '100%',
placeHolder: '0' placeHolder: '0'
@@ -408,7 +408,7 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
.component(); .component();
this.retryIntervalBox = view.modelBuilder.inputBox() this.retryIntervalBox = view.modelBuilder.inputBox()
.withValidation(component => Number(component.value) >= 0) .withValidation(component => Number(component.value) >= 0)
.withProperties({ .withProps({
inputType: 'number', inputType: 'number',
width: '100%', width: '100%',
placeHolder: '0' placeHolder: '0'
@@ -449,23 +449,23 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
this.fileBrowserDialog.content = [fileBrowserTab]; this.fileBrowserDialog.content = [fileBrowserTab];
fileBrowserTab.registerContent(async (view) => { fileBrowserTab.registerContent(async (view) => {
this.fileBrowserTree = view.modelBuilder.fileBrowserTree() this.fileBrowserTree = view.modelBuilder.fileBrowserTree()
.withProperties({ ownerUri: this.ownerUri, width: 420, height: 700 }) .withProps({ ownerUri: this.ownerUri, width: 420, height: 700 })
.component(); .component();
this.selectedPathTextBox = view.modelBuilder.inputBox() this.selectedPathTextBox = view.modelBuilder.inputBox()
.withProperties({ inputType: 'text' }) .withProps({ inputType: 'text' })
.component(); .component();
this.fileBrowserTree.onDidChange((args) => { this.fileBrowserTree.onDidChange((args) => {
this.selectedPathTextBox.value = args.fullPath; this.selectedPathTextBox.value = args.fullPath;
this.fileBrowserNameBox.value = args.isFile ? path.win32.basename(args.fullPath) : ''; this.fileBrowserNameBox.value = args.isFile ? path.win32.basename(args.fullPath) : '';
}); });
this.fileTypeDropdown = view.modelBuilder.dropDown() this.fileTypeDropdown = view.modelBuilder.dropDown()
.withProperties({ .withProps({
value: this.AllFilesLabelString, value: this.AllFilesLabelString,
values: [this.AllFilesLabelString] values: [this.AllFilesLabelString]
}) })
.component(); .component();
this.fileBrowserNameBox = view.modelBuilder.inputBox() this.fileBrowserNameBox = view.modelBuilder.inputBox()
.withProperties({}) .withProps({})
.component(); .component();
let fileBrowserContainer = view.modelBuilder.formContainer() let fileBrowserContainer = view.modelBuilder.formContainer()
.withFormItems([{ .withFormItems([{
@@ -501,7 +501,7 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
}).component(); }).component();
this.outputFileBrowserButton.onDidClick(() => this.openFileBrowserDialog()); this.outputFileBrowserButton.onDidClick(() => this.openFileBrowserDialog());
this.outputFileNameBox = view.modelBuilder.inputBox() this.outputFileNameBox = view.modelBuilder.inputBox()
.withProperties({ .withProps({
width: 250, width: 250,
inputType: 'text' inputType: 'text'
}).component(); }).component();
@@ -519,7 +519,7 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
flex: '1 1 50%' flex: '1 1 50%'
}).component(); }).component();
this.appendToExistingFileCheckbox = view.modelBuilder.checkBox() this.appendToExistingFileCheckbox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: this.AppendOutputToFileLabel label: this.AppendOutputToFileLabel
}).component(); }).component();
this.appendToExistingFileCheckbox.enabled = false; this.appendToExistingFileCheckbox.enabled = false;
extensions/agent/src/dialogs/notebookDialog.ts
+7 -7
View File
@@ -99,12 +99,12 @@ export class NotebookDialog extends AgentDialog<NotebookData> {
private initializeGeneralTab() { private initializeGeneralTab() {
this.generalTab.registerContent(async view => { this.generalTab.registerContent(async view => {
this.templateFilePathBox = view.modelBuilder.inputBox() this.templateFilePathBox = view.modelBuilder.inputBox()
.withProperties({ .withProps({
width: 400, width: 400,
inputType: 'text' inputType: 'text'
}).component(); }).component();
this.openTemplateFileButton = view.modelBuilder.button() this.openTemplateFileButton = view.modelBuilder.button()
.withProperties({ .withProps({
label: '...', label: '...',
title: '...', title: '...',
width: '20px', width: '20px',
@@ -139,22 +139,22 @@ export class NotebookDialog extends AgentDialog<NotebookData> {
let databases = await AgentUtils.getDatabases(this.ownerUri); let databases = await AgentUtils.getDatabases(this.ownerUri);
databases.unshift(DefaultDropdownString); databases.unshift(DefaultDropdownString);
this.targetDatabaseDropDown = view.modelBuilder.dropDown() this.targetDatabaseDropDown = view.modelBuilder.dropDown()
.withProperties({ .withProps({
value: databases[0], value: databases[0],
values: databases values: databases
}).component(); }).component();
this.descriptionTextBox = view.modelBuilder.inputBox().withProperties({ this.descriptionTextBox = view.modelBuilder.inputBox().withProps({
multiline: true, multiline: true,
height: 50 height: 50
}).component(); }).component();
this.executeDatabaseDropDown = view.modelBuilder.dropDown() this.executeDatabaseDropDown = view.modelBuilder.dropDown()
.withProperties({ .withProps({
value: databases[0], value: databases[0],
values: databases values: databases
}).component(); }).component();
this.targetDatabaseDropDown.required = true; this.targetDatabaseDropDown.required = true;
this.executeDatabaseDropDown.required = true; this.executeDatabaseDropDown.required = true;
this.descriptionTextBox = view.modelBuilder.inputBox().withProperties({ this.descriptionTextBox = view.modelBuilder.inputBox().withProps({
multiline: true, multiline: true,
height: 50 height: 50
}).component(); }).component();
@@ -171,7 +171,7 @@ export class NotebookDialog extends AgentDialog<NotebookData> {
this.ownerTextBox = view.modelBuilder.inputBox().component(); this.ownerTextBox = view.modelBuilder.inputBox().component();
this.schedulesTable = view.modelBuilder.table() this.schedulesTable = view.modelBuilder.table()
.withProperties({ .withProps({
columns: [ columns: [
PickScheduleDialog.SchedulesIDText, PickScheduleDialog.SchedulesIDText,
PickScheduleDialog.ScheduleNameLabelText, PickScheduleDialog.ScheduleNameLabelText,
extensions/agent/src/dialogs/operatorDialog.ts
+19 -19
View File
@@ -93,31 +93,31 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
private initializeGeneralTab() { private initializeGeneralTab() {
this.generalTab.registerContent(async view => { this.generalTab.registerContent(async view => {
this.nameTextBox = view.modelBuilder.inputBox().withProperties({ this.nameTextBox = view.modelBuilder.inputBox().withProps({
ariaLabel: OperatorDialog.NameLabel, ariaLabel: OperatorDialog.NameLabel,
placeHolder: OperatorDialog.NameLabel placeHolder: OperatorDialog.NameLabel
}).component(); }).component();
this.nameTextBox.value = this.model.name; this.nameTextBox.value = this.model.name;
this.emailNameTextBox = view.modelBuilder.inputBox().withProperties({ this.emailNameTextBox = view.modelBuilder.inputBox().withProps({
ariaLabel: OperatorDialog.EmailNameTextLabel, ariaLabel: OperatorDialog.EmailNameTextLabel,
placeHolder: OperatorDialog.EmailNameTextLabel placeHolder: OperatorDialog.EmailNameTextLabel
}).component(); }).component();
this.emailNameTextBox.value = this.model.emailAddress; this.emailNameTextBox.value = this.model.emailAddress;
this.pagerEmailNameTextBox = view.modelBuilder.inputBox().withProperties({ this.pagerEmailNameTextBox = view.modelBuilder.inputBox().withProps({
ariaLabel: OperatorDialog.PagerEmailNameTextLabel, ariaLabel: OperatorDialog.PagerEmailNameTextLabel,
placeHolder: OperatorDialog.PagerEmailNameTextLabel placeHolder: OperatorDialog.PagerEmailNameTextLabel
}).component(); }).component();
this.pagerEmailNameTextBox.value = this.model.pagerAddress; this.pagerEmailNameTextBox.value = this.model.pagerAddress;
this.enabledCheckBox = view.modelBuilder.checkBox() this.enabledCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: OperatorDialog.EnabledCheckboxLabel label: OperatorDialog.EnabledCheckboxLabel
}).component(); }).component();
this.enabledCheckBox.checked = this.model.enabled; this.enabledCheckBox.checked = this.model.enabled;
this.pagerMondayCheckBox = view.modelBuilder.checkBox() this.pagerMondayCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: OperatorDialog.PagerMondayCheckBoxLabel label: OperatorDialog.PagerMondayCheckBoxLabel
}).component(); }).component();
@@ -135,7 +135,7 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
}); });
this.pagerTuesdayCheckBox = view.modelBuilder.checkBox() this.pagerTuesdayCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: OperatorDialog.PagerTuesdayCheckBoxLabel label: OperatorDialog.PagerTuesdayCheckBoxLabel
}).component(); }).component();
@@ -154,7 +154,7 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
}); });
this.pagerWednesdayCheckBox = view.modelBuilder.checkBox() this.pagerWednesdayCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: OperatorDialog.PagerWednesdayCheckBoxLabel label: OperatorDialog.PagerWednesdayCheckBoxLabel
}).component(); }).component();
@@ -172,7 +172,7 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
}); });
this.pagerThursdayCheckBox = view.modelBuilder.checkBox() this.pagerThursdayCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: OperatorDialog.PagerThursdayCheckBoxLabel label: OperatorDialog.PagerThursdayCheckBoxLabel
}).component(); }).component();
@@ -190,7 +190,7 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
}); });
this.weekdayPagerStartTimeInput = view.modelBuilder.inputBox() this.weekdayPagerStartTimeInput = view.modelBuilder.inputBox()
.withProperties({ .withProps({
inputType: 'time', inputType: 'time',
placeHolder: '08:00:00', placeHolder: '08:00:00',
}).component(); }).component();
@@ -202,7 +202,7 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
}]).component(); }]).component();
this.weekdayPagerEndTimeInput = view.modelBuilder.inputBox() this.weekdayPagerEndTimeInput = view.modelBuilder.inputBox()
.withProperties({ .withProps({
inputType: 'time', inputType: 'time',
placeHolder: '06:00:00' placeHolder: '06:00:00'
}).component(); }).component();
@@ -214,7 +214,7 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
}]).component(); }]).component();
this.pagerFridayCheckBox = view.modelBuilder.checkBox() this.pagerFridayCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: OperatorDialog.PagerFridayCheckBoxLabel label: OperatorDialog.PagerFridayCheckBoxLabel
}).component(); }).component();
this.pagerFridayCheckBox.onChanged(() => { this.pagerFridayCheckBox.onChanged(() => {
@@ -239,7 +239,7 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
.component(); .component();
this.pagerSaturdayCheckBox = view.modelBuilder.checkBox() this.pagerSaturdayCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: OperatorDialog.PagerSaturdayCheckBoxLabel label: OperatorDialog.PagerSaturdayCheckBoxLabel
}).component(); }).component();
@@ -254,7 +254,7 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
}); });
this.saturdayPagerStartTimeInput = view.modelBuilder.inputBox() this.saturdayPagerStartTimeInput = view.modelBuilder.inputBox()
.withProperties({ .withProps({
inputType: 'time', inputType: 'time',
placeHolder: '08:00:00' placeHolder: '08:00:00'
}).component(); }).component();
@@ -266,7 +266,7 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
}]).component(); }]).component();
this.saturdayPagerEndTimeInput = view.modelBuilder.inputBox() this.saturdayPagerEndTimeInput = view.modelBuilder.inputBox()
.withProperties({ .withProps({
inputType: 'time', inputType: 'time',
placeHolder: '06:00:00' placeHolder: '06:00:00'
}).component(); }).component();
@@ -285,7 +285,7 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
.component(); .component();
this.pagerSundayCheckBox = view.modelBuilder.checkBox() this.pagerSundayCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: OperatorDialog.PagerSundayCheckBoxLabel label: OperatorDialog.PagerSundayCheckBoxLabel
}).component(); }).component();
@@ -300,7 +300,7 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
}); });
this.sundayPagerStartTimeInput = view.modelBuilder.inputBox() this.sundayPagerStartTimeInput = view.modelBuilder.inputBox()
.withProperties({ .withProps({
inputType: 'time', inputType: 'time',
placeHolder: '08:00:00' placeHolder: '08:00:00'
}).component(); }).component();
@@ -312,7 +312,7 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
}]).component(); }]).component();
this.sundayPagerEndTimeInput = view.modelBuilder.inputBox() this.sundayPagerEndTimeInput = view.modelBuilder.inputBox()
.withProperties({ .withProps({
inputType: 'time', inputType: 'time',
placeHolder: '06:00:00' placeHolder: '06:00:00'
}).component(); }).component();
@@ -383,11 +383,11 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
this.notificationsTab.registerContent(async view => { this.notificationsTab.registerContent(async view => {
let previewTag = view.modelBuilder.text() let previewTag = view.modelBuilder.text()
.withProperties({ .withProps({
value: 'Feature Preview' value: 'Feature Preview'
}).component(); }).component();
this.alertsTable = view.modelBuilder.table() this.alertsTable = view.modelBuilder.table()
.withProperties({ .withProps({
columns: [ columns: [
OperatorDialog.AlertNameColumnLabel, OperatorDialog.AlertNameColumnLabel,
OperatorDialog.AlertEmailColumnLabel, OperatorDialog.AlertEmailColumnLabel,
extensions/agent/src/dialogs/pickScheduleDialog.ts
+1 -1
View File
@@ -63,7 +63,7 @@ export class PickScheduleDialog {
private initializeContent() { private initializeContent() {
this.dialog.registerContent(async view => { this.dialog.registerContent(async view => {
this.schedulesTable = view.modelBuilder.table() this.schedulesTable = view.modelBuilder.table()
.withProperties({ .withProps({
columns: [ columns: [
PickScheduleDialog.SchedulesIDText, PickScheduleDialog.SchedulesIDText,
PickScheduleDialog.ScheduleNameLabelText, PickScheduleDialog.ScheduleNameLabelText,
extensions/agent/src/dialogs/proxyDialog.ts
+14 -14
View File
@@ -81,14 +81,14 @@ export class ProxyDialog extends AgentDialog<ProxyData> {
this.generalTab.registerContent(async view => { this.generalTab.registerContent(async view => {
this.proxyNameTextBox = view.modelBuilder.inputBox() this.proxyNameTextBox = view.modelBuilder.inputBox()
.withProperties({ .withProps({
width: 420, width: 420,
ariaLabel: ProxyDialog.ProxyNameTextBoxLabel, ariaLabel: ProxyDialog.ProxyNameTextBoxLabel,
placeHolder: ProxyDialog.ProxyNameTextBoxLabel placeHolder: ProxyDialog.ProxyNameTextBoxLabel
}).component(); }).component();
this.credentialNameDropDown = view.modelBuilder.dropDown() this.credentialNameDropDown = view.modelBuilder.dropDown()
.withProperties({ .withProps({
width: 432, width: 432,
value: '', value: '',
editable: true, editable: true,
@@ -97,7 +97,7 @@ export class ProxyDialog extends AgentDialog<ProxyData> {
.component(); .component();
this.descriptionTextBox = view.modelBuilder.inputBox() this.descriptionTextBox = view.modelBuilder.inputBox()
.withProperties({ .withProps({
width: 420, width: 420,
multiline: true, multiline: true,
height: 300, height: 300,
@@ -106,7 +106,7 @@ export class ProxyDialog extends AgentDialog<ProxyData> {
}).component(); }).component();
this.subsystemCheckBox = view.modelBuilder.checkBox() this.subsystemCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: ProxyDialog.SubsystemLabel label: ProxyDialog.SubsystemLabel
}).component(); }).component();
@@ -137,52 +137,52 @@ export class ProxyDialog extends AgentDialog<ProxyData> {
}); });
this.operatingSystemCheckBox = view.modelBuilder.checkBox() this.operatingSystemCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: ProxyDialog.OperatingSystemLabel label: ProxyDialog.OperatingSystemLabel
}).component(); }).component();
this.replicationSnapshotCheckBox = view.modelBuilder.checkBox() this.replicationSnapshotCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: ProxyDialog.ReplicationSnapshotLabel label: ProxyDialog.ReplicationSnapshotLabel
}).component(); }).component();
this.replicationTransactionLogCheckBox = view.modelBuilder.checkBox() this.replicationTransactionLogCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: ProxyDialog.ReplicationTransactionLogLabel label: ProxyDialog.ReplicationTransactionLogLabel
}).component(); }).component();
this.replicationDistributorCheckBox = view.modelBuilder.checkBox() this.replicationDistributorCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: ProxyDialog.ReplicationDistributorLabel label: ProxyDialog.ReplicationDistributorLabel
}).component(); }).component();
this.replicationMergeCheckbox = view.modelBuilder.checkBox() this.replicationMergeCheckbox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: ProxyDialog.ReplicationMergeLabel label: ProxyDialog.ReplicationMergeLabel
}).component(); }).component();
this.replicationQueueReaderCheckbox = view.modelBuilder.checkBox() this.replicationQueueReaderCheckbox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: ProxyDialog.ReplicationQueueReaderLabel label: ProxyDialog.ReplicationQueueReaderLabel
}).component(); }).component();
this.sqlQueryCheckBox = view.modelBuilder.checkBox() this.sqlQueryCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: ProxyDialog.SSASQueryLabel label: ProxyDialog.SSASQueryLabel
}).component(); }).component();
this.sqlCommandCheckBox = view.modelBuilder.checkBox() this.sqlCommandCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: ProxyDialog.SSASCommandLabel label: ProxyDialog.SSASCommandLabel
}).component(); }).component();
this.sqlIntegrationServicesPackageCheckbox = view.modelBuilder.checkBox() this.sqlIntegrationServicesPackageCheckbox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: ProxyDialog.SSISPackageLabel label: ProxyDialog.SSISPackageLabel
}).component(); }).component();
this.powershellCheckBox = view.modelBuilder.checkBox() this.powershellCheckBox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: ProxyDialog.PowerShellLabel label: ProxyDialog.PowerShellLabel
}).component(); }).component();
extensions/arc/package.json
+1 -1
View File
@@ -1113,7 +1113,7 @@
"@types/sinon": "^9.0.4", "@types/sinon": "^9.0.4",
"@types/uuid": "^8.3.0", "@types/uuid": "^8.3.0",
"@types/yamljs": "^0.2.31", "@types/yamljs": "^0.2.31",
"@microsoft/azdata-test": "^1.5.0", "@microsoft/azdata-test": "^1.5.1",
"mocha": "^5.2.0", "mocha": "^5.2.0",
"mocha-junit-reporter": "^1.17.0", "mocha-junit-reporter": "^1.17.0",
"mocha-multi-reporters": "^1.1.7", "mocha-multi-reporters": "^1.1.7",
extensions/arc/src/ui/components/radioOptionsGroup.ts
+1 -1
View File
@@ -67,7 +67,7 @@ export class RadioOptionsGroup {
this.component().loadingCompletedText = this._loadingCompleteMessage; this.component().loadingCompletedText = this._loadingCompleteMessage;
} }
catch (e) { catch (e) {
const errorLabel = this._modelBuilder.text().withProperties({ value: loc.loadingClusterContextsError(e), CSSStyles: { 'color': 'Red' } }).component(); const errorLabel = this._modelBuilder.text().withProps({ value: loc.loadingClusterContextsError(e), CSSStyles: { 'color': 'Red' } }).component();
this._divContainer.addItem(errorLabel); this._divContainer.addItem(errorLabel);
this.component().loadingCompletedText = this._loadingCompleteErrorMessage(e); this.component().loadingCompletedText = this._loadingCompleteErrorMessage(e);
} }
extensions/arc/src/ui/dashboards/miaa/miaaDashboardOverviewPage.ts
+1 -1
View File
@@ -154,7 +154,7 @@ export class MiaaDashboardOverviewPage extends DashboardPage {
// Assemble the container // Assemble the container
const rootContainer = this.modelView.modelBuilder.flexContainer() const rootContainer = this.modelView.modelBuilder.flexContainer()
.withLayout({ flexFlow: 'column' }) .withLayout({ flexFlow: 'column' })
.withProperties({ CSSStyles: { 'margin': '18px' } }) .withProps({ CSSStyles: { 'margin': '18px' } })
.component(); .component();
// Properties // Properties
extensions/arc/yarn.lock
+4 -4
View File
@@ -182,10 +182,10 @@
resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
"@microsoft/azdata-test@^1.5.0": "@microsoft/azdata-test@^1.5.1":
version "1.5.0" version "1.5.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-1.5.0.tgz#5ffa9ec6b704fea439c63d7dfa46dcfcf3236747" resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-1.5.1.tgz#e61aeb81f3291563f250e6b0c712a45aa335de94"
integrity sha512-kaDn5geXqrhcZgxCWXSrbXdUpJi5TFmi+sIPDfmhMYJa8uecn9C2rzxn5ZbxBN5cjjYOWF318dERfe+S0CWnlA== integrity sha512-3B5iz0WU5TCKOs420zRNk4LWi2n5W64ZLJMu81X/yFFmnCbjhWwKE4xgTBZTuzmzg372bNNrHm9zHZcr3lm1RA==
dependencies: dependencies:
http-proxy-agent "^2.1.0" http-proxy-agent "^2.1.0"
https-proxy-agent "^2.2.4" https-proxy-agent "^2.2.4"
extensions/big-data-cluster/src/bigDataCluster/dialog/addControllerDialog.ts
+1 -1
View File
@@ -123,7 +123,7 @@ export class AddControllerDialog {
placeHolder: loc.url.toLocaleLowerCase(), placeHolder: loc.url.toLocaleLowerCase(),
value: this.model.prefilledUrl value: this.model.prefilledUrl
}).component(); }).component();
this.authDropdown = this.uiModelBuilder.dropDown().withProperties({ this.authDropdown = this.uiModelBuilder.dropDown().withProps({
values: this.model.authCategories, values: this.model.authCategories,
value: this.model.prefilledAuth, value: this.model.prefilledAuth,
editable: false, editable: false,
extensions/big-data-cluster/src/bigDataCluster/dialog/bdcDashboardOverviewPage.ts
+3 -3
View File
@@ -85,7 +85,7 @@ export class BdcDashboardOverviewPage extends BdcDashboardPage {
overviewHeaderContainer.addItem(overviewLabel, { CSSStyles: { ...cssStyles.title } }); overviewHeaderContainer.addItem(overviewLabel, { CSSStyles: { ...cssStyles.title } });
this.lastUpdatedLabel = this.modelView.modelBuilder.text() this.lastUpdatedLabel = this.modelView.modelBuilder.text()
.withProperties({ .withProps({
value: loc.lastUpdated(), value: loc.lastUpdated(),
CSSStyles: { ...cssStyles.lastUpdatedText } CSSStyles: { ...cssStyles.lastUpdatedText }
}).component(); }).component();
@@ -192,7 +192,7 @@ export class BdcDashboardOverviewPage extends BdcDashboardPage {
// messes up the layout for the table that we display after loading is finished. Instead we'll just remove the loading // messes up the layout for the table that we display after loading is finished. Instead we'll just remove the loading
// component once it's finished loading the content // component once it's finished loading the content
this.serviceStatusLoadingComponent = this.modelView.modelBuilder.loadingComponent() this.serviceStatusLoadingComponent = this.modelView.modelBuilder.loadingComponent()
.withProperties({ CSSStyles: { 'padding-top': '0px', 'padding-bottom': '0px' } }) .withProps({ CSSStyles: { 'padding-top': '0px', 'padding-bottom': '0px' } })
.component(); .component();
this.serviceStatusDisplayContainer.addItem(this.serviceStatusLoadingComponent, { flex: '0 0 auto', CSSStyles: { 'padding-left': '150px', width: '30px' } }); this.serviceStatusDisplayContainer.addItem(this.serviceStatusLoadingComponent, { flex: '0 0 auto', CSSStyles: { 'padding-left': '150px', width: '30px' } });
@@ -283,7 +283,7 @@ export class BdcDashboardOverviewPage extends BdcDashboardPage {
// messes up the layout for the table that we display after loading is finished. Instead we'll just remove the loading // messes up the layout for the table that we display after loading is finished. Instead we'll just remove the loading
// component once it's finished loading the content // component once it's finished loading the content
this.endpointsLoadingComponent = this.modelView.modelBuilder.loadingComponent() this.endpointsLoadingComponent = this.modelView.modelBuilder.loadingComponent()
.withProperties({ CSSStyles: { 'padding-top': '0px', 'padding-bottom': '0px' } }) .withProps({ CSSStyles: { 'padding-top': '0px', 'padding-bottom': '0px' } })
.component(); .component();
this.endpointsDisplayContainer.addItem(this.endpointsLoadingComponent, { flex: '0 0 auto', CSSStyles: { 'padding-left': '150px', width: '30px' } }); this.endpointsDisplayContainer.addItem(this.endpointsLoadingComponent, { flex: '0 0 auto', CSSStyles: { 'padding-left': '150px', width: '30px' } });
extensions/big-data-cluster/src/bigDataCluster/dialog/bdcDashboardResourceStatusPage.ts
+4 -4
View File
@@ -64,7 +64,7 @@ export class BdcDashboardResourceStatusPage extends BdcDashboardPage {
// Last updated label // Last updated label
this.lastUpdatedLabel = this.modelView.modelBuilder.text() this.lastUpdatedLabel = this.modelView.modelBuilder.text()
.withProperties({ .withProps({
value: loc.lastUpdated(this.model.bdcStatusLastUpdated), value: loc.lastUpdated(this.model.bdcStatusLastUpdated),
CSSStyles: { ...cssStyles.lastUpdatedText } CSSStyles: { ...cssStyles.lastUpdatedText }
}).component(); }).component();
@@ -297,7 +297,7 @@ export class BdcDashboardResourceStatusPage extends BdcDashboardPage {
// Not all instances have all logs available - in that case just display N/A instead of a link // Not all instances have all logs available - in that case just display N/A instead of a link
if (isNullOrUndefined(instanceStatus.dashboards) || isNullOrUndefined(instanceStatus.dashboards.nodeMetricsUrl)) { if (isNullOrUndefined(instanceStatus.dashboards) || isNullOrUndefined(instanceStatus.dashboards.nodeMetricsUrl)) {
row.push(this.modelView.modelBuilder.text().withProperties({ value: loc.notAvailable, CSSStyles: { ...cssStyles.text } }).component()); row.push(this.modelView.modelBuilder.text().withProps({ value: loc.notAvailable, CSSStyles: { ...cssStyles.text } }).component());
} else { } else {
row.push(this.modelView.modelBuilder.hyperlink().withProperties<azdata.HyperlinkComponentProperties>({ row.push(this.modelView.modelBuilder.hyperlink().withProperties<azdata.HyperlinkComponentProperties>({
label: loc.view, label: loc.view,
@@ -312,7 +312,7 @@ export class BdcDashboardResourceStatusPage extends BdcDashboardPage {
if (this.serviceName === Service.sql) { if (this.serviceName === Service.sql) {
// Not all instances have all logs available - in that case just display N/A instead of a link // Not all instances have all logs available - in that case just display N/A instead of a link
if (isNullOrUndefined(instanceStatus.dashboards) || isNullOrUndefined(instanceStatus.dashboards.sqlMetricsUrl)) { if (isNullOrUndefined(instanceStatus.dashboards) || isNullOrUndefined(instanceStatus.dashboards.sqlMetricsUrl)) {
row.push(this.modelView.modelBuilder.text().withProperties({ value: loc.notAvailable, CSSStyles: { ...cssStyles.text } }).component()); row.push(this.modelView.modelBuilder.text().withProps({ value: loc.notAvailable, CSSStyles: { ...cssStyles.text } }).component());
} else { } else {
row.push(this.modelView.modelBuilder.hyperlink().withProperties<azdata.HyperlinkComponentProperties>({ row.push(this.modelView.modelBuilder.hyperlink().withProperties<azdata.HyperlinkComponentProperties>({
label: loc.view, label: loc.view,
@@ -325,7 +325,7 @@ export class BdcDashboardResourceStatusPage extends BdcDashboardPage {
} }
if (isNullOrUndefined(instanceStatus.dashboards) || isNullOrUndefined(instanceStatus.dashboards.logsUrl)) { if (isNullOrUndefined(instanceStatus.dashboards) || isNullOrUndefined(instanceStatus.dashboards.logsUrl)) {
row.push(this.modelView.modelBuilder.text().withProperties({ value: loc.notAvailable, CSSStyles: { ...cssStyles.text } }).component()); row.push(this.modelView.modelBuilder.text().withProps({ value: loc.notAvailable, CSSStyles: { ...cssStyles.text } }).component());
} else { } else {
row.push(this.modelView.modelBuilder.hyperlink().withProperties<azdata.HyperlinkComponentProperties>({ row.push(this.modelView.modelBuilder.hyperlink().withProperties<azdata.HyperlinkComponentProperties>({
label: loc.view, label: loc.view,
extensions/big-data-cluster/src/bigDataCluster/dialog/hdfsDialogBase.ts
+1 -1
View File
@@ -139,7 +139,7 @@ export abstract class HdfsDialogBase<T extends HdfsDialogProperties, R> {
enabled: false enabled: false
}).component(); }).component();
this.authDropdown = this.uiModelBuilder.dropDown().withProperties({ this.authDropdown = this.uiModelBuilder.dropDown().withProps({
values: this.model.authCategories, values: this.model.authCategories,
value: this.model.authCategory, value: this.model.authCategory,
editable: false, editable: false,
extensions/dacpac/src/test/testContext.ts
+2 -2
View File
@@ -138,8 +138,8 @@ export function createViewContext(): ViewTestContext {
let button = radioButton(); let button = radioButton();
let builder: azdata.ComponentBuilder<azdata.RadioButtonComponent, azdata.RadioButtonProperties> = { let builder: azdata.ComponentBuilder<azdata.RadioButtonComponent, azdata.RadioButtonProperties> = {
component: () => button, component: () => button,
withProps: () => undefined, withProperties: () => undefined,
withProperties: (properties) => { withProps: (properties) => {
switch ((properties as any).label) { switch ((properties as any).label) {
case loc.newDatabase: case loc.newDatabase:
button.label = loc.newDatabase; button.label = loc.newDatabase;
extensions/dacpac/src/wizard/api/dacFxConfigPage.ts
+7 -8
View File
@@ -33,7 +33,7 @@ export abstract class DacFxConfigPage extends BasePage {
protected async createServerDropdown(isTargetServer: boolean): Promise<azdata.FormComponent> { protected async createServerDropdown(isTargetServer: boolean): Promise<azdata.FormComponent> {
const serverDropDownTitle = isTargetServer ? loc.targetServer : loc.sourceServer; const serverDropDownTitle = isTargetServer ? loc.targetServer : loc.sourceServer;
this.serverDropdown = this.view.modelBuilder.dropDown().withProperties({ this.serverDropdown = this.view.modelBuilder.dropDown().withProps({
required: true, required: true,
ariaLabel: serverDropDownTitle ariaLabel: serverDropDownTitle
}).component(); }).component();
@@ -79,7 +79,7 @@ export abstract class DacFxConfigPage extends BasePage {
protected async createDatabaseTextBox(title: string): Promise<azdata.FormComponent> { protected async createDatabaseTextBox(title: string): Promise<azdata.FormComponent> {
this.databaseTextBox = this.view.modelBuilder.inputBox() this.databaseTextBox = this.view.modelBuilder.inputBox()
.withValidation(component => !this.databaseNameExists(component.value)) .withValidation(component => !this.databaseNameExists(component.value))
.withProperties({ .withProps({
required: true, required: true,
validationErrorMessage: loc.databaseNameExistsErrorMessage validationErrorMessage: loc.databaseNameExistsErrorMessage
}).component(); }).component();
@@ -97,7 +97,7 @@ export abstract class DacFxConfigPage extends BasePage {
protected async createDatabaseDropdown(): Promise<azdata.FormComponent> { protected async createDatabaseDropdown(): Promise<azdata.FormComponent> {
const databaseDropdownTitle = loc.sourceDatabase; const databaseDropdownTitle = loc.sourceDatabase;
this.databaseDropdown = this.view.modelBuilder.dropDown().withProperties({ this.databaseDropdown = this.view.modelBuilder.dropDown().withProps({
required: true, required: true,
ariaLabel: databaseDropdownTitle ariaLabel: databaseDropdownTitle
}).component(); }).component();
@@ -114,13 +114,12 @@ export abstract class DacFxConfigPage extends BasePage {
this.model.filePath = this.fileTextBox.value; this.model.filePath = this.fileTextBox.value;
}); });
this.databaseLoader = this.view.modelBuilder.loadingComponent().withItem(this.databaseDropdown).withProperties({ this.databaseLoader = this.view.modelBuilder.loadingComponent().withItem(this.databaseDropdown).component();
required: true
}).component();
return { return {
component: this.databaseLoader, component: this.databaseLoader,
title: databaseDropdownTitle title: databaseDropdownTitle,
required: true
}; };
} }
@@ -167,7 +166,7 @@ export abstract class DacFxConfigPage extends BasePage {
this.fileTextBox = this.view.modelBuilder.inputBox().withValidation( this.fileTextBox = this.view.modelBuilder.inputBox().withValidation(
component => isValidBasename(component.value) component => isValidBasename(component.value)
) )
.withProperties({ .withProps({
required: true, required: true,
ariaLive: 'polite' ariaLive: 'polite'
}).component(); }).component();
extensions/dacpac/src/wizard/pages/dacFxSummaryPage.ts
+4 -2
View File
@@ -20,8 +20,10 @@ export class DacFxSummaryPage extends BasePage {
} }
async start(): Promise<boolean> { async start(): Promise<boolean> {
this.table = this.view.modelBuilder.table().withProperties({ this.table = this.view.modelBuilder.table().withProps({
title: loc.summaryTableTitle title: loc.summaryTableTitle,
data: [],
columns: []
}).component(); }).component();
this.loader = this.view.modelBuilder.loadingComponent().withItem(this.table).component(); this.loader = this.view.modelBuilder.loadingComponent().withItem(this.table).component();
this.form = this.view.modelBuilder.formContainer().withFormItems( this.form = this.view.modelBuilder.formContainer().withFormItems(
extensions/dacpac/src/wizard/pages/deployConfigPage.ts
+6 -7
View File
@@ -101,13 +101,13 @@ export class DeployConfigPage extends DacFxConfigPage {
private createRadiobuttons(): azdata.FormComponent { private createRadiobuttons(): azdata.FormComponent {
let upgradeRadioButton = this.view.modelBuilder.radioButton() let upgradeRadioButton = this.view.modelBuilder.radioButton()
.withProperties({ .withProps({
name: 'updateExistingOrCreateNew', name: 'updateExistingOrCreateNew',
label: loc.upgradeExistingDatabase, label: loc.upgradeExistingDatabase,
}).component(); }).component();
let newRadioButton = this.view.modelBuilder.radioButton() let newRadioButton = this.view.modelBuilder.radioButton()
.withProperties({ .withProps({
name: 'updateExistingOrCreateNew', name: 'updateExistingOrCreateNew',
label: loc.newDatabase, label: loc.newDatabase,
}).component(); }).component();
@@ -136,7 +136,7 @@ export class DeployConfigPage extends DacFxConfigPage {
protected async createDeployDatabaseDropdown(): Promise<azdata.FormComponent> { protected async createDeployDatabaseDropdown(): Promise<azdata.FormComponent> {
const targetDatabaseTitle = loc.databaseName; const targetDatabaseTitle = loc.databaseName;
this.databaseDropdown = this.view.modelBuilder.dropDown().withProperties({ this.databaseDropdown = this.view.modelBuilder.dropDown().withProps({
ariaLabel: targetDatabaseTitle ariaLabel: targetDatabaseTitle
}).component(); }).component();
@@ -150,13 +150,12 @@ export class DeployConfigPage extends DacFxConfigPage {
this.model.database = databaseDropdownValue; this.model.database = databaseDropdownValue;
}); });
this.databaseLoader = this.view.modelBuilder.loadingComponent().withItem(this.databaseDropdown).withProperties({ this.databaseLoader = this.view.modelBuilder.loadingComponent().withItem(this.databaseDropdown).component();
required: true
}).component();
return { return {
component: this.databaseLoader, component: this.databaseLoader,
title: targetDatabaseTitle title: targetDatabaseTitle,
required: true
}; };
} }
extensions/dacpac/src/wizard/pages/deployPlanPage.ts
+7 -5
View File
@@ -48,8 +48,10 @@ export class DeployPlanPage extends DacFxConfigPage {
} }
async start(): Promise<boolean> { async start(): Promise<boolean> {
this.table = this.view.modelBuilder.table().withProperties({ this.table = this.view.modelBuilder.table().withProps({
ariaLabel: loc.deployPlanTableTitle ariaLabel: loc.deployPlanTableTitle,
data: [],
columns: []
}).component(); }).component();
this.loader = this.view.modelBuilder.loadingComponent().withItem(this.table).component(); this.loader = this.view.modelBuilder.loadingComponent().withItem(this.table).component();
this.dataLossComponentGroup = await this.createDataLossComponents(); this.dataLossComponentGroup = await this.createDataLossComponents();
@@ -117,7 +119,7 @@ export class DeployPlanPage extends DacFxConfigPage {
private async createDataLossCheckbox(): Promise<azdata.FormComponent> { private async createDataLossCheckbox(): Promise<azdata.FormComponent> {
this.dataLossCheckbox = this.view.modelBuilder.checkBox() this.dataLossCheckbox = this.view.modelBuilder.checkBox()
.withValidation(component => component.checked === true) .withValidation(component => component.checked === true)
.withProperties({ .withProps({
label: loc.proceedDataLossMessage, label: loc.proceedDataLossMessage,
}).component(); }).component();
@@ -130,7 +132,7 @@ export class DeployPlanPage extends DacFxConfigPage {
private async createNoDataLossText(): Promise<azdata.FormComponent> { private async createNoDataLossText(): Promise<azdata.FormComponent> {
let noDataLossText = this.view.modelBuilder.text() let noDataLossText = this.view.modelBuilder.text()
.withProperties({ .withProps({
value: loc.noDataLossMessage value: loc.noDataLossMessage
}).component(); }).component();
@@ -143,7 +145,7 @@ export class DeployPlanPage extends DacFxConfigPage {
private async createDataLossComponents(): Promise<azdata.FormComponentGroup> { private async createDataLossComponents(): Promise<azdata.FormComponentGroup> {
let dataLossComponent = await this.createDataLossCheckbox(); let dataLossComponent = await this.createDataLossCheckbox();
this.dataLossText = this.view.modelBuilder.text() this.dataLossText = this.view.modelBuilder.text()
.withProperties({ .withProps({
value: loc.dataLossMessage value: loc.dataLossMessage
}).component(); }).component();
extensions/dacpac/src/wizard/pages/extractConfigPage.ts
+1 -1
View File
@@ -98,7 +98,7 @@ export class ExtractConfigPage extends DacFxConfigPage {
} }
private async createVersionTextBox(): Promise<azdata.FormComponent> { private async createVersionTextBox(): Promise<azdata.FormComponent> {
this.versionTextBox = this.view.modelBuilder.inputBox().withProperties({ this.versionTextBox = this.view.modelBuilder.inputBox().withProps({
required: true, required: true,
ariaLabel: loc.version ariaLabel: loc.version
}).component(); }).component();
extensions/dacpac/src/wizard/pages/selectOperationpage.ts
+4 -4
View File
@@ -49,7 +49,7 @@ export class SelectOperationPage extends BasePage {
private async createDeployRadioButton(): Promise<azdata.FormComponent> { private async createDeployRadioButton(): Promise<azdata.FormComponent> {
this.deployRadioButton = this.view.modelBuilder.radioButton() this.deployRadioButton = this.view.modelBuilder.radioButton()
.withProperties({ .withProps({
name: 'selectedOperation', name: 'selectedOperation',
label: loc.deployDescription, label: loc.deployDescription,
checked: true // Default to first radio button being selected checked: true // Default to first radio button being selected
@@ -77,7 +77,7 @@ export class SelectOperationPage extends BasePage {
private async createExtractRadioButton(): Promise<azdata.FormComponent> { private async createExtractRadioButton(): Promise<azdata.FormComponent> {
this.extractRadioButton = this.view.modelBuilder.radioButton() this.extractRadioButton = this.view.modelBuilder.radioButton()
.withProperties({ .withProps({
name: 'selectedOperation', name: 'selectedOperation',
label: loc.extractDescription, label: loc.extractDescription,
}).component(); }).component();
@@ -102,7 +102,7 @@ export class SelectOperationPage extends BasePage {
private async createImportRadioButton(): Promise<azdata.FormComponent> { private async createImportRadioButton(): Promise<azdata.FormComponent> {
this.importRadioButton = this.view.modelBuilder.radioButton() this.importRadioButton = this.view.modelBuilder.radioButton()
.withProperties({ .withProps({
name: 'selectedOperation', name: 'selectedOperation',
label: loc.importDescription, label: loc.importDescription,
}).component(); }).component();
@@ -127,7 +127,7 @@ export class SelectOperationPage extends BasePage {
private async createExportRadioButton(): Promise<azdata.FormComponent> { private async createExportRadioButton(): Promise<azdata.FormComponent> {
this.exportRadioButton = this.view.modelBuilder.radioButton() this.exportRadioButton = this.view.modelBuilder.radioButton()
.withProperties({ .withProps({
name: 'selectedOperation', name: 'selectedOperation',
label: loc.exportDescription, label: loc.exportDescription,
}).component(); }).component();
extensions/data-workspace/src/dialogs/openExistingDialog.ts
+1 -1
View File
@@ -200,7 +200,7 @@ export class OpenExistingDialog extends DialogBase {
required: true, required: true,
component: view.modelBuilder.flexContainer() component: view.modelBuilder.flexContainer()
.withItems([this.localRadioButton, this.remoteGitRepoRadioButton], { flex: '0 0 auto', CSSStyles: { 'margin-right': '15px' } }) .withItems([this.localRadioButton, this.remoteGitRepoRadioButton], { flex: '0 0 auto', CSSStyles: { 'margin-right': '15px' } })
.withProperties({ ariaRole: 'radiogroup' }) .withProps({ ariaRole: 'radiogroup' })
.component() .component()
}; };
extensions/import/src/wizard/pages/fileConfigPage.ts
+5 -5
View File
@@ -139,7 +139,7 @@ export class FileConfigPage extends ImportPage {
} }
private async createServerDropdown(): Promise<azdata.FormComponent> { private async createServerDropdown(): Promise<azdata.FormComponent> {
this.serverDropdown = this.view.modelBuilder.dropDown().withProperties({ this.serverDropdown = this.view.modelBuilder.dropDown().withProps({
required: true required: true
}).component(); }).component();
@@ -174,7 +174,7 @@ export class FileConfigPage extends ImportPage {
} }
private async createDatabaseDropdown(): Promise<azdata.FormComponent> { private async createDatabaseDropdown(): Promise<azdata.FormComponent> {
this.databaseDropdown = this.view.modelBuilder.dropDown().withProperties({ this.databaseDropdown = this.view.modelBuilder.dropDown().withProps({
required: true required: true
}).component(); }).component();
@@ -243,7 +243,7 @@ export class FileConfigPage extends ImportPage {
return fs.existsSync(component.value); return fs.existsSync(component.value);
}).component(); }).component();
this.fileButton = this.view.modelBuilder.button().withProperties({ this.fileButton = this.view.modelBuilder.button().withProps({
label: constants.browseFilesText, label: constants.browseFilesText,
secondary: true secondary: true
}).component(); }).component();
@@ -326,7 +326,7 @@ export class FileConfigPage extends ImportPage {
} }
return true; return true;
}).withProperties({ }).withProps({
required: true, required: true,
}).component(); }).component();
@@ -342,7 +342,7 @@ export class FileConfigPage extends ImportPage {
private async createSchemaDropdown(): Promise<azdata.FormComponent> { private async createSchemaDropdown(): Promise<azdata.FormComponent> {
this.schemaDropdown = this.view.modelBuilder.dropDown().withProperties({ this.schemaDropdown = this.view.modelBuilder.dropDown().withProps({
required: true required: true
}).component(); }).component();
this.schemaLoader = this.view.modelBuilder.loadingComponent().withItem(this.schemaDropdown).component(); this.schemaLoader = this.view.modelBuilder.loadingComponent().withItem(this.schemaDropdown).component();
extensions/import/src/wizard/pages/prosePreviewPage.ts
+1 -1
View File
@@ -83,7 +83,7 @@ export class ProsePreviewPage extends ImportPage {
this.loading = this.view.modelBuilder.loadingComponent().component(); this.loading = this.view.modelBuilder.loadingComponent().component();
this.resultTextComponent = this.view.modelBuilder.text() this.resultTextComponent = this.view.modelBuilder.text()
.withProperties({ .withProps({
value: this.isSuccess ? constants.successTitleText : constants.failureTitleText value: this.isSuccess ? constants.successTitleText : constants.failureTitleText
}).component(); }).component();
extensions/machine-learning/src/views/dataInfoComponent.ts
+4 -4
View File
@@ -39,10 +39,10 @@ export class DataInfoComponent extends ViewBase {
} }
public registerComponent(modelBuilder: azdata.ModelBuilder): azdata.Component { public registerComponent(modelBuilder: azdata.ModelBuilder): azdata.Component {
this._descriptionComponent = modelBuilder.text().withProperties({ this._descriptionComponent = modelBuilder.text().withProps({
value: this._description, value: this._description,
}).component(); }).component();
this._labelComponent = modelBuilder.text().withProperties({ this._labelComponent = modelBuilder.text().withProps({
value: this._title, value: this._title,
}).component(); }).component();
this._labelContainer = modelBuilder.flexContainer().withLayout({ this._labelContainer = modelBuilder.flexContainer().withLayout({
@@ -64,7 +64,7 @@ export class DataInfoComponent extends ViewBase {
}; };
} }
this._iconComponent = modelBuilder.image().withProperties({ this._iconComponent = modelBuilder.image().withProps({
width: this._iconSettings?.containerWidth ?? this._defaultIconSize, width: this._iconSettings?.containerWidth ?? this._defaultIconSize,
height: this._iconSettings?.containerHeight ?? this._defaultIconSize, height: this._iconSettings?.containerHeight ?? this._defaultIconSize,
iconWidth: this._iconSettings?.width ?? this._defaultIconSize, iconWidth: this._iconSettings?.width ?? this._defaultIconSize,
@@ -97,7 +97,7 @@ export class DataInfoComponent extends ViewBase {
this._loadingComponent = modelBuilder.loadingComponent().withItem( this._loadingComponent = modelBuilder.loadingComponent().withItem(
this._labelContainer this._labelContainer
).withProperties({ ).withProps({
loading: false loading: false
}).component(); }).component();
extensions/machine-learning/src/views/externalLanguages/addEditLanguageTab.ts
+2 -2
View File
@@ -26,7 +26,7 @@ export class AddEditLanguageTab extends LanguageViewBase {
this._dialogTab.registerContent(async view => { this._dialogTab.registerContent(async view => {
let language = this._languageUpdateModel.language; let language = this._languageUpdateModel.language;
let content = this._languageUpdateModel.content; let content = this._languageUpdateModel.content;
this.languageName = view.modelBuilder.inputBox().withProperties({ this.languageName = view.modelBuilder.inputBox().withProps({
value: language.name, value: language.name,
width: '150px', width: '150px',
enabled: !this._editMode enabled: !this._editMode
@@ -42,7 +42,7 @@ export class AddEditLanguageTab extends LanguageViewBase {
this.languageView = new LanguageContentView(this._apiWrapper, this, view.modelBuilder, formBuilder, content); this.languageView = new LanguageContentView(this._apiWrapper, this, view.modelBuilder, formBuilder, content);
if (!this._editMode) { if (!this._editMode) {
this.saveButton = view.modelBuilder.button().withProperties({ this.saveButton = view.modelBuilder.button().withProps({
label: constants.extLangInstallButtonText, label: constants.extLangInstallButtonText,
width: '100px' width: '100px'
}).component(); }).component();
extensions/machine-learning/src/views/externalLanguages/currentLanguagesTab.ts
+2 -2
View File
@@ -28,7 +28,7 @@ export class CurrentLanguagesTab extends LanguageViewBase {
// TODO: only supporting single location for now. We should add a drop down for multi locations mode // TODO: only supporting single location for now. We should add a drop down for multi locations mode
// //
let locationTitle = await this.getServerTitle(); let locationTitle = await this.getServerTitle();
this._locationComponent = view.modelBuilder.text().withProperties({ this._locationComponent = view.modelBuilder.text().withProps({
value: locationTitle value: locationTitle
}).component(); }).component();
@@ -46,7 +46,7 @@ export class CurrentLanguagesTab extends LanguageViewBase {
this._loader = view.modelBuilder.loadingComponent() this._loader = view.modelBuilder.loadingComponent()
.withItem(formModel) .withItem(formModel)
.withProperties({ .withProps({
loading: true loading: true
}).component(); }).component();
extensions/machine-learning/src/views/externalLanguages/fileBrowserDialog.ts
+2 -2
View File
@@ -30,10 +30,10 @@ export class FileBrowserDialog {
this._fileBrowserDialog.content = [fileBrowserTab]; this._fileBrowserDialog.content = [fileBrowserTab];
fileBrowserTab.registerContent(async (view) => { fileBrowserTab.registerContent(async (view) => {
this._fileBrowserTree = view.modelBuilder.fileBrowserTree() this._fileBrowserTree = view.modelBuilder.fileBrowserTree()
.withProperties({ ownerUri: this.ownerUri, width: 420, height: 700 }) .withProps({ ownerUri: this.ownerUri, width: 420, height: 700 })
.component(); .component();
this._selectedPathTextBox = view.modelBuilder.inputBox() this._selectedPathTextBox = view.modelBuilder.inputBox()
.withProperties({ inputType: 'text' }) .withProps({ inputType: 'text' })
.component(); .component();
this._fileBrowserTree.onDidChange((args) => { this._fileBrowserTree.onDidChange((args) => {
if (this._selectedPathTextBox) { if (this._selectedPathTextBox) {
extensions/machine-learning/src/views/externalLanguages/languageContentView.ts
+6 -6
View File
@@ -31,7 +31,7 @@ export class LanguageContentView extends LanguageViewBase {
) { ) {
super(apiWrapper, parent.root, parent); super(apiWrapper, parent.root, parent);
this._localPath = this._modelBuilder.radioButton() this._localPath = this._modelBuilder.radioButton()
.withProperties({ .withProps({
value: 'local', value: 'local',
name: 'extensionLocation', name: 'extensionLocation',
label: constants.extLangLocal, label: constants.extLangLocal,
@@ -39,7 +39,7 @@ export class LanguageContentView extends LanguageViewBase {
}).component(); }).component();
this._serverPath = this._modelBuilder.radioButton() this._serverPath = this._modelBuilder.radioButton()
.withProperties({ .withProps({
value: 'server', value: 'server',
name: 'extensionLocation', name: 'extensionLocation',
label: this.getServerTitle(), label: this.getServerTitle(),
@@ -62,7 +62,7 @@ export class LanguageContentView extends LanguageViewBase {
this._localPath, this._serverPath] this._localPath, this._serverPath]
).component(); ).component();
this.extensionFile = this._modelBuilder.inputBox().withProperties({ this.extensionFile = this._modelBuilder.inputBox().withProps({
value: '', value: '',
width: parent.componentMaxLength - parent.browseButtonMaxLength - parent.spaceBetweenComponentsLength width: parent.componentMaxLength - parent.browseButtonMaxLength - parent.spaceBetweenComponentsLength
}).component(); }).component();
@@ -89,16 +89,16 @@ export class LanguageContentView extends LanguageViewBase {
this.onOpenFileBrowser({ filePath: '', target: this._isLocalPath ? constants.localhost : this.connectionUrl }); this.onOpenFileBrowser({ filePath: '', target: this._isLocalPath ? constants.localhost : this.connectionUrl });
}); });
this.extensionFileName = this._modelBuilder.inputBox().withProperties({ this.extensionFileName = this._modelBuilder.inputBox().withProps({
value: '', value: '',
width: parent.componentMaxLength width: parent.componentMaxLength
}).component(); }).component();
this.envVariables = this._modelBuilder.inputBox().withProperties({ this.envVariables = this._modelBuilder.inputBox().withProps({
value: '', value: '',
width: parent.componentMaxLength width: parent.componentMaxLength
}).component(); }).component();
this.parameters = this._modelBuilder.inputBox().withProperties({ this.parameters = this._modelBuilder.inputBox().withProps({
value: '', value: '',
width: parent.componentMaxLength width: parent.componentMaxLength
}).component(); }).component();
extensions/machine-learning/src/views/externalLanguages/languagesTable.ts
+2 -2
View File
@@ -118,7 +118,7 @@ export class LanguagesTable extends LanguageViewBase {
private createTableRow(language: mssql.ExternalLanguage, content: mssql.ExternalLanguageContent): azdata.DeclarativeTableCellValue[] { private createTableRow(language: mssql.ExternalLanguage, content: mssql.ExternalLanguageContent): azdata.DeclarativeTableCellValue[] {
if (this._modelBuilder) { if (this._modelBuilder) {
let dropLanguageButton = this._modelBuilder.button().withProperties({ let dropLanguageButton = this._modelBuilder.button().withProps({
label: '', label: '',
title: constants.deleteTitle, title: constants.deleteTitle,
iconPath: { iconPath: {
@@ -136,7 +136,7 @@ export class LanguagesTable extends LanguageViewBase {
}); });
}); });
let editLanguageButton = this._modelBuilder.button().withProperties({ let editLanguageButton = this._modelBuilder.button().withProps({
label: '', label: '',
title: constants.editTitle, title: constants.editTitle,
iconPath: { iconPath: {
extensions/machine-learning/src/views/models/azureModelsComponent.ts
+1 -1
View File
@@ -42,7 +42,7 @@ export class AzureModelsComponent extends ModelViewBase implements IDataComponen
this.azureSignInComponent = new AzureSignInComponent(this._apiWrapper, modelBuilder, this); this.azureSignInComponent = new AzureSignInComponent(this._apiWrapper, modelBuilder, this);
this._loader = modelBuilder.loadingComponent() this._loader = modelBuilder.loadingComponent()
.withItem(this.azureModelsTable.component) .withItem(this.azureModelsTable.component)
.withProperties({ .withProps({
loading: true loading: true
}).component(); }).component();
this.azureModelsTable.onModelSelectionChanged(async () => { this.azureModelsTable.onModelSelectionChanged(async () => {
extensions/machine-learning/src/views/models/azureModelsTable.ts
+2 -4
View File
@@ -161,9 +161,7 @@ export class AzureModelsTable extends ModelViewBase implements IDataComponent<Wo
this._onModelSelectionChanged.fire(); this._onModelSelectionChanged.fire();
}; };
if (this._multiSelect) { if (this._multiSelect) {
const checkbox = this._modelBuilder.checkBox().withProperties({ const checkbox = this._modelBuilder.checkBox().withProps({
name: 'amlModel',
value: model.id,
width: 15, width: 15,
height: 15, height: 15,
checked: false checked: false
@@ -173,7 +171,7 @@ export class AzureModelsTable extends ModelViewBase implements IDataComponent<Wo
}); });
selectModelButton = checkbox; selectModelButton = checkbox;
} else { } else {
const radioButton = this._modelBuilder.radioButton().withProperties({ const radioButton = this._modelBuilder.radioButton().withProps({
name: 'amlModel', name: 'amlModel',
value: model.id, value: model.id,
width: 15, width: 15,
extensions/machine-learning/src/views/models/azureResourceFilterComponent.ts
+4 -4
View File
@@ -35,16 +35,16 @@ export class AzureResourceFilterComponent extends ModelViewBase implements IData
*/ */
constructor(apiWrapper: ApiWrapper, private _modelBuilder: azdata.ModelBuilder, parent: ModelViewBase) { constructor(apiWrapper: ApiWrapper, private _modelBuilder: azdata.ModelBuilder, parent: ModelViewBase) {
super(apiWrapper, parent.root, parent); super(apiWrapper, parent.root, parent);
this._accounts = this._modelBuilder.dropDown().withProperties({ this._accounts = this._modelBuilder.dropDown().withProps({
width: componentWidth width: componentWidth
}).component(); }).component();
this._subscriptions = this._modelBuilder.dropDown().withProperties({ this._subscriptions = this._modelBuilder.dropDown().withProps({
width: componentWidth width: componentWidth
}).component(); }).component();
this._groups = this._modelBuilder.dropDown().withProperties({ this._groups = this._modelBuilder.dropDown().withProps({
width: componentWidth width: componentWidth
}).component(); }).component();
this._workspaces = this._modelBuilder.dropDown().withProperties({ this._workspaces = this._modelBuilder.dropDown().withProps({
width: componentWidth width: componentWidth
}).component(); }).component();
extensions/machine-learning/src/views/models/localModelsComponent.ts
+2 -2
View File
@@ -33,11 +33,11 @@ export class LocalModelsComponent extends ModelViewBase implements IDataComponen
* @param modelBuilder Register the components * @param modelBuilder Register the components
*/ */
public registerComponent(modelBuilder: azdata.ModelBuilder): azdata.Component { public registerComponent(modelBuilder: azdata.ModelBuilder): azdata.Component {
this._localPath = modelBuilder.inputBox().withProperties({ this._localPath = modelBuilder.inputBox().withProps({
value: '', value: '',
width: this.componentMaxLength - this.browseButtonMaxLength - this.spaceBetweenComponentsLength width: this.componentMaxLength - this.browseButtonMaxLength - this.spaceBetweenComponentsLength
}).component(); }).component();
this._localBrowse = modelBuilder.button().withProperties({ this._localBrowse = modelBuilder.button().withProps({
iconPath: { light: this.asAbsolutePath('images/light/browseLocal.svg'), dark: this.asAbsolutePath('images/dark/browseLocal.svg') }, iconPath: { light: this.asAbsolutePath('images/light/browseLocal.svg'), dark: this.asAbsolutePath('images/dark/browseLocal.svg') },
iconHeight: '24px', iconHeight: '24px',
iconWidth: '24px', iconWidth: '24px',
extensions/machine-learning/src/views/models/manageModels/currentModelsComponent.ts
+5 -6
View File
@@ -66,9 +66,8 @@ export class CurrentModelsComponent extends ModelViewBase implements IPageView {
let dataCountString: string = constants.getDataCount(0); let dataCountString: string = constants.getDataCount(0);
this._tableDataCountContainer = modelBuilder.flexContainer().component(); this._tableDataCountContainer = modelBuilder.flexContainer().component();
this._tableDataCountComponent = modelBuilder.text().withProperties({ this._tableDataCountComponent = modelBuilder.text().withProps({
value: dataCountString, value: dataCountString
margin: '0'
}).component(); }).component();
this._tableDataCountContainer.addItem(this._tableDataCountComponent, this._tableDataCountContainer.addItem(this._tableDataCountComponent,
{ {
@@ -82,7 +81,7 @@ export class CurrentModelsComponent extends ModelViewBase implements IPageView {
let formModelBuilder = modelBuilder.formContainer(); let formModelBuilder = modelBuilder.formContainer();
this._loader = modelBuilder.loadingComponent() this._loader = modelBuilder.loadingComponent()
.withItem(formModelBuilder.component()) .withItem(formModelBuilder.component())
.withProperties({ .withProps({
loading: true loading: true
}).component(); }).component();
this._emptyModelsComponent = new DataInfoComponent(this._apiWrapper, this); this._emptyModelsComponent = new DataInfoComponent(this._apiWrapper, this);
@@ -108,13 +107,13 @@ export class CurrentModelsComponent extends ModelViewBase implements IPageView {
flexFlow: 'column', flexFlow: 'column',
width: '452px' width: '452px'
}).component(); }).component();
this._subheadingTextComponent = modelBuilder.text().withProperties(<azdata.CheckBoxProperties>{ this._subheadingTextComponent = modelBuilder.text().withProps(<azdata.CheckBoxProperties>{
value: this.modelActionType === ModelActionType.Import ? constants.viewImportModelsDesc : constants.viewImportModeledForPredictDesc, value: this.modelActionType === ModelActionType.Import ? constants.viewImportModelsDesc : constants.viewImportModeledForPredictDesc,
CSSStyles: { CSSStyles: {
'font-size': '13px' 'font-size': '13px'
} }
}).component(); }).component();
this._subheadingLinkComponent = modelBuilder.hyperlink().withProperties({ this._subheadingLinkComponent = modelBuilder.hyperlink().withProps({
label: constants.learnMoreLink, label: constants.learnMoreLink,
url: constants.importModelsDoc, url: constants.importModelsDoc,
CSSStyles: { CSSStyles: {
extensions/machine-learning/src/views/models/manageModels/currentModelsTable.ts
+9 -11
View File
@@ -161,7 +161,7 @@ export class CurrentModelsTable extends ModelViewBase implements IDataComponent<
.component(); .component();
this._loader = modelBuilder.loadingComponent() this._loader = modelBuilder.loadingComponent()
.withItem(this._table) .withItem(this._table)
.withProperties({ .withProps({
loading: true loading: true
}).component(); }).component();
return this._loader; return this._loader;
@@ -265,24 +265,22 @@ export class CurrentModelsTable extends ModelViewBase implements IDataComponent<
this.onModelSelected(); this.onModelSelected();
}; };
if (this._settings.multiSelect) { if (this._settings.multiSelect) {
const checkbox = this._modelBuilder.checkBox().withProperties({ const checkbox = this._modelBuilder.checkBox().withProps({
name: 'amlModel',
value: model.id,
width: 15, width: 15,
height: 15, height: 15,
checked: this._selectedModels && this._selectedModels.find(x => x.id === model.id) checked: !!this._selectedModels.find(x => x.id === model.id)
}).component(); }).component();
checkbox.onChanged(() => { checkbox.onChanged(() => {
onSelectItem(checkbox.checked || false); onSelectItem(checkbox.checked || false);
}); });
selectModelButton = checkbox; selectModelButton = checkbox;
} else { } else {
const radioButton = this._modelBuilder.radioButton().withProperties({ const radioButton = this._modelBuilder.radioButton().withProps({
name: 'amlModel', name: 'amlModel',
value: model.id, value: String(model.id),
width: 15, width: 15,
height: 15, height: 15,
checked: this._selectedModels && this._selectedModels.find(x => x.id === model.id) checked: !!this._selectedModels.find(x => x.id === model.id)
}).component(); }).component();
radioButton.onDidClick(() => { radioButton.onDidClick(() => {
onSelectItem(radioButton.checked || false); onSelectItem(radioButton.checked || false);
@@ -298,7 +296,7 @@ export class CurrentModelsTable extends ModelViewBase implements IDataComponent<
let predictButton: azdata.ButtonComponent | undefined = undefined; let predictButton: azdata.ButtonComponent | undefined = undefined;
let editButton: azdata.ButtonComponent | undefined = undefined; let editButton: azdata.ButtonComponent | undefined = undefined;
if (this._modelBuilder && this._settings.editable) { if (this._modelBuilder && this._settings.editable) {
dropButton = this._modelBuilder.button().withProperties({ dropButton = this._modelBuilder.button().withProps({
label: '', label: '',
title: constants.deleteTitle, title: constants.deleteTitle,
iconPath: { iconPath: {
@@ -321,7 +319,7 @@ export class CurrentModelsTable extends ModelViewBase implements IDataComponent<
this.showErrorMessage(`${constants.updateModelFailedError} ${constants.getErrorMessage(error)}`); this.showErrorMessage(`${constants.updateModelFailedError} ${constants.getErrorMessage(error)}`);
} }
}); });
predictButton = this._modelBuilder.button().withProperties({ predictButton = this._modelBuilder.button().withProps({
label: '', label: '',
title: constants.predictModel, title: constants.predictModel,
iconPath: { iconPath: {
@@ -335,7 +333,7 @@ export class CurrentModelsTable extends ModelViewBase implements IDataComponent<
await this.sendDataRequest(PredictWizardEventName, [model]); await this.sendDataRequest(PredictWizardEventName, [model]);
}); });
editButton = this._modelBuilder.button().withProperties({ editButton = this._modelBuilder.button().withProps({
label: '', label: '',
title: constants.editTitle, title: constants.editTitle,
iconPath: { iconPath: {
extensions/machine-learning/src/views/models/manageModels/modelDetailsComponent.ts
+6 -6
View File
@@ -34,23 +34,23 @@ export class ModelDetailsComponent extends ModelViewBase implements IDataCompone
* @param modelBuilder model builder * @param modelBuilder model builder
*/ */
public registerComponent(modelBuilder: azdata.ModelBuilder): azdata.Component { public registerComponent(modelBuilder: azdata.ModelBuilder): azdata.Component {
this._createdComponent = modelBuilder.text().withProperties({ this._createdComponent = modelBuilder.text().withProps({
value: this._model.created value: this._model.created
}).component(); }).component();
this._deployedComponent = modelBuilder.text().withProperties({ this._deployedComponent = modelBuilder.text().withProps({
value: this._model.deploymentTime value: this._model.deploymentTime
}).component(); }).component();
this._frameworkComponent = modelBuilder.text().withProperties({ this._frameworkComponent = modelBuilder.text().withProps({
value: this._model.framework value: this._model.framework
}).component(); }).component();
this._frameworkVersionComponent = modelBuilder.text().withProperties({ this._frameworkVersionComponent = modelBuilder.text().withProps({
value: this._model.frameworkVersion value: this._model.frameworkVersion
}).component(); }).component();
this._nameComponent = modelBuilder.inputBox().withProperties({ this._nameComponent = modelBuilder.inputBox().withProps({
width: this.componentMaxLength, width: this.componentMaxLength,
value: this._model.modelName value: this._model.modelName
}).component(); }).component();
this._descriptionComponent = modelBuilder.inputBox().withProperties({ this._descriptionComponent = modelBuilder.inputBox().withProps({
width: this.componentMaxLength, width: this.componentMaxLength,
value: this._model.description, value: this._model.description,
multiline: true, multiline: true,
extensions/machine-learning/src/views/models/modelSourcesComponent.ts
+2 -2
View File
@@ -92,7 +92,7 @@ export class ModelSourcesComponent extends ModelViewBase implements IDataCompone
} }
}); });
let radioCardGroup = modelBuilder.radioCardGroup() let radioCardGroup = modelBuilder.radioCardGroup()
.withProperties({ .withProps({
cards: components, cards: components,
iconHeight: '100px', iconHeight: '100px',
iconWidth: '100px', iconWidth: '100px',
@@ -104,7 +104,7 @@ export class ModelSourcesComponent extends ModelViewBase implements IDataCompone
this._flexContainer = modelBuilder.flexContainer().withLayout({ this._flexContainer = modelBuilder.flexContainer().withLayout({
flexFlow: 'column' flexFlow: 'column'
}).withItems([radioCardGroup]).component(); }).withItems([radioCardGroup]).component();
this._selectedSourceLabel = modelBuilder.text().withProperties({ this._selectedSourceLabel = modelBuilder.text().withProps({
value: this.getSourceTypeDescription(this._sourceType), value: this.getSourceTypeDescription(this._sourceType),
CSSStyles: { CSSStyles: {
'font-size': '13px', 'font-size': '13px',
extensions/machine-learning/src/views/models/modelsDetailsTableComponent.ts
+3 -3
View File
@@ -129,12 +129,12 @@ export class ModelsDetailsTableComponent extends ModelViewBase implements IDataC
private createTableRow(model: ModelViewData | undefined): any[] { private createTableRow(model: ModelViewData | undefined): any[] {
if (this._modelBuilder && model && model.modelDetails) { if (this._modelBuilder && model && model.modelDetails) {
const nameComponent = this._modelBuilder.inputBox().withProperties({ const nameComponent = this._modelBuilder.inputBox().withProps({
value: model.modelDetails.modelName, value: model.modelDetails.modelName,
width: this.componentMaxLength - 100, width: this.componentMaxLength - 100,
required: true required: true
}).component(); }).component();
const descriptionComponent = this._modelBuilder.inputBox().withProperties({ const descriptionComponent = this._modelBuilder.inputBox().withProps({
value: model.modelDetails.description, value: model.modelDetails.description,
width: this.componentMaxLength width: this.componentMaxLength
}).component(); }).component();
@@ -148,7 +148,7 @@ export class ModelsDetailsTableComponent extends ModelViewBase implements IDataC
model.modelDetails.modelName = nameComponent.value || ''; model.modelDetails.modelName = nameComponent.value || '';
} }
}); });
let deleteButton = this._modelBuilder.button().withProperties({ let deleteButton = this._modelBuilder.button().withProps({
label: '', label: '',
title: constants.deleteTitle, title: constants.deleteTitle,
width: 15, width: 15,
extensions/machine-learning/src/views/models/prediction/columnsTable.ts
+10 -10
View File
@@ -134,7 +134,7 @@ export class ColumnsTable extends ModelViewBase implements IDataComponent<Predic
.component(); .component();
this._loader = modelBuilder.loadingComponent() this._loader = modelBuilder.loadingComponent()
.withItem(this._table) .withItem(this._table)
.withProperties({ .withProps({
loading: true loading: true
}).component(); }).component();
return this._loader; return this._loader;
@@ -233,7 +233,7 @@ export class ColumnsTable extends ModelViewBase implements IDataComponent<Predic
CSSStyles: css CSSStyles: css
}); });
} }
let nameInput = this._modelBuilder.dropDown().withProperties({ let nameInput = this._modelBuilder.dropDown().withProps({
values: dataTypes, values: dataTypes,
width: this.componentMaxLength, width: this.componentMaxLength,
value: dataType value: dataType
@@ -264,7 +264,7 @@ export class ColumnsTable extends ModelViewBase implements IDataComponent<Predic
} }
}); });
let displayNameInput = this._modelBuilder.inputBox().withProperties({ let displayNameInput = this._modelBuilder.inputBox().withProps({
value: name, value: name,
width: 200 width: 200
}).component(); }).component();
@@ -294,7 +294,7 @@ export class ColumnsTable extends ModelViewBase implements IDataComponent<Predic
column = values.length > 0 ? values[0] : undefined; column = values.length > 0 ? values[0] : undefined;
} }
const currentColumn = columns.find(x => x.columnName === column?.name); const currentColumn = columns.find(x => x.columnName === column?.name);
let nameInput = this._modelBuilder.dropDown().withProperties({ let nameInput = this._modelBuilder.dropDown().withProps({
values: values, values: values,
value: column, value: column,
width: this.componentMaxLength width: this.componentMaxLength
@@ -348,7 +348,7 @@ export class ColumnsTable extends ModelViewBase implements IDataComponent<Predic
} }
}); });
const label = this._modelBuilder.inputBox().withProperties({ const label = this._modelBuilder.inputBox().withProps({
value: `${name}(${modelParameter.originalType ? modelParameter.originalType : constants.unsupportedModelParameterType})`, value: `${name}(${modelParameter.originalType ? modelParameter.originalType : constants.unsupportedModelParameterType})`,
enabled: false, enabled: false,
width: this.componentMaxLength width: this.componentMaxLength
@@ -367,7 +367,7 @@ export class ColumnsTable extends ModelViewBase implements IDataComponent<Predic
CSSStyles: css CSSStyles: css
}); });
} }
const image = this._modelBuilder.image().withProperties({ const image = this._modelBuilder.image().withProps({
width: 50, width: 50,
height: 50, height: 50,
iconPath: { iconPath: {
@@ -385,7 +385,7 @@ export class ColumnsTable extends ModelViewBase implements IDataComponent<Predic
} }
private createWarningButton(): azdata.ButtonComponent { private createWarningButton(): azdata.ButtonComponent {
const warningButton = this._modelBuilder.button().withProperties({ const warningButton = this._modelBuilder.button().withProps({
width: `${WarningButtonDimensions.width}px`, width: `${WarningButtonDimensions.width}px`,
height: `${WarningButtonDimensions.height}px`, height: `${WarningButtonDimensions.height}px`,
title: constants.columnDataTypeMismatchWarningHelper, title: constants.columnDataTypeMismatchWarningHelper,
@@ -407,8 +407,8 @@ export class ColumnsTable extends ModelViewBase implements IDataComponent<Predic
const dialog = azdata.window.createModelViewDialog(dialogHeading, dialogName, 288, 'callout', 'left', true, false, dialogProperties); const dialog = azdata.window.createModelViewDialog(dialogHeading, dialogName, 288, 'callout', 'left', true, false, dialogProperties);
const warningTab: azdata.window.DialogTab = azdata.window.createTab('warning'); const warningTab: azdata.window.DialogTab = azdata.window.createTab('warning');
warningTab.registerContent(async view => { warningTab.registerContent(async view => {
const warningContentContainer = view.modelBuilder.divContainer().withProperties({}).component(); const warningContentContainer = view.modelBuilder.divContainer().withProps({}).component();
const messageTextComponent = view.modelBuilder.text().withProperties({ const messageTextComponent = view.modelBuilder.text().withProps({
value: calloutMessageText, value: calloutMessageText,
CSSStyles: { CSSStyles: {
'font-size': '12px', 'font-size': '12px',
@@ -419,7 +419,7 @@ export class ColumnsTable extends ModelViewBase implements IDataComponent<Predic
warningContentContainer.addItem(messageTextComponent); warningContentContainer.addItem(messageTextComponent);
if (calloutMessageLinkText && calloutMessageLinkUrl) { if (calloutMessageLinkText && calloutMessageLinkUrl) {
const messageLinkComponent = view.modelBuilder.hyperlink().withProperties({ const messageLinkComponent = view.modelBuilder.hyperlink().withProps({
label: calloutMessageLinkText, label: calloutMessageLinkText,
url: calloutMessageLinkUrl, url: calloutMessageLinkUrl,
CSSStyles: { CSSStyles: {
extensions/machine-learning/src/views/models/tableSelectionComponent.ts
+5 -5
View File
@@ -56,10 +56,10 @@ export class TableSelectionComponent extends ModelViewBase implements IDataCompo
* @param modelBuilder model builder * @param modelBuilder model builder
*/ */
public registerComponent(modelBuilder: azdata.ModelBuilder): azdata.Component { public registerComponent(modelBuilder: azdata.ModelBuilder): azdata.Component {
this._databases = modelBuilder.dropDown().withProperties({ this._databases = modelBuilder.dropDown().withProps({
width: '275px' width: '275px'
}).component(); }).component();
this._tables = modelBuilder.dropDown().withProperties({ this._tables = modelBuilder.dropDown().withProps({
width: '275px' width: '275px'
}).component(); }).component();
@@ -70,19 +70,19 @@ export class TableSelectionComponent extends ModelViewBase implements IDataCompo
} }
}); });
this._existingTableButton = modelBuilder.radioButton().withProperties({ this._existingTableButton = modelBuilder.radioButton().withProps({
name: 'tableName', name: 'tableName',
value: 'existing', value: 'existing',
label: 'Existing table', label: 'Existing table',
checked: true checked: true
}).component(); }).component();
this._newTableButton = modelBuilder.radioButton().withProperties({ this._newTableButton = modelBuilder.radioButton().withProps({
name: 'tableName', name: 'tableName',
value: 'new', value: 'new',
label: 'New table', label: 'New table',
checked: false checked: false
}).component(); }).component();
this._newTableName = modelBuilder.inputBox().withProperties({ this._newTableName = modelBuilder.inputBox().withProps({
width: this.componentMaxLength - 10, width: this.componentMaxLength - 10,
enabled: false enabled: false
}).component(); }).component();
extensions/machine-learning/src/views/widgets/dashboardWidget.ts
+11 -10
View File
@@ -81,7 +81,7 @@ export class DashboardWidget {
width: maxWidth, width: maxWidth,
height: headerMaxHeight height: headerMaxHeight
}).component(); }).component();
const titleComponent = view.modelBuilder.text().withProperties({ const titleComponent = view.modelBuilder.text().withProps({
value: constants.dashboardTitle, value: constants.dashboardTitle,
CSSStyles: { CSSStyles: {
'font-size': '36px', 'font-size': '36px',
@@ -90,7 +90,7 @@ export class DashboardWidget {
'margin': '0px' 'margin': '0px'
} }
}).component(); }).component();
const descComponent = view.modelBuilder.text().withProperties({ const descComponent = view.modelBuilder.text().withProps({
value: constants.dashboardDesc, value: constants.dashboardDesc,
CSSStyles: { CSSStyles: {
'font-size': '14px', 'font-size': '14px',
@@ -159,7 +159,7 @@ export class DashboardWidget {
height: '500px', height: '500px',
justifyContent: 'flex-start' justifyContent: 'flex-start'
}).component(); }).component();
const titleComponent = view.modelBuilder.text().withProperties({ const titleComponent = view.modelBuilder.text().withProps({
value: constants.dashboardVideoLinksTitle, value: constants.dashboardVideoLinksTitle,
CSSStyles: { CSSStyles: {
'font-size': '18px', 'font-size': '18px',
@@ -216,10 +216,11 @@ export class DashboardWidget {
width: 'auto', width: 'auto',
justifyContent: 'flex-start' justifyContent: 'flex-start'
}).component(); }).component();
const showMoreComponent = view.modelBuilder.hyperlink().withProperties({ const showMoreComponent = view.modelBuilder.hyperlink().withProps({
label: constants.showMoreTitle label: constants.showMoreTitle,
url: ''
}).component(); }).component();
const image = view.modelBuilder.image().withProperties({ const image = view.modelBuilder.image().withProps({
width: '10px', width: '10px',
height: '10px', height: '10px',
iconPath: { iconPath: {
@@ -280,12 +281,12 @@ export class DashboardWidget {
width: maxWidth, width: maxWidth,
justifyContent: 'flex-start' justifyContent: 'flex-start'
}).component(); }).component();
const video1Container = view.modelBuilder.divContainer().withProperties({ const video1Container = view.modelBuilder.divContainer().withProps({
clickable: true, clickable: true,
width: maxWidth, width: maxWidth,
height: '100px' height: '100px'
}).component(); }).component();
const descriptionComponent = view.modelBuilder.text().withProperties({ const descriptionComponent = view.modelBuilder.text().withProps({
value: linkMetaData.description, value: linkMetaData.description,
width: maxWidth, width: maxWidth,
height: '50px', height: '50px',
@@ -325,7 +326,7 @@ export class DashboardWidget {
width: maxWidth, width: maxWidth,
height: '300px', height: '300px',
}).component(); }).component();
const titleComponent = view.modelBuilder.text().withProperties({ const titleComponent = view.modelBuilder.text().withProps({
value: constants.dashboardLinksTitle, value: constants.dashboardLinksTitle,
CSSStyles: { CSSStyles: {
'font-size': '18px', 'font-size': '18px',
@@ -391,7 +392,7 @@ export class DashboardWidget {
width: maxWidth, width: maxWidth,
justifyContent: 'flex-start' justifyContent: 'flex-start'
}).component(); }).component();
const descriptionComponent = view.modelBuilder.text().withProperties({ const descriptionComponent = view.modelBuilder.text().withProps({
value: linkMetaData.description, value: linkMetaData.description,
width: maxWidth, width: maxWidth,
CSSStyles: { CSSStyles: {
extensions/mssql/src/hdfs/ui/hdfsManageAccessDialog.ts
+4 -4
View File
@@ -188,7 +188,7 @@ export class ManageAccessDialog {
.component(); .component();
contentContainer.addItem(addUserOrGroupTitle, { CSSStyles: { 'margin-top': '15px', ...cssStyles.titleCss } }); contentContainer.addItem(addUserOrGroupTitle, { CSSStyles: { 'margin-top': '15px', ...cssStyles.titleCss } });
const typeContainer = this.modelBuilder.flexContainer().withProperties({ flexFlow: 'row' }).component(); const typeContainer = this.modelBuilder.flexContainer().component();
const aclEntryTypeGroup = 'aclEntryType'; const aclEntryTypeGroup = 'aclEntryType';
const userTypeButton = this.createRadioButton(this.modelBuilder, loc.userLabel, aclEntryTypeGroup, AclType.user); const userTypeButton = this.createRadioButton(this.modelBuilder, loc.userLabel, aclEntryTypeGroup, AclType.user);
const groupTypeButton = this.createRadioButton(this.modelBuilder, loc.groupLabel, aclEntryTypeGroup, AclType.group); const groupTypeButton = this.createRadioButton(this.modelBuilder, loc.groupLabel, aclEntryTypeGroup, AclType.group);
@@ -197,7 +197,7 @@ export class ManageAccessDialog {
typeContainer.addItems([userTypeButton, groupTypeButton], { flex: '0 0 auto' }); typeContainer.addItems([userTypeButton, groupTypeButton], { flex: '0 0 auto' });
contentContainer.addItem(typeContainer, { flex: '0 0 auto', CSSStyles: { 'margin-bottom': '5px' } }); contentContainer.addItem(typeContainer, { flex: '0 0 auto', CSSStyles: { 'margin-bottom': '5px' } });
const addUserOrGroupInputRow = this.modelBuilder.flexContainer().withLayout({ flexFlow: 'row' }).component(); const addUserOrGroupInputRow = this.modelBuilder.flexContainer().component();
this.addUserOrGroupInput = this.modelBuilder.inputBox() this.addUserOrGroupInput = this.modelBuilder.inputBox()
.withProperties<azdata.InputBoxProperties>({ .withProperties<azdata.InputBoxProperties>({
@@ -566,7 +566,7 @@ export class ManageAccessDialog {
// Only show default section for directories // Only show default section for directories
if (this.hdfsModel.fileStatus.type === HdfsFileType.Directory) { if (this.hdfsModel.fileStatus.type === HdfsFileType.Directory) {
// Middle spacer // Middle spacer
const middleSpacer = this.modelBuilder.text().withProperties({ CSSStyles: { 'width': `${middleSpacerWidth}px`, 'min-width': `${middleSpacerWidth}px` } }).component(); const middleSpacer = this.modelBuilder.text().withProps({ CSSStyles: { 'width': `${middleSpacerWidth}px`, 'min-width': `${middleSpacerWidth}px` } }).component();
sectionHeaderContainer.addItem(middleSpacer, { flex: '0 0 auto' }); sectionHeaderContainer.addItem(middleSpacer, { flex: '0 0 auto' });
// Default // Default
@@ -586,7 +586,7 @@ export class ManageAccessDialog {
} }
// Right spacer // Right spacer
const rightSpacer = this.modelBuilder.text().withProperties({ CSSStyles: { 'width': `${rightSpacerWidth}px`, 'min-width': `${rightSpacerWidth}px` } }).component(); const rightSpacer = this.modelBuilder.text().withProps({ CSSStyles: { 'width': `${rightSpacerWidth}px`, 'min-width': `${rightSpacerWidth}px` } }).component();
sectionHeaderContainer.addItem(rightSpacer, { flex: '0 0 auto' }); sectionHeaderContainer.addItem(rightSpacer, { flex: '0 0 auto' });
return sectionHeaderContainer; return sectionHeaderContainer;
extensions/mssql/src/sparkFeature/dialog/sparkJobSubmission/sparkConfigurationTab.ts
+5 -6
View File
@@ -56,7 +56,7 @@ export class SparkConfigurationTab {
let formContainer = builder.formContainer(); let formContainer = builder.formContainer();
this._jobNameInputBox = builder.inputBox().withProperties({ this._jobNameInputBox = builder.inputBox().withProps({
placeHolder: localize('sparkJobSubmission.JobNamePlaceHolder', "Enter a name ..."), placeHolder: localize('sparkJobSubmission.JobNamePlaceHolder', "Enter a name ..."),
value: (this._path) ? fspath.basename(this._path) : '' value: (this._path) ? fspath.basename(this._path) : ''
}).component(); }).component();
@@ -67,7 +67,7 @@ export class SparkConfigurationTab {
required: true required: true
}, baseFormItemLayout); }, baseFormItemLayout);
this._sparkContextLabel = builder.text().withProperties({ this._sparkContextLabel = builder.text().withProps({
value: this._dataModel.getSparkClusterUrl() value: this._dataModel.getSparkClusterUrl()
}).component(); }).component();
formContainer.addFormItem({ formContainer.addFormItem({
@@ -104,7 +104,7 @@ export class SparkConfigurationTab {
} }
}); });
this._sparkSourceFileInputBox = builder.inputBox().withProperties({ this._sparkSourceFileInputBox = builder.inputBox().withProps({
required: true, required: true,
placeHolder: localize('sparkJobSubmission.FilePathPlaceHolder', "Path to a .jar or .py file"), placeHolder: localize('sparkJobSubmission.FilePathPlaceHolder', "Path to a .jar or .py file"),
value: (this._path) ? this._path : '' value: (this._path) ? this._path : ''
@@ -133,8 +133,7 @@ export class SparkConfigurationTab {
} }
}); });
this._filePickerButton = builder.button().withProperties({ this._filePickerButton = builder.button().withProps({
required: (this._path) ? false : true,
enabled: (this._path) ? false : true, enabled: (this._path) ? false : true,
label: '•••', label: '•••',
width: constants.mssqlClusterSparkJobFileSelectorButtonWidth, width: constants.mssqlClusterSparkJobFileSelectorButtonWidth,
@@ -156,7 +155,7 @@ export class SparkConfigurationTab {
alignContent: 'stretch' alignContent: 'stretch'
}); });
this._localUploadDestinationLabel = builder.text().withProperties({ this._localUploadDestinationLabel = builder.text().withProps({
value: (this._path) ? '' : LocalizedConstants.sparkLocalFileDestinationHint value: (this._path) ? '' : LocalizedConstants.sparkLocalFileDestinationHint
}).component(); }).component();
this._sourceFlexContainerWithHint = builder.flexContainer().component(); this._sourceFlexContainerWithHint = builder.flexContainer().component();
extensions/notebook/src/dialog/addFileDialog.ts
+3 -3
View File
@@ -46,19 +46,19 @@ export class AddFileDialog {
this._dialog.registerContent(async view => { this._dialog.registerContent(async view => {
this.view = view; this.view = view;
this._fileNameInputBox = this.view.modelBuilder.inputBox() this._fileNameInputBox = this.view.modelBuilder.inputBox()
.withProperties({ .withProps({
enabled: true, enabled: true,
width: '400px' width: '400px'
}).component(); }).component();
this._titleInputBox = this.view.modelBuilder.inputBox() this._titleInputBox = this.view.modelBuilder.inputBox()
.withProperties({ .withProps({
enabled: true, enabled: true,
width: '400px' width: '400px'
}).component(); }).component();
this._saveLocationInputBox = this.view.modelBuilder.inputBox() this._saveLocationInputBox = this.view.modelBuilder.inputBox()
.withProperties({ .withProps({
value: this._bookItem.contextValue === BookTreeItemType.savedBook ? this._bookItem.rootContentPath : path.dirname(this._bookItem.resourceUri.fsPath), value: this._bookItem.contextValue === BookTreeItemType.savedBook ? this._bookItem.rootContentPath : path.dirname(this._bookItem.resourceUri.fsPath),
enabled: false, enabled: false,
width: '400px' width: '400px'
extensions/notebook/src/dialog/createBookDialog.ts
+1 -1
View File
@@ -75,7 +75,7 @@ export class CreateBookDialog {
}).component(); }).component();
const bookLabel = this.view.modelBuilder.text() const bookLabel = this.view.modelBuilder.text()
.withProperties({ .withProps({
value: loc.bookDescription, value: loc.bookDescription,
CSSStyles: { 'margin-bottom': '0px', 'margin-top': '0px', 'font-size': 'small' } CSSStyles: { 'margin-bottom': '0px', 'margin-top': '0px', 'font-size': 'small' }
}).component(); }).component();
extensions/notebook/src/dialog/managePackages/addNewPackageTab.ts
+5 -5
View File
@@ -32,7 +32,7 @@ export class AddNewPackageTab {
this.addNewPkgTab = azdata.window.createTab(localize('managePackages.addNewTabTitle', "Add new")); this.addNewPkgTab = azdata.window.createTab(localize('managePackages.addNewTabTitle', "Add new"));
this.addNewPkgTab.registerContent(async view => { this.addNewPkgTab.registerContent(async view => {
this.newPackagesSearchBar = view.modelBuilder.inputBox().withProperties({ width: '400px' }).component(); this.newPackagesSearchBar = view.modelBuilder.inputBox().withProps({ width: '400px' }).component();
// Search package by name when pressing enter // Search package by name when pressing enter
this.newPackagesSearchBar.onEnterKeyPressed(async () => { this.newPackagesSearchBar.onEnterKeyPressed(async () => {
await this.loadNewPackageInfo(); await this.loadNewPackageInfo();
@@ -48,22 +48,22 @@ export class AddNewPackageTab {
await this.loadNewPackageInfo(); await this.loadNewPackageInfo();
}); });
this.newPackagesName = view.modelBuilder.text().withProperties({ width: '400px' }).component(); this.newPackagesName = view.modelBuilder.text().withProps({ width: '400px' }).component();
this.newPackagesNameLoader = view.modelBuilder.loadingComponent() this.newPackagesNameLoader = view.modelBuilder.loadingComponent()
.withItem(this.newPackagesName) .withItem(this.newPackagesName)
.component(); .component();
this.newPackagesVersions = view.modelBuilder.dropDown().withProperties({ width: '400px' }).component(); this.newPackagesVersions = view.modelBuilder.dropDown().withProps({ width: '400px' }).component();
this.newPackagesVersionsLoader = view.modelBuilder.loadingComponent() this.newPackagesVersionsLoader = view.modelBuilder.loadingComponent()
.withItem(this.newPackagesVersions) .withItem(this.newPackagesVersions)
.component(); .component();
this.newPackagesSummary = view.modelBuilder.text().withProperties({ width: '400px' }).component(); this.newPackagesSummary = view.modelBuilder.text().withProps({ width: '400px' }).component();
this.newPackagesSummaryLoader = view.modelBuilder.loadingComponent() this.newPackagesSummaryLoader = view.modelBuilder.loadingComponent()
.withItem(this.newPackagesSummary) .withItem(this.newPackagesSummary)
.component(); .component();
this.packageInstallButton = view.modelBuilder.button().withProperties({ this.packageInstallButton = view.modelBuilder.button().withProps({
label: localize('managePackages.installButtonText', "Install"), label: localize('managePackages.installButtonText', "Install"),
width: '200px', width: '200px',
secondary: true secondary: true
extensions/notebook/src/dialog/managePackages/installedPackagesTab.ts
+8 -8
View File
@@ -52,9 +52,9 @@ export class InstalledPackagesTab {
}; };
}); });
let defaultPackageType = this.dialog.model.getDefaultPackageType(); let defaultPackageType = this.dialog.model.getDefaultPackageType();
this.packageTypeDropdown = view.modelBuilder.dropDown().withProperties({ this.packageTypeDropdown = view.modelBuilder.dropDown().withProps({
values: dropdownValues, values: dropdownValues,
value: defaultPackageType value: defaultPackageType.providerId
}).component(); }).component();
this.dialog.changeProvider(defaultPackageType.providerId); this.dialog.changeProvider(defaultPackageType.providerId);
this.packageTypeDropdown.onValueChanged(async () => { this.packageTypeDropdown.onValueChanged(async () => {
@@ -69,12 +69,12 @@ export class InstalledPackagesTab {
}); });
this.installedPackageCount = view.modelBuilder.text().withProperties({ this.installedPackageCount = view.modelBuilder.text().withProps({
value: '' value: ''
}).component(); }).component();
this.installedPackagesTable = view.modelBuilder.table() this.installedPackagesTable = view.modelBuilder.table()
.withProperties({ .withProps({
columns: [ columns: [
{ {
value: localize('managePackages.pkgNameColumn', "Name"), value: localize('managePackages.pkgNameColumn', "Name"),
@@ -128,7 +128,7 @@ export class InstalledPackagesTab {
this.installedPackagesLoader = view.modelBuilder.loadingComponent() this.installedPackagesLoader = view.modelBuilder.loadingComponent()
.withItem(this.formBuilder.component()) .withItem(this.formBuilder.component())
.withProperties({ .withProps({
loading: true loading: true
}).component(); }).component();
@@ -167,7 +167,7 @@ export class InstalledPackagesTab {
let location: string; let location: string;
let component: azdata.Component; let component: azdata.Component;
if (locations && locations.length === 1) { if (locations && locations.length === 1) {
component = view.modelBuilder.text().withProperties({ component = view.modelBuilder.text().withProps({
value: locations[0].displayName value: locations[0].displayName
}).component(); }).component();
location = locations[0].name; location = locations[0].name;
@@ -181,7 +181,7 @@ export class InstalledPackagesTab {
const currentLocation = await dialog.model.getCurrentLocation(); const currentLocation = await dialog.model.getCurrentLocation();
const selectedLocation = dropdownValues.find(x => x.name === currentLocation); const selectedLocation = dropdownValues.find(x => x.name === currentLocation);
location = currentLocation || locations[0].name; location = currentLocation || locations[0].name;
let locationDropDown = view.modelBuilder.dropDown().withProperties({ let locationDropDown = view.modelBuilder.dropDown().withProps({
values: dropdownValues, values: dropdownValues,
value: selectedLocation || dropdownValues[0] value: selectedLocation || dropdownValues[0]
}).component(); }).component();
@@ -197,7 +197,7 @@ export class InstalledPackagesTab {
}); });
component = locationDropDown; component = locationDropDown;
} else { } else {
component = view.modelBuilder.text().withProperties({ component = view.modelBuilder.text().withProps({
}).component(); }).component();
} }
if (location) { if (location) {
extensions/notebook/src/dialog/remoteBookDialog.ts
+6 -6
View File
@@ -45,7 +45,7 @@ export class RemoteBookDialog {
this.dialog.registerContent(async view => { this.dialog.registerContent(async view => {
this.view = view; this.view = view;
this.remoteLocationDropdown = this.view.modelBuilder.dropDown().withProperties({ this.remoteLocationDropdown = this.view.modelBuilder.dropDown().withProps({
values: this.remoteLocationCategories, values: this.remoteLocationCategories,
value: '', value: '',
editable: false, editable: false,
@@ -53,7 +53,7 @@ export class RemoteBookDialog {
this.remoteLocationDropdown.onValueChanged(e => this.onRemoteLocationChanged()); this.remoteLocationDropdown.onValueChanged(e => this.onRemoteLocationChanged());
this.githubRepoDropdown = this.view.modelBuilder.dropDown().withProperties({ this.githubRepoDropdown = this.view.modelBuilder.dropDown().withProps({
values: defaultRepos, values: defaultRepos,
value: '', value: '',
editable: true, editable: true,
@@ -69,7 +69,7 @@ export class RemoteBookDialog {
this.searchButton.onDidClick(async () => await this.validate()); this.searchButton.onDidClick(async () => await this.validate());
this.releaseDropdown = this.view.modelBuilder.dropDown() this.releaseDropdown = this.view.modelBuilder.dropDown()
.withProperties({ .withProps({
values: [], values: [],
value: '', value: '',
enabled: false enabled: false
@@ -77,7 +77,7 @@ export class RemoteBookDialog {
this.releaseDropdown.onValueChanged(async () => await this.getAssets()); this.releaseDropdown.onValueChanged(async () => await this.getAssets());
this.bookDropdown = this.view.modelBuilder.dropDown().withProperties({ this.bookDropdown = this.view.modelBuilder.dropDown().withProps({
values: [], values: [],
value: '', value: '',
editable: false, editable: false,
@@ -85,7 +85,7 @@ export class RemoteBookDialog {
this.bookDropdown.onValueChanged(async () => await this.fillVersionDropdown()); this.bookDropdown.onValueChanged(async () => await this.fillVersionDropdown());
this.versionDropdown = this.view.modelBuilder.dropDown().withProperties({ this.versionDropdown = this.view.modelBuilder.dropDown().withProps({
values: [], values: [],
value: '', value: '',
editable: false, editable: false,
@@ -93,7 +93,7 @@ export class RemoteBookDialog {
this.versionDropdown.onValueChanged(async () => await this.fillLanguageDropdown()); this.versionDropdown.onValueChanged(async () => await this.fillLanguageDropdown());
this.languageDropdown = this.view.modelBuilder.dropDown().withProperties({ this.languageDropdown = this.view.modelBuilder.dropDown().withProps({
values: [], values: [],
value: '', value: '',
editable: false, editable: false,
extensions/profiler/src/dialogs/profilerCreateSessionDialog.ts
+2 -2
View File
@@ -56,12 +56,12 @@ export class CreateSessionDialog {
private initializeContent(): void { private initializeContent(): void {
this.dialog.registerContent(async view => { this.dialog.registerContent(async view => {
this.templatesBox = view.modelBuilder.dropDown() this.templatesBox = view.modelBuilder.dropDown()
.withProperties({ .withProps({
values: [] values: []
}).component(); }).component();
this.sessionNameBox = view.modelBuilder.inputBox() this.sessionNameBox = view.modelBuilder.inputBox()
.withProperties({ .withProps({
required: true, required: true,
multiline: false, multiline: false,
value: '' value: ''
extensions/resource-deployment/package.json
+1 -1
View File
@@ -466,7 +466,7 @@
"@types/semver": "^7.3.1", "@types/semver": "^7.3.1",
"@types/sinon": "^9.0.8", "@types/sinon": "^9.0.8",
"@types/yamljs": "0.2.30", "@types/yamljs": "0.2.30",
"@microsoft/azdata-test": "^1.4.0", "@microsoft/azdata-test": "^1.5.1",
"mocha": "^5.2.0", "mocha": "^5.2.0",
"mocha-junit-reporter": "^1.17.0", "mocha-junit-reporter": "^1.17.0",
"mocha-multi-reporters": "^1.1.7", "mocha-multi-reporters": "^1.1.7",
extensions/resource-deployment/src/ui/deployAzureSQLDBWizard/pages/azureSettingsPage.ts
+10 -10
View File
@@ -159,7 +159,7 @@ export class AzureSettingsPage extends BasePage {
private async createAzureAccountsDropdown(view: azdata.ModelView) { 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._azureAccountsDropdown.onValueChanged(async (value) => {
this._model.azureAccount = this._accountsMap.get(value.selected)!; this._model.azureAccount = this._accountsMap.get(value.selected)!;
@@ -296,7 +296,7 @@ export class AzureSettingsPage extends BasePage {
} }
private async createServerDropdown(view: azdata.ModelView) { private async createServerDropdown(view: azdata.ModelView) {
this._serverGroupDropdown = view.modelBuilder.dropDown().withProperties({ this._serverGroupDropdown = view.modelBuilder.dropDown().withProps({
required: true, required: true,
}).component(); }).component();
this._serverGroupDropdown.onValueChanged(async (value) => { 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. //@todo alma1 9/8/2020 functions below are used for upcoming server creation feature.
// private async createResourceDropdown(view: azdata.ModelView) { // private async createResourceDropdown(view: azdata.ModelView) {
// this._resourceGroupDropdown = view.modelBuilder.dropDown().withProperties({ // this._resourceGroupDropdown = view.modelBuilder.dropDown().withProps({
// required: true // required: true
// }).component(); // }).component();
// this._resourceGroupDropdown.onValueChanged(async (value) => { // this._resourceGroupDropdown.onValueChanged(async (value) => {
@@ -408,7 +408,7 @@ export class AzureSettingsPage extends BasePage {
// } // }
// private async createAzureRegionsDropdown(view: azdata.ModelView) { // private async createAzureRegionsDropdown(view: azdata.ModelView) {
// this._azureRegionsDropdown = view.modelBuilder.dropDown().withProperties({ // this._azureRegionsDropdown = view.modelBuilder.dropDown().withProps({
// required: true // required: true
// }).component(); // }).component();
@@ -446,13 +446,13 @@ export class AzureSettingsPage extends BasePage {
// private createDatabaseHardwareSettingsText(view: azdata.ModelView) { // private createDatabaseHardwareSettingsText(view: azdata.ModelView) {
// this._dbHardwareInfoText = view.modelBuilder.text() // this._dbHardwareInfoText = view.modelBuilder.text()
// .withProperties({ // .withProps({
// value: constants.DatabaseHardwareInfoLabel // value: constants.DatabaseHardwareInfoLabel
// }).component(); // }).component();
// } // }
// private async createManagedInstanceDropdown(view: azdata.ModelView) { // private async createManagedInstanceDropdown(view: azdata.ModelView) {
// this._dbManagedInstanceDropdown = view.modelBuilder.dropDown().withProperties({ // this._dbManagedInstanceDropdown = view.modelBuilder.dropDown().withProps({
// required: true, // required: true,
// }).component(); // }).component();
// this._dbManagedInstanceDropdown.onValueChanged(async (value) => { // this._dbManagedInstanceDropdown.onValueChanged(async (value) => {
@@ -528,7 +528,7 @@ export class AzureSettingsPage extends BasePage {
// } // }
// private async createSupportedEditionsDropdown(view: azdata.ModelView) { // private async createSupportedEditionsDropdown(view: azdata.ModelView) {
// this._dbSupportedEditionsDropdown = view.modelBuilder.dropDown().withProperties({ // this._dbSupportedEditionsDropdown = view.modelBuilder.dropDown().withProps({
// required: true, // required: true,
// }).component(); // }).component();
// this._dbSupportedEditionsDropdown.onValueChanged(async (value) => { // this._dbSupportedEditionsDropdown.onValueChanged(async (value) => {
@@ -595,7 +595,7 @@ export class AzureSettingsPage extends BasePage {
// } // }
// private async createSupportedFamilyDropdown(view: azdata.ModelView) { // private async createSupportedFamilyDropdown(view: azdata.ModelView) {
// this._dbSupportedFamilyDropdown = view.modelBuilder.dropDown().withProperties({ // this._dbSupportedFamilyDropdown = view.modelBuilder.dropDown().withProps({
// required: true, // required: true,
// }).component(); // }).component();
// this._dbSupportedFamilyDropdown.onValueChanged(async (value) => { // this._dbSupportedFamilyDropdown.onValueChanged(async (value) => {
@@ -662,7 +662,7 @@ export class AzureSettingsPage extends BasePage {
// } // }
// private async createVCoreDropdown(view: azdata.ModelView) { // private async createVCoreDropdown(view: azdata.ModelView) {
// this._dbVCoreDropdown = view.modelBuilder.dropDown().withProperties({ // this._dbVCoreDropdown = view.modelBuilder.dropDown().withProps({
// required: true, // required: true,
// }).component(); // }).component();
// this._dbVCoreDropdown.onValueChanged(async (value) => { // this._dbVCoreDropdown.onValueChanged(async (value) => {
@@ -733,7 +733,7 @@ export class AzureSettingsPage extends BasePage {
// } // }
// private createMaxMemoryText(view: azdata.ModelView) { // private createMaxMemoryText(view: azdata.ModelView) {
// this._dbMemoryTextBox = view.modelBuilder.inputBox().withProperties(<azdata.InputBoxProperties>{ // this._dbMemoryTextBox = view.modelBuilder.inputBox().withProps(<azdata.InputBoxProperties>{
// inputType: 'number', // inputType: 'number',
// max: 1024, // max: 1024,
// min: 1, // min: 1,
extensions/resource-deployment/src/ui/deployAzureSQLDBWizard/pages/databaseSettingsPage.ts
+4 -4
View File
@@ -108,13 +108,13 @@ export class DatabaseSettingsPage extends BasePage {
private createIpAddressText(view: azdata.ModelView) { private createIpAddressText(view: azdata.ModelView) {
this._IpInfoText = view.modelBuilder.text() this._IpInfoText = view.modelBuilder.text()
.withProperties({ .withProps({
value: constants.IpAddressInfoLabel value: constants.IpAddressInfoLabel
}).component(); }).component();
//Start IP Address Section: //Start IP Address Section:
this._startIpAddressTextbox = view.modelBuilder.inputBox().withProperties(<azdata.InputBoxProperties>{ this._startIpAddressTextbox = view.modelBuilder.inputBox().withProps(<azdata.InputBoxProperties>{
inputType: 'text' inputType: 'text'
}).component(); }).component();
@@ -126,7 +126,7 @@ export class DatabaseSettingsPage extends BasePage {
//End IP Address Section: //End IP Address Section:
this._endIpAddressTextbox = view.modelBuilder.inputBox().withProperties(<azdata.InputBoxProperties>{ this._endIpAddressTextbox = view.modelBuilder.inputBox().withProps(<azdata.InputBoxProperties>{
inputType: 'text' inputType: 'text'
}).component(); }).component();
@@ -191,7 +191,7 @@ export class DatabaseSettingsPage extends BasePage {
} }
private createCollationText(view: azdata.ModelView) { private createCollationText(view: azdata.ModelView) {
this._collationTextbox = view.modelBuilder.inputBox().withProperties(<azdata.InputBoxProperties>{ this._collationTextbox = view.modelBuilder.inputBox().withProps(<azdata.InputBoxProperties>{
inputType: 'text', inputType: 'text',
value: 'SQL_Latin1_General_CP1_CI_AS' value: 'SQL_Latin1_General_CP1_CI_AS'
}).component(); }).component();
extensions/resource-deployment/src/ui/deployAzureSQLVMWizard/pages/azureSettingsPage.ts
+4 -4
View File
@@ -100,7 +100,7 @@ export class AzureSettingsPage extends BasePage {
private async createAzureAccountsDropdown(view: azdata.ModelView) { 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._azureAccountsDropdown.onValueChanged(async (value) => {
if (!this._azureAccountsDropdown.value) { if (!this._azureAccountsDropdown.value) {
@@ -164,7 +164,7 @@ export class AzureSettingsPage extends BasePage {
} }
private async createAzureSubscriptionsDropdown(view: azdata.ModelView) { 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 => { this._azureSubscriptionsDropdown.onValueChanged(async value => {
if (!this._azureSubscriptionsDropdown.value) { if (!this._azureSubscriptionsDropdown.value) {
@@ -234,7 +234,7 @@ export class AzureSettingsPage extends BasePage {
} }
private async createResourceDropdown(view: azdata.ModelView) { private async createResourceDropdown(view: azdata.ModelView) {
this._resourceGroupDropdown = view.modelBuilder.dropDown().withProperties({ this._resourceGroupDropdown = view.modelBuilder.dropDown().withProps({
required: true required: true
}).component(); }).component();
this._resourceGroupDropdown.onValueChanged(async (value) => { this._resourceGroupDropdown.onValueChanged(async (value) => {
@@ -278,7 +278,7 @@ export class AzureSettingsPage extends BasePage {
} }
private async createAzureRegionsDropdown(view: azdata.ModelView) { private async createAzureRegionsDropdown(view: azdata.ModelView) {
this._azureRegionsDropdown = view.modelBuilder.dropDown().withProperties({ this._azureRegionsDropdown = view.modelBuilder.dropDown().withProps({
required: true required: true
}).component(); }).component();
extensions/resource-deployment/src/ui/deployAzureSQLVMWizard/pages/networkSettingsPage.ts
+9 -9
View File
@@ -110,7 +110,7 @@ export class NetworkSettingsPage extends BasePage {
private async createVirtualNetworkDropdown(view: azdata.ModelView) { 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, label: constants.NetworkSettingsNewVirtualNetwork,
checked: false checked: false
}).component(); }).component();
@@ -119,7 +119,7 @@ export class NetworkSettingsPage extends BasePage {
this.toggleNewVirtualNetwork(); this.toggleNewVirtualNetwork();
}); });
this._virtualNetworkDropdown = view.modelBuilder.dropDown().withProperties({ this._virtualNetworkDropdown = view.modelBuilder.dropDown().withProps({
width: constants.standardWidth, width: constants.standardWidth,
required: true required: true
}).component(); }).component();
@@ -132,7 +132,7 @@ export class NetworkSettingsPage extends BasePage {
this.populateSubnetDropdown(); this.populateSubnetDropdown();
}); });
this._newVirtualNetworkText = view.modelBuilder.inputBox().withProperties(<azdata.InputBoxProperties>{ this._newVirtualNetworkText = view.modelBuilder.inputBox().withProps(<azdata.InputBoxProperties>{
width: constants.standardWidth, width: constants.standardWidth,
required: true, required: true,
placeHolder: localize('deployAzureSQLVM.NewVnetPlaceholder', "Enter name for new virtual network") 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, width: constants.standardWidth,
required: true required: true
}).component(); }).component();
@@ -234,7 +234,7 @@ export class NetworkSettingsPage extends BasePage {
this._model.subnetName = (this._subnetDropdown.value as azdata.CategoryValue).name; 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, width: constants.standardWidth,
required: true, required: true,
placeHolder: localize('deployAzureSQLVM.NewSubnetPlaceholder', "Enter name for new subnet") placeHolder: localize('deployAzureSQLVM.NewSubnetPlaceholder', "Enter name for new subnet")
@@ -299,7 +299,7 @@ export class NetworkSettingsPage extends BasePage {
private async createPublicIPDropdown(view: azdata.ModelView) { 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, label: constants.NetworkSettingsNewPublicIp,
checked: false checked: false
}).component(); }).component();
@@ -308,7 +308,7 @@ export class NetworkSettingsPage extends BasePage {
this.toggleNewPublicIp(); this.toggleNewPublicIp();
}); });
this._publicIpDropdown = view.modelBuilder.dropDown().withProperties({ this._publicIpDropdown = view.modelBuilder.dropDown().withProps({
required: true, required: true,
width: constants.standardWidth, width: constants.standardWidth,
}).component(); }).component();
@@ -320,7 +320,7 @@ export class NetworkSettingsPage extends BasePage {
this._model.publicIpName = (this._publicIpDropdown.value as azdata.CategoryValue).name; 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"), placeHolder: localize('deployAzureSQLVM.NewPipPlaceholder', "Enter name for new public IP"),
width: constants.standardWidth width: constants.standardWidth
}).component(); }).component();
@@ -385,7 +385,7 @@ export class NetworkSettingsPage extends BasePage {
} }
private async createVmRDPAllowCheckbox(view: azdata.ModelView) { private async createVmRDPAllowCheckbox(view: azdata.ModelView) {
this._vmRDPAllowCheckbox = view.modelBuilder.checkBox().withProperties({ this._vmRDPAllowCheckbox = view.modelBuilder.checkBox().withProps({
label: constants.RDPAllowCheckboxLabel, label: constants.RDPAllowCheckboxLabel,
}).component(); }).component();
this._vmRDPAllowCheckbox.onChanged((value) => { this._vmRDPAllowCheckbox.onChanged((value) => {
extensions/resource-deployment/src/ui/deployAzureSQLVMWizard/pages/sqlServerSettingsPage.ts
+5 -5
View File
@@ -109,7 +109,7 @@ export class SqlServerSettingsPage extends BasePage {
private createSqlConnectivityDropdown(view: azdata.ModelView) { private createSqlConnectivityDropdown(view: azdata.ModelView) {
const privateOptionDisplayName = localize('deployAzureSQLVM.PrivateConnectivityDropdownOptionDefault', "Private (within Virtual Network)"); 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: [ values: [
{ {
@@ -148,7 +148,7 @@ export class SqlServerSettingsPage extends BasePage {
} }
private createPortText(view: azdata.ModelView) { private createPortText(view: azdata.ModelView) {
this._portTextBox = view.modelBuilder.inputBox().withProperties(<azdata.InputBoxProperties>{ this._portTextBox = view.modelBuilder.inputBox().withProps(<azdata.InputBoxProperties>{
inputType: 'number', inputType: 'number',
max: 65535, max: 65535,
min: 1024, min: 1024,
@@ -165,7 +165,7 @@ export class SqlServerSettingsPage extends BasePage {
private createSqlAuthentication(view: azdata.ModelView) { private createSqlAuthentication(view: azdata.ModelView) {
this._sqlAuthenticationDropdown = view.modelBuilder.dropDown().withProperties(<azdata.DropDownComponent>{ this._sqlAuthenticationDropdown = view.modelBuilder.dropDown().withProps(<azdata.DropDownComponent>{
values: [ values: [
{ {
displayName: localizedConstants.yes, displayName: localizedConstants.yes,
@@ -194,13 +194,13 @@ export class SqlServerSettingsPage extends BasePage {
this._sqlAuthenticationTextRow = this._model.createFormRowComponent(view, constants.SqlAuthenticationUsernameLabel, '', this._sqlAuthenticationTextbox, true); 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' inputType: 'password'
}).component(); }).component();
this._sqlAuthenticationPasswordTextRow = this._model.createFormRowComponent(view, constants.SqlAuthenticationPasswordLabel, '', this._sqlAuthenticationPasswordTextbox, true); 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' inputType: 'password'
}).component(); }).component();
extensions/resource-deployment/src/ui/deployAzureSQLVMWizard/pages/vmSettingsPage.ts
+9 -9
View File
@@ -140,7 +140,7 @@ export class VmSettingsPage extends BasePage {
private async createVmNameTextBox(view: azdata.ModelView) { private async createVmNameTextBox(view: azdata.ModelView) {
this._vmNameTextBox = view.modelBuilder.inputBox().withProperties({ this._vmNameTextBox = view.modelBuilder.inputBox().withProps({
}).component(); }).component();
this._vmNameTextBox.onTextChanged((value) => { this._vmNameTextBox.onTextChanged((value) => {
@@ -150,7 +150,7 @@ export class VmSettingsPage extends BasePage {
} }
private async createAdminUsernameTextBox(view: azdata.ModelView) { private async createAdminUsernameTextBox(view: azdata.ModelView) {
this._adminUsernameTextBox = view.modelBuilder.inputBox().withProperties({ this._adminUsernameTextBox = view.modelBuilder.inputBox().withProps({
}).component(); }).component();
this._adminUsernameTextBox.onTextChanged((value) => { this._adminUsernameTextBox.onTextChanged((value) => {
@@ -160,7 +160,7 @@ export class VmSettingsPage extends BasePage {
} }
private async createAdminPasswordTextBox(view: azdata.ModelView) { private async createAdminPasswordTextBox(view: azdata.ModelView) {
this._adminPasswordTextBox = view.modelBuilder.inputBox().withProperties({ this._adminPasswordTextBox = view.modelBuilder.inputBox().withProps({
inputType: 'password', inputType: 'password',
}).component(); }).component();
@@ -171,7 +171,7 @@ export class VmSettingsPage extends BasePage {
} }
private async createAdminPasswordConfirmTextBox(view: azdata.ModelView) { private async createAdminPasswordConfirmTextBox(view: azdata.ModelView) {
this._adminComfirmPasswordTextBox = view.modelBuilder.inputBox().withProperties({ this._adminComfirmPasswordTextBox = view.modelBuilder.inputBox().withProps({
inputType: 'password', inputType: 'password',
}).component(); }).component();
@@ -181,7 +181,7 @@ export class VmSettingsPage extends BasePage {
} }
private async createVmImageDropdown(view: azdata.ModelView) { private async createVmImageDropdown(view: azdata.ModelView) {
this._vmImageDropdown = view.modelBuilder.dropDown().withProperties({ this._vmImageDropdown = view.modelBuilder.dropDown().withProps({
}).component(); }).component();
this._vmImageDropdown.onValueChanged(value => { this._vmImageDropdown.onValueChanged(value => {
@@ -236,7 +236,7 @@ export class VmSettingsPage extends BasePage {
} }
private async createVMImageSkuDropdown(view: azdata.ModelView) { private async createVMImageSkuDropdown(view: azdata.ModelView) {
this._vmImageSkuDropdown = view.modelBuilder.dropDown().withProperties({ this._vmImageSkuDropdown = view.modelBuilder.dropDown().withProps({
}).component(); }).component();
this._vmImageSkuDropdown.onValueChanged(value => { this._vmImageSkuDropdown.onValueChanged(value => {
@@ -277,7 +277,7 @@ export class VmSettingsPage extends BasePage {
} }
private async createVMImageVersionDropdown(view: azdata.ModelView) { private async createVMImageVersionDropdown(view: azdata.ModelView) {
this._vmImageVersionDropdown = view.modelBuilder.dropDown().withProperties({ this._vmImageVersionDropdown = view.modelBuilder.dropDown().withProps({
}).component(); }).component();
this._vmImageVersionDropdown.onValueChanged(value => { this._vmImageVersionDropdown.onValueChanged(value => {
@@ -317,7 +317,7 @@ export class VmSettingsPage extends BasePage {
private async createVmSizeDropdown(view: azdata.ModelView) { private async createVmSizeDropdown(view: azdata.ModelView) {
this._vmSizeDropdown = view.modelBuilder.dropDown().withProperties({ this._vmSizeDropdown = view.modelBuilder.dropDown().withProps({
editable: true editable: true
}).component(); }).component();
@@ -325,7 +325,7 @@ export class VmSettingsPage extends BasePage {
this._model.vmSize = (this._vmSizeDropdown.value as azdata.CategoryValue).name; 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, label: constants.VmSizeLearnMoreLabel,
url: 'https://go.microsoft.com/fwlink/?linkid=2143101' url: 'https://go.microsoft.com/fwlink/?linkid=2143101'
extensions/resource-deployment/src/ui/deployClusterWizard/pages/targetClusterPage.ts
+5 -5
View File
@@ -83,17 +83,17 @@ export class TargetClusterContextPage extends ResourceTypePage {
private initExistingClusterControl(): void { private initExistingClusterControl(): void {
let self = this; let self = this;
const labelWidth = '150px'; 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; 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.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() let configFileContainer = this.view!.modelBuilder.flexContainer()
.withLayout({ flexFlow: 'row', alignItems: 'baseline' }) .withLayout({ flexFlow: 'row', alignItems: 'baseline' })
.withItems([configFileLabel, this.configFileInput, this.browseFileButton], { CSSStyles: { 'margin-right': '10px' } }).component(); .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.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.clusterContextList = this.view!.modelBuilder.divContainer().component();
this.clusterContextLoadingComponent = this.view!.modelBuilder.loadingComponent().withItem(this.clusterContextList).component(); this.clusterContextLoadingComponent = this.view!.modelBuilder.loadingComponent().withItem(this.clusterContextList).component();
this.existingClusterControl = this.view!.modelBuilder.divContainer().withProperties<azdata.DivContainerProperties>({ clickable: false }).component(); this.existingClusterControl = this.view!.modelBuilder.divContainer().withProperties<azdata.DivContainerProperties>({ clickable: false }).component();
extensions/resource-deployment/src/ui/radioGroupLoadingComponentBuilder.ts
+3 -3
View File
@@ -22,11 +22,11 @@ export class RadioGroupLoadingComponentBuilder implements azdata.ComponentBuilde
} }
withProperties<U>(properties: U): azdata.ComponentBuilder<azdata.LoadingComponent, azdata.LoadingComponentProperties> { 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> { 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> { withValidation(validation: (component: azdata.LoadingComponent) => boolean): azdata.ComponentBuilder<azdata.LoadingComponent, azdata.LoadingComponentProperties> {
@@ -68,7 +68,7 @@ export class RadioGroupLoadingComponentBuilder implements azdata.ComponentBuilde
}); });
} }
catch (e) { 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._optionsDivContainer.addItem(errorLoadingRadioOptionsLabel);
} }
this.component().loading = false; this.component().loading = false;
extensions/resource-deployment/src/ui/resourceTypePickerDialog.ts
+1 -1
View File
@@ -75,7 +75,7 @@ export class ResourceTypePickerDialog extends DialogBase {
this._resourceTagsListView = this.createTagsListView(); this._resourceTagsListView = this.createTagsListView();
resourceComponents.push(this._resourceTagsListView); resourceComponents.push(this._resourceTagsListView);
} }
this._resourceSearchBox = view.modelBuilder.inputBox().withProperties({ this._resourceSearchBox = view.modelBuilder.inputBox().withProps({
placeHolder: loc.resourceTypeSearchBoxDescription, placeHolder: loc.resourceTypeSearchBoxDescription,
ariaLabel: loc.resourceTypeSearchBoxDescription ariaLabel: loc.resourceTypeSearchBoxDescription
}).component(); }).component();
extensions/resource-deployment/yarn.lock
+4 -4
View File
@@ -196,10 +196,10 @@
dependencies: dependencies:
vscode-extension-telemetry "^0.1.6" vscode-extension-telemetry "^0.1.6"
"@microsoft/azdata-test@^1.4.0": "@microsoft/azdata-test@^1.5.1":
version "1.4.0" version "1.5.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-1.4.0.tgz#a809187ae8a065c518e3a3e2d350883e592853bc" resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-1.5.1.tgz#e61aeb81f3291563f250e6b0c712a45aa335de94"
integrity sha512-iscDA13/XRknRCNauP9OPsSg/ulTrMJOPFA0XMyNG1it3zY8mEJxxFJcNkWTnnEWpOUFvyksvoouzYUNy1fvrQ== integrity sha512-3B5iz0WU5TCKOs420zRNk4LWi2n5W64ZLJMu81X/yFFmnCbjhWwKE4xgTBZTuzmzg372bNNrHm9zHZcr3lm1RA==
dependencies: dependencies:
http-proxy-agent "^2.1.0" http-proxy-agent "^2.1.0"
https-proxy-agent "^2.2.4" https-proxy-agent "^2.2.4"
extensions/schema-compare/src/dialogs/schemaCompareDialog.ts
+15 -15
View File
@@ -190,7 +190,7 @@ export class SchemaCompareDialog {
this.view = view; this.view = view;
} }
this.sourceTextBox = this.view.modelBuilder.inputBox().withProperties({ this.sourceTextBox = this.view.modelBuilder.inputBox().withProps({
value: this.schemaCompareMainWindow.sourceEndpointInfo ? this.schemaCompareMainWindow.sourceEndpointInfo.packageFilePath : '', value: this.schemaCompareMainWindow.sourceEndpointInfo ? this.schemaCompareMainWindow.sourceEndpointInfo.packageFilePath : '',
width: this.textBoxWidth, width: this.textBoxWidth,
ariaLabel: loc.sourceFile ariaLabel: loc.sourceFile
@@ -200,7 +200,7 @@ export class SchemaCompareDialog {
this.dialog.okButton.enabled = await this.shouldEnableOkayButton(); this.dialog.okButton.enabled = await this.shouldEnableOkayButton();
}); });
this.targetTextBox = this.view.modelBuilder.inputBox().withProperties({ this.targetTextBox = this.view.modelBuilder.inputBox().withProps({
value: this.schemaCompareMainWindow.targetEndpointInfo ? this.schemaCompareMainWindow.targetEndpointInfo.packageFilePath : '', value: this.schemaCompareMainWindow.targetEndpointInfo ? this.schemaCompareMainWindow.targetEndpointInfo.packageFilePath : '',
width: this.textBoxWidth, width: this.textBoxWidth,
ariaLabel: loc.targetFile ariaLabel: loc.targetFile
@@ -286,14 +286,14 @@ export class SchemaCompareDialog {
private createFileBrowser(isTarget: boolean, endpoint: mssql.SchemaCompareEndpointInfo): azdata.FormComponent { private createFileBrowser(isTarget: boolean, endpoint: mssql.SchemaCompareEndpointInfo): azdata.FormComponent {
let currentTextbox = isTarget ? this.targetTextBox : this.sourceTextBox; let currentTextbox = isTarget ? this.targetTextBox : this.sourceTextBox;
if (isTarget) { if (isTarget) {
this.targetFileButton = this.view.modelBuilder.button().withProperties({ this.targetFileButton = this.view.modelBuilder.button().withProps({
label: '•••', label: '•••',
title: loc.selectTargetFile, title: loc.selectTargetFile,
ariaLabel: loc.selectTargetFile, ariaLabel: loc.selectTargetFile,
secondary: true secondary: true
}).component(); }).component();
} else { } else {
this.sourceFileButton = this.view.modelBuilder.button().withProperties({ this.sourceFileButton = this.view.modelBuilder.button().withProps({
label: '•••', label: '•••',
title: loc.selectSourceFile, title: loc.selectSourceFile,
ariaLabel: loc.selectSourceFile, ariaLabel: loc.selectSourceFile,
@@ -338,13 +338,13 @@ export class SchemaCompareDialog {
private createSourceRadioButtons(): azdata.FormComponent { private createSourceRadioButtons(): azdata.FormComponent {
this.sourceDacpacRadioButton = this.view.modelBuilder.radioButton() this.sourceDacpacRadioButton = this.view.modelBuilder.radioButton()
.withProperties({ .withProps({
name: 'source', name: 'source',
label: loc.DacpacRadioButtonLabel label: loc.DacpacRadioButtonLabel
}).component(); }).component();
this.sourceDatabaseRadioButton = this.view.modelBuilder.radioButton() this.sourceDatabaseRadioButton = this.view.modelBuilder.radioButton()
.withProperties({ .withProps({
name: 'source', name: 'source',
label: loc.DatabaseRadioButtonLabel label: loc.DatabaseRadioButtonLabel
}).component(); }).component();
@@ -379,7 +379,7 @@ export class SchemaCompareDialog {
let flexRadioButtonsModel = this.view.modelBuilder.flexContainer() let flexRadioButtonsModel = this.view.modelBuilder.flexContainer()
.withLayout({ flexFlow: 'column' }) .withLayout({ flexFlow: 'column' })
.withItems([this.sourceDacpacRadioButton, this.sourceDatabaseRadioButton]) .withItems([this.sourceDacpacRadioButton, this.sourceDatabaseRadioButton])
.withProperties({ ariaRole: 'radiogroup' }) .withProps({ ariaRole: 'radiogroup' })
.component(); .component();
return { return {
@@ -390,13 +390,13 @@ export class SchemaCompareDialog {
private createTargetRadioButtons(): azdata.FormComponent { private createTargetRadioButtons(): azdata.FormComponent {
let dacpacRadioButton = this.view.modelBuilder.radioButton() let dacpacRadioButton = this.view.modelBuilder.radioButton()
.withProperties({ .withProps({
name: 'target', name: 'target',
label: loc.DacpacRadioButtonLabel label: loc.DacpacRadioButtonLabel
}).component(); }).component();
let databaseRadioButton = this.view.modelBuilder.radioButton() let databaseRadioButton = this.view.modelBuilder.radioButton()
.withProperties({ .withProps({
name: 'target', name: 'target',
label: loc.DatabaseRadioButtonLabel label: loc.DatabaseRadioButtonLabel
}).component(); }).component();
@@ -433,7 +433,7 @@ export class SchemaCompareDialog {
.withLayout({ flexFlow: 'column' }) .withLayout({ flexFlow: 'column' })
.withItems([dacpacRadioButton, databaseRadioButton] .withItems([dacpacRadioButton, databaseRadioButton]
) )
.withProperties({ ariaRole: 'radiogroup' }) .withProps({ ariaRole: 'radiogroup' })
.component(); .component();
return { return {
@@ -456,7 +456,7 @@ export class SchemaCompareDialog {
} }
protected createSourceServerDropdown(): azdata.FormComponent { protected createSourceServerDropdown(): azdata.FormComponent {
this.sourceServerDropdown = this.view.modelBuilder.dropDown().withProperties( this.sourceServerDropdown = this.view.modelBuilder.dropDown().withProps(
{ {
editable: true, editable: true,
fireOnTextChange: true, fireOnTextChange: true,
@@ -491,7 +491,7 @@ export class SchemaCompareDialog {
} }
private createConnectionButton(isTarget: boolean): azdata.ButtonComponent { private createConnectionButton(isTarget: boolean): azdata.ButtonComponent {
const selectConnectionButton = this.view.modelBuilder.button().withProperties({ const selectConnectionButton = this.view.modelBuilder.button().withProps({
ariaLabel: loc.selectConnection, ariaLabel: loc.selectConnection,
iconPath: path.join(this.extensionContext.extensionPath, 'media', 'selectConnection.svg'), iconPath: path.join(this.extensionContext.extensionPath, 'media', 'selectConnection.svg'),
height: '20px', height: '20px',
@@ -516,7 +516,7 @@ export class SchemaCompareDialog {
} }
protected createTargetServerDropdown(): azdata.FormComponent { protected createTargetServerDropdown(): azdata.FormComponent {
this.targetServerDropdown = this.view.modelBuilder.dropDown().withProperties( this.targetServerDropdown = this.view.modelBuilder.dropDown().withProps(
{ {
editable: true, editable: true,
fireOnTextChange: true, fireOnTextChange: true,
@@ -651,7 +651,7 @@ export class SchemaCompareDialog {
} }
protected createSourceDatabaseDropdown(): azdata.FormComponent { protected createSourceDatabaseDropdown(): azdata.FormComponent {
this.sourceDatabaseDropdown = this.view.modelBuilder.dropDown().withProperties( this.sourceDatabaseDropdown = this.view.modelBuilder.dropDown().withProps(
{ {
editable: true, editable: true,
fireOnTextChange: true, fireOnTextChange: true,
@@ -671,7 +671,7 @@ export class SchemaCompareDialog {
} }
protected createTargetDatabaseDropdown(): azdata.FormComponent { protected createTargetDatabaseDropdown(): azdata.FormComponent {
this.targetDatabaseDropdown = this.view.modelBuilder.dropDown().withProperties( this.targetDatabaseDropdown = this.view.modelBuilder.dropDown().withProps(
{ {
editable: true, editable: true,
fireOnTextChange: true, fireOnTextChange: true,
extensions/schema-compare/src/dialogs/schemaCompareOptionsDialog.ts
+3 -2
View File
@@ -98,7 +98,8 @@ export class SchemaCompareOptionsDialog {
private initializeSchemaCompareOptionsDialogTab(): void { private initializeSchemaCompareOptionsDialogTab(): void {
this.generalOptionsTab.registerContent(async view => { this.generalOptionsTab.registerContent(async view => {
this.descriptionHeading = view.modelBuilder.table().withProperties({ this.descriptionHeading = view.modelBuilder.table().withProps({
data: [],
columns: [ columns: [
{ {
value: 'Option Description', value: 'Option Description',
@@ -108,7 +109,7 @@ export class SchemaCompareOptionsDialog {
] ]
}).component(); }).component();
this.descriptionText = view.modelBuilder.text().withProperties({ this.descriptionText = view.modelBuilder.text().withProps({
value: ' ' value: ' '
}).component(); }).component();
extensions/schema-compare/src/schemaCompareMainWindow.ts
+21 -28
View File
@@ -132,9 +132,10 @@ export class SchemaCompareMainWindow {
this.view = view; this.view = view;
} }
this.differencesTable = this.view.modelBuilder.table().withProperties({ this.differencesTable = this.view.modelBuilder.table().withProps({
data: [], data: [],
title: loc.differencesTableTitle title: loc.differencesTableTitle,
columns: []
}).component(); }).component();
this.diffEditor = this.view.modelBuilder.diffeditor().withProperties({ this.diffEditor = this.view.modelBuilder.diffeditor().withProperties({
@@ -146,17 +147,9 @@ export class SchemaCompareMainWindow {
this.splitView = this.view.modelBuilder.splitViewContainer().component(); this.splitView = this.view.modelBuilder.splitViewContainer().component();
let sourceTargetLabels = this.view.modelBuilder.flexContainer() let sourceTargetLabels = this.view.modelBuilder.flexContainer().component();
.withProperties({
alignItems: 'stretch',
horizontal: true
}).component();
this.sourceTargetFlexLayout = this.view.modelBuilder.flexContainer() this.sourceTargetFlexLayout = this.view.modelBuilder.flexContainer().component();
.withProperties({
alignItems: 'stretch',
horizontal: true
}).component();
this.createSwitchButton(); this.createSwitchButton();
this.createCompareButton(); this.createCompareButton();
@@ -205,17 +198,17 @@ export class SchemaCompareMainWindow {
component: this.saveScmpButton component: this.saveScmpButton
}]); }]);
let sourceLabel = this.view.modelBuilder.text().withProperties({ let sourceLabel = this.view.modelBuilder.text().withProps({
value: loc.sourceTitle, value: loc.sourceTitle,
CSSStyles: { 'margin-bottom': '0px' } CSSStyles: { 'margin-bottom': '0px' }
}).component(); }).component();
let targetLabel = this.view.modelBuilder.text().withProperties({ let targetLabel = this.view.modelBuilder.text().withProps({
value: loc.targetTitle, value: loc.targetTitle,
CSSStyles: { 'margin-bottom': '0px' } CSSStyles: { 'margin-bottom': '0px' }
}).component(); }).component();
let arrowLabel = this.view.modelBuilder.text().withProperties({ let arrowLabel = this.view.modelBuilder.text().withProps({
value: '➔' value: '➔'
}).component(); }).component();
@@ -228,15 +221,15 @@ export class SchemaCompareMainWindow {
this.sourceTargetFlexLayout.addItem(this.selectTargetButton, { CSSStyles: { 'margin-top': '10px' } }); this.sourceTargetFlexLayout.addItem(this.selectTargetButton, { CSSStyles: { 'margin-top': '10px' } });
this.loader = this.view.modelBuilder.loadingComponent().component(); this.loader = this.view.modelBuilder.loadingComponent().component();
this.waitText = this.view.modelBuilder.text().withProperties({ this.waitText = this.view.modelBuilder.text().withProps({
value: loc.waitText value: loc.waitText
}).component(); }).component();
this.startText = this.view.modelBuilder.text().withProperties({ this.startText = this.view.modelBuilder.text().withProps({
value: loc.startText value: loc.startText
}).component(); }).component();
this.noDifferencesLabel = this.view.modelBuilder.text().withProperties({ this.noDifferencesLabel = this.view.modelBuilder.text().withProps({
value: loc.noDifferencesText value: loc.noDifferencesText
}).component(); }).component();
@@ -625,7 +618,7 @@ export class SchemaCompareMainWindow {
} }
private createCompareButton(): void { private createCompareButton(): void {
this.compareButton = this.view.modelBuilder.button().withProperties({ this.compareButton = this.view.modelBuilder.button().withProps({
label: loc.compare, label: loc.compare,
iconPath: { iconPath: {
light: path.join(this.extensionContext.extensionPath, 'media', 'compare.svg'), light: path.join(this.extensionContext.extensionPath, 'media', 'compare.svg'),
@@ -640,7 +633,7 @@ export class SchemaCompareMainWindow {
} }
private createCancelButton(): void { private createCancelButton(): void {
this.cancelCompareButton = this.view.modelBuilder.button().withProperties({ this.cancelCompareButton = this.view.modelBuilder.button().withProps({
label: loc.stop, label: loc.stop,
iconPath: { iconPath: {
light: path.join(this.extensionContext.extensionPath, 'media', 'stop.svg'), light: path.join(this.extensionContext.extensionPath, 'media', 'stop.svg'),
@@ -689,7 +682,7 @@ export class SchemaCompareMainWindow {
} }
private createGenerateScriptButton(): void { private createGenerateScriptButton(): void {
this.generateScriptButton = this.view.modelBuilder.button().withProperties({ this.generateScriptButton = this.view.modelBuilder.button().withProps({
label: loc.generateScript, label: loc.generateScript,
iconPath: { iconPath: {
light: path.join(this.extensionContext.extensionPath, 'media', 'generate-script.svg'), light: path.join(this.extensionContext.extensionPath, 'media', 'generate-script.svg'),
@@ -725,7 +718,7 @@ export class SchemaCompareMainWindow {
} }
private createOptionsButton() { private createOptionsButton() {
this.optionsButton = this.view.modelBuilder.button().withProperties({ this.optionsButton = this.view.modelBuilder.button().withProps({
label: loc.options, label: loc.options,
iconPath: { iconPath: {
light: path.join(this.extensionContext.extensionPath, 'media', 'options.svg'), light: path.join(this.extensionContext.extensionPath, 'media', 'options.svg'),
@@ -744,7 +737,7 @@ export class SchemaCompareMainWindow {
private createApplyButton() { private createApplyButton() {
this.applyButton = this.view.modelBuilder.button().withProperties({ this.applyButton = this.view.modelBuilder.button().withProps({
label: loc.apply, label: loc.apply,
iconPath: { iconPath: {
light: path.join(this.extensionContext.extensionPath, 'media', 'start.svg'), light: path.join(this.extensionContext.extensionPath, 'media', 'start.svg'),
@@ -855,7 +848,7 @@ export class SchemaCompareMainWindow {
} }
private createSwitchButton(): void { private createSwitchButton(): void {
this.switchButton = this.view.modelBuilder.button().withProperties({ this.switchButton = this.view.modelBuilder.button().withProps({
label: loc.switchDirection, label: loc.switchDirection,
iconPath: { iconPath: {
light: path.join(this.extensionContext.extensionPath, 'media', 'switch-directions.svg'), light: path.join(this.extensionContext.extensionPath, 'media', 'switch-directions.svg'),
@@ -891,7 +884,7 @@ export class SchemaCompareMainWindow {
} }
private createSourceAndTargetButtons(): void { private createSourceAndTargetButtons(): void {
this.selectSourceButton = this.view.modelBuilder.button().withProperties({ this.selectSourceButton = this.view.modelBuilder.button().withProps({
label: '•••', label: '•••',
title: loc.selectSource, title: loc.selectSource,
ariaLabel: loc.selectSource, ariaLabel: loc.selectSource,
@@ -905,7 +898,7 @@ export class SchemaCompareMainWindow {
await this.promise; await this.promise;
}); });
this.selectTargetButton = this.view.modelBuilder.button().withProperties({ this.selectTargetButton = this.view.modelBuilder.button().withProps({
label: '•••', label: '•••',
title: loc.selectTarget, title: loc.selectTarget,
ariaLabel: loc.selectTarget, ariaLabel: loc.selectTarget,
@@ -921,7 +914,7 @@ export class SchemaCompareMainWindow {
} }
private createOpenScmpButton() { private createOpenScmpButton() {
this.openScmpButton = this.view.modelBuilder.button().withProperties({ this.openScmpButton = this.view.modelBuilder.button().withProps({
label: loc.openScmp, label: loc.openScmp,
iconPath: { iconPath: {
light: path.join(this.extensionContext.extensionPath, 'media', 'open-scmp.svg'), light: path.join(this.extensionContext.extensionPath, 'media', 'open-scmp.svg'),
@@ -1009,7 +1002,7 @@ export class SchemaCompareMainWindow {
} }
private createSaveScmpButton(): void { private createSaveScmpButton(): void {
this.saveScmpButton = this.view.modelBuilder.button().withProperties({ this.saveScmpButton = this.view.modelBuilder.button().withProps({
label: loc.saveScmp, label: loc.saveScmp,
iconPath: { iconPath: {
light: path.join(this.extensionContext.extensionPath, 'media', 'save-scmp.svg'), light: path.join(this.extensionContext.extensionPath, 'media', 'save-scmp.svg'),
extensions/sql-assessment/src/assessmentResultGrid.ts
+1 -1
View File
@@ -204,7 +204,7 @@ export class AssessmentResultGrid implements vscode.Disposable {
.withLayout({ .withLayout({
flexFlow: 'column', flexFlow: 'column',
height: '200px', height: '200px',
}).withProperties({ }).withProps({
CSSStyles: { CSSStyles: {
'padding': '0px 10px' 'padding': '0px 10px'
} }
extensions/sql-database-projects/src/dialogs/addDatabaseReferenceDialog.ts
+13 -13
View File
@@ -107,7 +107,7 @@ export class AddDatabaseReferenceDialog {
this.dacpacFormComponent = this.createDacpacTextbox(); this.dacpacFormComponent = this.createDacpacTextbox();
const locationDropdown = this.createLocationDropdown(); const locationDropdown = this.createLocationDropdown();
const variableSection = this.createVariableSection(); const variableSection = this.createVariableSection();
this.suppressMissingDependenciesErrorsCheckbox = view.modelBuilder.checkBox().withProperties({ this.suppressMissingDependenciesErrorsCheckbox = view.modelBuilder.checkBox().withProps({
label: constants.suppressMissingDependenciesErrors label: constants.suppressMissingDependenciesErrors
}).component(); }).component();
const exampleUsage = this.createExampleUsage(); const exampleUsage = this.createExampleUsage();
@@ -190,7 +190,7 @@ export class AddDatabaseReferenceDialog {
private createRadioButtons(): azdataType.FormComponent { private createRadioButtons(): azdataType.FormComponent {
this.projectRadioButton = this.view!.modelBuilder.radioButton() this.projectRadioButton = this.view!.modelBuilder.radioButton()
.withProperties({ .withProps({
name: 'referenceType', name: 'referenceType',
label: constants.projectRadioButtonTitle label: constants.projectRadioButtonTitle
}).component(); }).component();
@@ -200,7 +200,7 @@ export class AddDatabaseReferenceDialog {
}); });
this.systemDatabaseRadioButton = this.view!.modelBuilder.radioButton() this.systemDatabaseRadioButton = this.view!.modelBuilder.radioButton()
.withProperties({ .withProps({
name: 'referenceType', name: 'referenceType',
label: constants.systemDatabaseRadioButtonTitle label: constants.systemDatabaseRadioButtonTitle
}).component(); }).component();
@@ -210,7 +210,7 @@ export class AddDatabaseReferenceDialog {
}); });
const dacpacRadioButton = this.view!.modelBuilder.radioButton() const dacpacRadioButton = this.view!.modelBuilder.radioButton()
.withProperties({ .withProps({
name: 'referenceType', name: 'referenceType',
label: constants.dacpacText label: constants.dacpacText
}).component(); }).component();
@@ -233,7 +233,7 @@ export class AddDatabaseReferenceDialog {
let flexRadioButtonsModel: azdataType.FlexContainer = this.view!.modelBuilder.flexContainer() let flexRadioButtonsModel: azdataType.FlexContainer = this.view!.modelBuilder.flexContainer()
.withLayout({ flexFlow: 'column' }) .withLayout({ flexFlow: 'column' })
.withItems([this.projectRadioButton, this.systemDatabaseRadioButton, dacpacRadioButton]) .withItems([this.projectRadioButton, this.systemDatabaseRadioButton, dacpacRadioButton])
.withProperties({ ariaRole: 'radiogroup' }) .withProps({ ariaRole: 'radiogroup' })
.component(); .component();
return { return {
@@ -284,7 +284,7 @@ export class AddDatabaseReferenceDialog {
} }
private async createProjectDropdown(): Promise<azdataType.FormComponent> { private async createProjectDropdown(): Promise<azdataType.FormComponent> {
this.projectDropdown = this.view!.modelBuilder.dropDown().withProperties({ this.projectDropdown = this.view!.modelBuilder.dropDown().withProps({
ariaLabel: constants.databaseProject ariaLabel: constants.databaseProject
}).component(); }).component();
@@ -306,7 +306,7 @@ export class AddDatabaseReferenceDialog {
} }
private createSystemDatabaseDropdown(): azdataType.FormComponent { private createSystemDatabaseDropdown(): azdataType.FormComponent {
this.systemDatabaseDropdown = this.view!.modelBuilder.dropDown().withProperties({ this.systemDatabaseDropdown = this.view!.modelBuilder.dropDown().withProps({
values: [constants.master, constants.msdb], values: [constants.master, constants.msdb],
ariaLabel: constants.databaseNameLabel ariaLabel: constants.databaseNameLabel
}).component(); }).component();
@@ -327,7 +327,7 @@ export class AddDatabaseReferenceDialog {
} }
private createDacpacTextbox(): azdataType.FormComponent { private createDacpacTextbox(): azdataType.FormComponent {
this.dacpacTextbox = this.view!.modelBuilder.inputBox().withProperties({ this.dacpacTextbox = this.view!.modelBuilder.inputBox().withProps({
ariaLabel: constants.dacpacText, ariaLabel: constants.dacpacText,
placeHolder: constants.dacpacPlaceholder, placeHolder: constants.dacpacPlaceholder,
width: '400px' width: '400px'
@@ -350,7 +350,7 @@ export class AddDatabaseReferenceDialog {
} }
private createLoadDacpacButton(): azdataType.ButtonComponent { private createLoadDacpacButton(): azdataType.ButtonComponent {
const loadDacpacButton = this.view!.modelBuilder.button().withProperties({ const loadDacpacButton = this.view!.modelBuilder.button().withProps({
ariaLabel: constants.loadDacpacButton, ariaLabel: constants.loadDacpacButton,
iconPath: IconPathHelper.folder_blue, iconPath: IconPathHelper.folder_blue,
height: '18px', height: '18px',
@@ -382,7 +382,7 @@ export class AddDatabaseReferenceDialog {
} }
private createLocationDropdown(): azdataType.FormComponent { private createLocationDropdown(): azdataType.FormComponent {
this.locationDropdown = this.view!.modelBuilder.dropDown().withProperties({ this.locationDropdown = this.view!.modelBuilder.dropDown().withProps({
ariaLabel: constants.locationDropdown, ariaLabel: constants.locationDropdown,
values: this.currentReferenceType === ReferenceType.systemDb ? constants.systemDbLocationDropdownValues : constants.locationDropdownValues values: this.currentReferenceType === ReferenceType.systemDb ? constants.systemDbLocationDropdownValues : constants.locationDropdownValues
}).component(); }).component();
@@ -486,7 +486,7 @@ export class AddDatabaseReferenceDialog {
this.serverVariableTextbox = this.createInputBox(constants.serverVariable, false, true); this.serverVariableTextbox = this.createInputBox(constants.serverVariable, false, true);
const serverVariableRow = this.view!.modelBuilder.flexContainer().withItems([this.createLabel(constants.serverVariable, true), this.serverVariableTextbox], { flex: '0 0 auto' }).withLayout({ flexFlow: 'row', alignItems: 'center' }).component(); const serverVariableRow = this.view!.modelBuilder.flexContainer().withItems([this.createLabel(constants.serverVariable, true), this.serverVariableTextbox], { flex: '0 0 auto' }).withLayout({ flexFlow: 'row', alignItems: 'center' }).component();
const variableSection = this.view!.modelBuilder.flexContainer().withItems([databaseNameRow, databaseVariableRow, serverNameRow, serverVariableRow]).withLayout({ flexFlow: 'column' }).withProperties({ CSSStyles: { 'margin-bottom': '25px' } }).component(); const variableSection = this.view!.modelBuilder.flexContainer().withItems([databaseNameRow, databaseVariableRow, serverNameRow, serverVariableRow]).withLayout({ flexFlow: 'column' }).withProps({ CSSStyles: { 'margin-bottom': '25px' } }).component();
this.setDefaultDatabaseValues(); this.setDefaultDatabaseValues();
return { return {
@@ -506,7 +506,7 @@ export class AddDatabaseReferenceDialog {
} }
private createInputBox(ariaLabel: string, enabled: boolean, required: boolean): azdataType.InputBoxComponent { private createInputBox(ariaLabel: string, enabled: boolean, required: boolean): azdataType.InputBoxComponent {
const inputBox = this.view!.modelBuilder.inputBox().withProperties({ const inputBox = this.view!.modelBuilder.inputBox().withProps({
ariaLabel: ariaLabel, ariaLabel: ariaLabel,
enabled: enabled, enabled: enabled,
width: cssStyles.addDatabaseReferenceInputboxWidth, width: cssStyles.addDatabaseReferenceInputboxWidth,
@@ -522,7 +522,7 @@ export class AddDatabaseReferenceDialog {
} }
private createExampleUsage(): azdataType.FormComponent { private createExampleUsage(): azdataType.FormComponent {
this.exampleUsage = this.view!.modelBuilder.text().withProperties({ this.exampleUsage = this.view!.modelBuilder.text().withProps({
value: this.currentReferenceType === ReferenceType.project ? constants.databaseNameRequiredVariableOptional : constants.systemDatabaseReferenceRequired, value: this.currentReferenceType === ReferenceType.project ? constants.databaseNameRequiredVariableOptional : constants.systemDatabaseReferenceRequired,
CSSStyles: { 'user-select': 'text' } CSSStyles: { 'user-select': 'text' }
}).component(); }).component();
extensions/sql-database-projects/src/dialogs/createProjectFromDatabaseDialog.ts
+6 -6
View File
@@ -158,7 +158,7 @@ export class CreateProjectFromDatabaseDialog {
} }
private createDatabaseRow(view: azdataType.ModelView): azdataType.FlexContainer { private createDatabaseRow(view: azdataType.ModelView): azdataType.FlexContainer {
this.sourceDatabaseDropDown = view.modelBuilder.dropDown().withProperties({ this.sourceDatabaseDropDown = view.modelBuilder.dropDown().withProps({
ariaLabel: constants.databaseNameLabel, ariaLabel: constants.databaseNameLabel,
required: true, required: true,
width: cssStyles.createProjectFromDatabaseTextboxWidth width: cssStyles.createProjectFromDatabaseTextboxWidth
@@ -186,7 +186,7 @@ export class CreateProjectFromDatabaseDialog {
} }
private createSourceConnectionComponent(view: azdataType.ModelView): azdataType.InputBoxComponent { private createSourceConnectionComponent(view: azdataType.ModelView): azdataType.InputBoxComponent {
this.sourceConnectionTextBox = view.modelBuilder.inputBox().withProperties({ this.sourceConnectionTextBox = view.modelBuilder.inputBox().withProps({
value: '', value: '',
placeHolder: constants.selectConnection, placeHolder: constants.selectConnection,
width: cssStyles.createProjectFromDatabaseTextboxWidth, width: cssStyles.createProjectFromDatabaseTextboxWidth,
@@ -201,7 +201,7 @@ export class CreateProjectFromDatabaseDialog {
} }
private createSelectConnectionButton(view: azdataType.ModelView): azdataType.Component { private createSelectConnectionButton(view: azdataType.ModelView): azdataType.Component {
this.selectConnectionButton = view.modelBuilder.button().withProperties({ this.selectConnectionButton = view.modelBuilder.button().withProps({
ariaLabel: constants.selectConnection, ariaLabel: constants.selectConnection,
iconPath: IconPathHelper.selectConnection, iconPath: IconPathHelper.selectConnection,
height: '16px', height: '16px',
@@ -282,7 +282,7 @@ export class CreateProjectFromDatabaseDialog {
private createProjectLocationRow(view: azdataType.ModelView): azdataType.FlexContainer { private createProjectLocationRow(view: azdataType.ModelView): azdataType.FlexContainer {
const browseFolderButton: azdataType.Component = this.createBrowseFolderButton(view); const browseFolderButton: azdataType.Component = this.createBrowseFolderButton(view);
this.projectLocationTextBox = view.modelBuilder.inputBox().withProperties({ this.projectLocationTextBox = view.modelBuilder.inputBox().withProps({
value: '', value: '',
ariaLabel: constants.projectLocationLabel, ariaLabel: constants.projectLocationLabel,
placeHolder: constants.projectLocationPlaceholderText, placeHolder: constants.projectLocationPlaceholderText,
@@ -336,7 +336,7 @@ export class CreateProjectFromDatabaseDialog {
} }
private createFolderStructureRow(view: azdataType.ModelView): azdataType.FlexContainer { private createFolderStructureRow(view: azdataType.ModelView): azdataType.FlexContainer {
this.folderStructureDropDown = view.modelBuilder.dropDown().withProperties({ this.folderStructureDropDown = view.modelBuilder.dropDown().withProps({
values: [constants.file, constants.flat, constants.objectType, constants.schema, constants.schemaObjectType], values: [constants.file, constants.flat, constants.objectType, constants.schema, constants.schemaObjectType],
value: constants.schemaObjectType, value: constants.schemaObjectType,
ariaLabel: constants.folderStructureLabel, ariaLabel: constants.folderStructureLabel,
@@ -367,7 +367,7 @@ export class CreateProjectFromDatabaseDialog {
private createWorkspaceContainerRow(view: azdataType.ModelView): azdataType.FlexContainer { private createWorkspaceContainerRow(view: azdataType.ModelView): azdataType.FlexContainer {
const initialWorkspaceInputBoxValue = !!vscode.workspace.workspaceFile && !isCurrentWorkspaceUntitled() ? vscode.workspace.workspaceFile.fsPath : ''; const initialWorkspaceInputBoxValue = !!vscode.workspace.workspaceFile && !isCurrentWorkspaceUntitled() ? vscode.workspace.workspaceFile.fsPath : '';
this.workspaceInputBox = view.modelBuilder.inputBox().withProperties({ this.workspaceInputBox = view.modelBuilder.inputBox().withProps({
ariaLabel: constants.workspaceLocationTitle, ariaLabel: constants.workspaceLocationTitle,
enabled: !vscode.workspace.workspaceFile || isCurrentWorkspaceUntitled(), // want it editable if no saved workspace is open enabled: !vscode.workspace.workspaceFile || isCurrentWorkspaceUntitled(), // want it editable if no saved workspace is open
value: initialWorkspaceInputBoxValue, value: initialWorkspaceInputBoxValue,
extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts
+11 -11
View File
@@ -258,7 +258,7 @@ export class PublishDatabaseDialog {
private createRadioButtons(view: azdataType.ModelView): azdataType.Component { private createRadioButtons(view: azdataType.ModelView): azdataType.Component {
this.connectionsRadioButton = view.modelBuilder.radioButton() this.connectionsRadioButton = view.modelBuilder.radioButton()
.withProperties({ .withProps({
name: 'connection', name: 'connection',
label: constants.connectionRadioButtonLabel label: constants.connectionRadioButtonLabel
}).component(); }).component();
@@ -273,7 +273,7 @@ export class PublishDatabaseDialog {
}); });
this.dataSourcesRadioButton = view.modelBuilder.radioButton() this.dataSourcesRadioButton = view.modelBuilder.radioButton()
.withProperties({ .withProps({
name: 'connection', name: 'connection',
label: constants.dataSourceRadioButtonLabel label: constants.dataSourceRadioButtonLabel
}).component(); }).component();
@@ -290,14 +290,14 @@ export class PublishDatabaseDialog {
let flexRadioButtonsModel: azdataType.FlexContainer = view.modelBuilder.flexContainer() let flexRadioButtonsModel: azdataType.FlexContainer = view.modelBuilder.flexContainer()
.withLayout({ flexFlow: 'column' }) .withLayout({ flexFlow: 'column' })
.withItems([this.connectionsRadioButton, this.dataSourcesRadioButton]) .withItems([this.connectionsRadioButton, this.dataSourcesRadioButton])
.withProperties({ ariaRole: 'radiogroup' }) .withProps({ ariaRole: 'radiogroup' })
.component(); .component();
return flexRadioButtonsModel; return flexRadioButtonsModel;
} }
private createTargetConnectionComponent(view: azdataType.ModelView): azdataType.InputBoxComponent { private createTargetConnectionComponent(view: azdataType.ModelView): azdataType.InputBoxComponent {
this.targetConnectionTextBox = view.modelBuilder.inputBox().withProperties({ this.targetConnectionTextBox = view.modelBuilder.inputBox().withProps({
value: '', value: '',
ariaLabel: constants.targetConnectionLabel, ariaLabel: constants.targetConnectionLabel,
placeHolder: constants.selectConnection, placeHolder: constants.selectConnection,
@@ -316,7 +316,7 @@ export class PublishDatabaseDialog {
if (this.project.dataSources.length > 0) { if (this.project.dataSources.length > 0) {
return this.createDataSourcesDropdown(view); return this.createDataSourcesDropdown(view);
} else { } else {
const noDataSourcesText = view.modelBuilder.text().withProperties({ value: constants.noDataSourcesText }).component(); const noDataSourcesText = view.modelBuilder.text().withProps({ value: constants.noDataSourcesText }).component();
return { return {
title: constants.dataSourceDropdownTitle, title: constants.dataSourceDropdownTitle,
component: noDataSourcesText component: noDataSourcesText
@@ -338,7 +338,7 @@ export class PublishDatabaseDialog {
}); });
}); });
this.dataSourcesDropDown = view.modelBuilder.dropDown().withProperties({ this.dataSourcesDropDown = view.modelBuilder.dropDown().withProps({
values: dataSourcesValues, values: dataSourcesValues,
}).component(); }).component();
@@ -362,7 +362,7 @@ export class PublishDatabaseDialog {
private createProfileRow(view: azdataType.ModelView): azdataType.FlexContainer { private createProfileRow(view: azdataType.ModelView): azdataType.FlexContainer {
const loadProfileButton = this.createLoadProfileButton(view); const loadProfileButton = this.createLoadProfileButton(view);
this.loadProfileTextBox = view.modelBuilder.inputBox().withProperties({ this.loadProfileTextBox = view.modelBuilder.inputBox().withProps({
placeHolder: constants.loadProfilePlaceholderText, placeHolder: constants.loadProfilePlaceholderText,
ariaLabel: constants.profile, ariaLabel: constants.profile,
width: cssStyles.publishDialogTextboxWidth width: cssStyles.publishDialogTextboxWidth
@@ -396,7 +396,7 @@ export class PublishDatabaseDialog {
} }
private createDatabaseRow(view: azdataType.ModelView): azdataType.FlexContainer { private createDatabaseRow(view: azdataType.ModelView): azdataType.FlexContainer {
this.targetDatabaseDropDown = view.modelBuilder.dropDown().withProperties({ this.targetDatabaseDropDown = view.modelBuilder.dropDown().withProps({
values: [this.getDefaultDatabaseName()], values: [this.getDefaultDatabaseName()],
value: this.getDefaultDatabaseName(), value: this.getDefaultDatabaseName(),
ariaLabel: constants.databaseNameLabel, ariaLabel: constants.databaseNameLabel,
@@ -460,7 +460,7 @@ export class PublishDatabaseDialog {
} }
private createLoadSqlCmdVarsButton(view: azdataType.ModelView): azdataType.ButtonComponent { private createLoadSqlCmdVarsButton(view: azdataType.ModelView): azdataType.ButtonComponent {
let loadSqlCmdVarsButton: azdataType.ButtonComponent = view.modelBuilder.button().withProperties({ let loadSqlCmdVarsButton: azdataType.ButtonComponent = view.modelBuilder.button().withProps({
label: constants.loadSqlCmdVarsButtonTitle, label: constants.loadSqlCmdVarsButtonTitle,
title: constants.loadSqlCmdVarsButtonTitle, title: constants.loadSqlCmdVarsButtonTitle,
ariaLabel: constants.loadSqlCmdVarsButtonTitle, ariaLabel: constants.loadSqlCmdVarsButtonTitle,
@@ -485,7 +485,7 @@ export class PublishDatabaseDialog {
} }
private createSelectConnectionButton(view: azdataType.ModelView): azdataType.Component { private createSelectConnectionButton(view: azdataType.ModelView): azdataType.Component {
let selectConnectionButton: azdataType.ButtonComponent = view.modelBuilder.button().withProperties({ let selectConnectionButton: azdataType.ButtonComponent = view.modelBuilder.button().withProps({
ariaLabel: constants.selectConnection, ariaLabel: constants.selectConnection,
iconPath: IconPathHelper.selectConnection, iconPath: IconPathHelper.selectConnection,
height: '16px', height: '16px',
@@ -528,7 +528,7 @@ export class PublishDatabaseDialog {
} }
private createLoadProfileButton(view: azdataType.ModelView): azdataType.ButtonComponent { private createLoadProfileButton(view: azdataType.ModelView): azdataType.ButtonComponent {
let loadProfileButton: azdataType.ButtonComponent = view.modelBuilder.button().withProperties({ let loadProfileButton: azdataType.ButtonComponent = view.modelBuilder.button().withProps({
ariaLabel: constants.loadProfilePlaceholderText, ariaLabel: constants.loadProfilePlaceholderText,
iconPath: IconPathHelper.folder_blue, iconPath: IconPathHelper.folder_blue,
height: '18px', height: '18px',
samples/sqlservices/src/controllers/mainController.ts
+17 -17
View File
@@ -123,7 +123,7 @@ export default class MainController implements vscode.Disposable {
let treeDataProvider = new TreeDataProvider(root); let treeDataProvider = new TreeDataProvider(root);
let tree: azdata.TreeComponent<TreeNode> = view.modelBuilder.tree<TreeNode>().withProperties({ let tree: azdata.TreeComponent<TreeNode> = view.modelBuilder.tree<TreeNode>().withProps({
'withCheckbox': true 'withCheckbox': true
}).component(); }).component();
let treeView = tree.registerDataProvider(treeDataProvider); let treeView = tree.registerDataProvider(treeDataProvider);
@@ -156,7 +156,7 @@ export default class MainController implements vscode.Disposable {
private async getTabContent(view: azdata.ModelView, customButton1: azdata.window.Button, customButton2: azdata.window.Button, componentWidth: number | string private async getTabContent(view: azdata.ModelView, customButton1: azdata.window.Button, customButton2: azdata.window.Button, componentWidth: number | string
): Promise<void> { ): Promise<void> {
let inputBox = view.modelBuilder.inputBox() let inputBox = view.modelBuilder.inputBox()
.withProperties({ .withProps({
multiline: true, multiline: true,
height: 100 height: 100
}).component(); }).component();
@@ -170,7 +170,7 @@ export default class MainController implements vscode.Disposable {
let backupFilesInputBox = view.modelBuilder.inputBox().component(); let backupFilesInputBox = view.modelBuilder.inputBox().component();
let checkbox = view.modelBuilder.checkBox() let checkbox = view.modelBuilder.checkBox()
.withProperties({ .withProps({
label: 'Copy-only backup' label: 'Copy-only backup'
}) })
.component(); .component();
@@ -179,11 +179,11 @@ export default class MainController implements vscode.Disposable {
inputBox.enabled = !inputBox.enabled; inputBox.enabled = !inputBox.enabled;
}); });
let button = view.modelBuilder.button() let button = view.modelBuilder.button()
.withProperties({ .withProps({
label: '+' label: '+'
}).component(); }).component();
let button3 = view.modelBuilder.button() let button3 = view.modelBuilder.button()
.withProperties({ .withProps({
label: '-' label: '-'
}).component(); }).component();
@@ -191,7 +191,7 @@ export default class MainController implements vscode.Disposable {
backupFilesInputBox.value = 'Button clicked'; backupFilesInputBox.value = 'Button clicked';
}); });
let dropdown = view.modelBuilder.dropDown() let dropdown = view.modelBuilder.dropDown()
.withProperties({ .withProps({
value: 'Full', value: 'Full',
values: ['Full', 'Differential', 'Transaction Log'] values: ['Full', 'Differential', 'Transaction Log']
}) })
@@ -208,7 +208,7 @@ export default class MainController implements vscode.Disposable {
console.info('dropdown change ' + dropdown.value.toString()); console.info('dropdown change ' + dropdown.value.toString());
}); });
let radioButton = view.modelBuilder.radioButton() let radioButton = view.modelBuilder.radioButton()
.withProperties({ .withProps({
value: 'option1', value: 'option1',
name: 'radioButtonOptions', name: 'radioButtonOptions',
label: 'Option 1', label: 'Option 1',
@@ -216,7 +216,7 @@ export default class MainController implements vscode.Disposable {
// width: 300 // width: 300
}).component(); }).component();
let radioButton2 = view.modelBuilder.radioButton() let radioButton2 = view.modelBuilder.radioButton()
.withProperties({ .withProps({
value: 'option2', value: 'option2',
name: 'radioButtonOptions', name: 'radioButtonOptions',
label: 'Option 2' label: 'Option 2'
@@ -315,13 +315,13 @@ export default class MainController implements vscode.Disposable {
} }
}); });
let listBox = view.modelBuilder.listBox().withProperties({ let listBox = view.modelBuilder.listBox().withProps({
values: ['1', '2', '3'], values: ['1', '2', '3'],
selectedRow: 2 selectedRow: 2
}).component(); }).component();
let declarativeTable = view.modelBuilder.declarativeTable() let declarativeTable = view.modelBuilder.declarativeTable()
.withProperties({ .withProps({
columns: [{ columns: [{
displayName: 'Column 1', displayName: 'Column 1',
valueType: azdata.DeclarativeDataType.string, valueType: azdata.DeclarativeDataType.string,
@@ -570,12 +570,12 @@ export default class MainController implements vscode.Disposable {
editor.registerContent(async view => { editor.registerContent(async view => {
let count = 0; let count = 0;
let webview1 = view.modelBuilder.webView() let webview1 = view.modelBuilder.webView()
.withProperties({ .withProps({
html: html1 html: html1
}) })
.component(); .component();
let webview2 = view.modelBuilder.webView() let webview2 = view.modelBuilder.webView()
.withProperties({ .withProps({
html: html2 html: html2
}) })
.component(); .component();
@@ -585,13 +585,13 @@ export default class MainController implements vscode.Disposable {
}); });
let editor1 = view.modelBuilder.editor() let editor1 = view.modelBuilder.editor()
.withProperties({ .withProps({
content: 'select * from sys.tables' content: 'select * from sys.tables'
}) })
.component(); .component();
let editor2 = view.modelBuilder.editor() let editor2 = view.modelBuilder.editor()
.withProperties({ .withProps({
content: 'print("Hello World !")', content: 'print("Hello World !")',
languageMode: 'python' languageMode: 'python'
}) })
@@ -621,14 +621,14 @@ export default class MainController implements vscode.Disposable {
let inputBox = view.modelBuilder.inputBox().component(); let inputBox = view.modelBuilder.inputBox().component();
let dropdown = view.modelBuilder.dropDown() let dropdown = view.modelBuilder.dropDown()
.withProperties({ .withProps({
value: 'aa', value: 'aa',
values: ['aa', 'bb', 'cc'] values: ['aa', 'bb', 'cc']
}) })
.component(); .component();
let runIcon = path.join(__dirname, '..', 'media', 'start.svg'); let runIcon = path.join(__dirname, '..', 'media', 'start.svg');
let runButton = view.modelBuilder.button() let runButton = view.modelBuilder.button()
.withProperties({ .withProps({
label: 'Run', label: 'Run',
iconPath: runIcon, iconPath: runIcon,
title: 'Run title' title: 'Run title'
@@ -641,7 +641,7 @@ export default class MainController implements vscode.Disposable {
}; };
let monitorButton = view.modelBuilder.button() let monitorButton = view.modelBuilder.button()
.withProperties({ .withProps({
label: 'Monitor', label: 'Monitor',
iconPath: monitorIcon, iconPath: monitorIcon,
title: 'Monitor title' title: 'Monitor title'
src/sql/azdata.proposed.d.ts
Vendored
+5
View File
@@ -834,6 +834,11 @@ declare module 'azdata' {
* Specifies whether this is a secondary button. Default value is false. * Specifies whether this is a secondary button. Default value is false.
*/ */
secondary?: boolean; secondary?: boolean;
/**
* The file type filter used for the file input dialog box - only used when the button type is File
*/
fileType?: string
} }
export enum ButtonType { export enum ButtonType {
src/sql/workbench/api/common/extHostModelView.ts
+7
View File
@@ -1717,6 +1717,13 @@ class ButtonWrapper extends ComponentWithIconWrapper implements azdata.ButtonCom
this.setProperty('label', v); this.setProperty('label', v);
} }
public get fileType(): string {
return this.properties['fileType'];
}
public set fileType(v: string) {
this.setProperty('fileType', v);
}
public get onDidClick(): vscode.Event<any> { public get onDidClick(): vscode.Event<any> {
let emitter = this._emitterMap.get(ComponentEventType.onDidClick); let emitter = this._emitterMap.get(ComponentEventType.onDidClick);
return emitter && emitter.event; return emitter && emitter.event;
src/sql/workbench/test/electron-browser/api/extHostModelView.test.ts
+1 -1
View File
@@ -451,7 +451,7 @@ suite('ExtHostModelView Validation Tests', () => {
*/ */
function createDeclarativeTable(modelView: azdata.ModelView, dataType: DeclarativeDataType, data?: any[]): azdata.DeclarativeTableComponent { function createDeclarativeTable(modelView: azdata.ModelView, dataType: DeclarativeDataType, data?: any[]): azdata.DeclarativeTableComponent {
return modelView.modelBuilder.declarativeTable() return modelView.modelBuilder.declarativeTable()
.withProperties( .withProps(
{ {
columns: [ columns: [
{ {