Agent: dialog finishes (#1913)

* fixed crashes from job dialog and new step dialog group options UI

* added placeholder for retry counters

* fixed alert general UI

* fixed misc dialog errors

* localized all strings

* fixed create operator UI
This commit is contained in:
Aditya Bist
2018-07-12 19:43:59 -07:00
committed by Karl Burtram
parent 27ca9b13f8
commit 12be06d682
2 changed files with 44 additions and 49 deletions

View File

@@ -391,21 +391,23 @@ export class JobDialog extends AgentDialog<JobData> {
let formModel = view.modelBuilder.formContainer().withFormItems([ let formModel = view.modelBuilder.formContainer().withFormItems([
{ {
component: this.notificationsTabTopLabel, components:
title: '' [{
}, {
component: emailContainer, component: emailContainer,
title: '' title: ''
}, { },
{
component: pagerContainer, component: pagerContainer,
title: '' title: ''
}, { },
{
component: eventLogContainer, component: eventLogContainer,
title: '' title: ''
}, { },
{
component: deleteJobContainer, component: deleteJobContainer,
title: '' title: ''
}]).withLayout({ width: '100%' }).component(); }], title: this.NotificationsTabTopLabelString}]).withLayout({ width: '100%' }).component();
await view.initializeModel(formModel); await view.initializeModel(formModel);
this.emailConditionDropdown.values = this.model.JobCompletionActionConditions; this.emailConditionDropdown.values = this.model.JobCompletionActionConditions;

View File

@@ -35,6 +35,7 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
private static readonly PagerSundayCheckBoxLabel: string = localize('createOperator.PagerSundayCheckBox', 'Sunday'); private static readonly PagerSundayCheckBoxLabel: string = localize('createOperator.PagerSundayCheckBox', 'Sunday');
private static readonly WorkdayBeginLabel: string = localize('createOperator.workdayBegin', 'Workday begin'); private static readonly WorkdayBeginLabel: string = localize('createOperator.workdayBegin', 'Workday begin');
private static readonly WorkdayEndLabel: string = localize('createOperator.workdayEnd', 'Workday end'); private static readonly WorkdayEndLabel: string = localize('createOperator.workdayEnd', 'Workday end');
private static readonly PagerDutyScheduleLabel: string = localize('createOperator.PagerDutySchedule', 'Pager on duty schdule');
// Notifications tab strings // Notifications tab strings
private static readonly AlertsTableLabel: string = localize('createOperator.AlertListHeading', 'Alert list'); private static readonly AlertsTableLabel: string = localize('createOperator.AlertListHeading', 'Alert list');
@@ -180,7 +181,7 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
this.weekdayPagerStartTimeInput = view.modelBuilder.inputBox() this.weekdayPagerStartTimeInput = view.modelBuilder.inputBox()
.withProperties({ .withProperties({
inputType: 'time', inputType: 'time',
placeHolder: '08:00:00' placeHolder: '08:00:00',
}).component(); }).component();
this.weekdayPagerStartTimeInput.enabled = false; this.weekdayPagerStartTimeInput.enabled = false;
let weekdayStartInputContainer = view.modelBuilder.formContainer() let weekdayStartInputContainer = view.modelBuilder.formContainer()
@@ -222,7 +223,8 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
let pagerFridayCheckboxContainer = view.modelBuilder.flexContainer() let pagerFridayCheckboxContainer = view.modelBuilder.flexContainer()
.withLayout({ .withLayout({
flexFlow: 'row', flexFlow: 'row',
alignItems: 'baseline' alignItems: 'baseline',
width: '100%'
}).withItems([this.pagerFridayCheckBox, weekdayStartInputContainer, weekdayEndInputContainer]) }).withItems([this.pagerFridayCheckBox, weekdayStartInputContainer, weekdayEndInputContainer])
.component(); .component();
@@ -320,8 +322,21 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
}).withItems([this.pagerSundayCheckBox, sundayStartInputContainer, sundayEndInputContainer]) }).withItems([this.pagerSundayCheckBox, sundayStartInputContainer, sundayEndInputContainer])
.component(); .component();
let checkBoxContainer = view.modelBuilder.formContainer() let formModel = view.modelBuilder.formContainer()
.withFormItems([{ .withFormItems([{
component: this.nameTextBox,
title: OperatorDialog.NameLabel
}, {
component: this.enabledCheckBox,
title: ''
}, {
component: this.emailNameTextBox,
title: OperatorDialog.EmailNameTextLabel
}, {
component: this.pagerEmailNameTextBox,
title: OperatorDialog.PagerEmailNameTextLabel
}, {
components: [{
component: this.pagerMondayCheckBox, component: this.pagerMondayCheckBox,
title: '' title: ''
}, { }, {
@@ -342,30 +357,8 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
}, { }, {
component: pagerSundayCheckboxContainer, component: pagerSundayCheckboxContainer,
title: '' title: ''
}]).component(); }] ,
title: OperatorDialog.PagerDutyScheduleLabel
let pagerContainer = view.modelBuilder.flexContainer()
.withLayout({
flexFlow: 'row'
}).withItems([checkBoxContainer])
.component();
let formModel = view.modelBuilder.formContainer()
.withFormItems([{
component: this.nameTextBox,
title: OperatorDialog.NameLabel
}, {
component: this.enabledCheckBox,
title: ''
}, {
component: this.emailNameTextBox,
title: OperatorDialog.EmailNameTextLabel
}, {
component: this.pagerEmailNameTextBox,
title: OperatorDialog.PagerEmailNameTextLabel
}, {
component: pagerContainer,
title: ''
}]).withLayout({ width: '100%' }).component(); }]).withLayout({ width: '100%' }).component();
await view.initializeModel(formModel); await view.initializeModel(formModel);