From c2a4380b962fd93fcd4ac23b4de9f4e9bf516892 Mon Sep 17 00:00:00 2001 From: Karl Burtram Date: Tue, 3 Jul 2018 13:30:16 -0700 Subject: [PATCH] Rename Agent dialog classes to remove "Create" (#1837) * Remove Create from agent dialog names * Move actions class into common directory --- .../{createAlertDialog.ts => alertDialog.ts} | 120 +++++++++--------- .../{createJobDialog.ts => jobDialog.ts} | 10 +- .../{createStepDialog.ts => jobStepDialog.ts} | 46 +++---- ...ateOperatorDialog.ts => operatorDialog.ts} | 44 +++---- .../{createProxyDialog.ts => proxyDialog.ts} | 20 +-- ...ateScheduleDialog.ts => scheduleDialog.ts} | 2 +- extensions/agent/src/mainController.ts | 20 +-- .../{views => common}/jobActions.ts | 0 .../views/alertsView.component.ts | 5 +- .../views/jobHistory.component.ts | 13 +- .../jobManagement/views/jobsView.component.ts | 4 +- .../views/operatorsView.component.ts | 13 +- .../views/proxiesView.component.ts | 2 +- 13 files changed, 151 insertions(+), 148 deletions(-) rename extensions/agent/src/dialogs/{createAlertDialog.ts => alertDialog.ts} (81%) rename extensions/agent/src/dialogs/{createJobDialog.ts => jobDialog.ts} (98%) rename extensions/agent/src/dialogs/{createStepDialog.ts => jobStepDialog.ts} (91%) rename extensions/agent/src/dialogs/{createOperatorDialog.ts => operatorDialog.ts} (85%) rename extensions/agent/src/dialogs/{createProxyDialog.ts => proxyDialog.ts} (85%) rename extensions/agent/src/dialogs/{createScheduleDialog.ts => scheduleDialog.ts} (98%) rename src/sql/parts/jobManagement/{views => common}/jobActions.ts (100%) diff --git a/extensions/agent/src/dialogs/createAlertDialog.ts b/extensions/agent/src/dialogs/alertDialog.ts similarity index 81% rename from extensions/agent/src/dialogs/createAlertDialog.ts rename to extensions/agent/src/dialogs/alertDialog.ts index 3540ada189..846481d370 100644 --- a/extensions/agent/src/dialogs/createAlertDialog.ts +++ b/extensions/agent/src/dialogs/alertDialog.ts @@ -13,7 +13,7 @@ import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); -export class CreateAlertDialog { +export class AlertDialog { // Top level private static readonly DialogTitle: string = localize('createAlert.createAlert', 'Create Alert'); @@ -62,37 +62,37 @@ export class CreateAlertDialog { private static readonly AlertSeverity025Label: string = localize('createAlert.Severity025', '025 - Fatal Error'); private static readonly AlertTypes: string[] = [ - CreateAlertDialog.AlertTypeSqlServerEventString, - CreateAlertDialog.AlertTypePerformanceConditionString, - CreateAlertDialog.AlertTypeWmiEventString + AlertDialog.AlertTypeSqlServerEventString, + AlertDialog.AlertTypePerformanceConditionString, + AlertDialog.AlertTypeWmiEventString ]; private static readonly AlertSeverities: string[] = [ - CreateAlertDialog.AlertSeverity001Label, - CreateAlertDialog.AlertSeverity002Label, - CreateAlertDialog.AlertSeverity003Label, - CreateAlertDialog.AlertSeverity004Label, - CreateAlertDialog.AlertSeverity005Label, - CreateAlertDialog.AlertSeverity006Label, - CreateAlertDialog.AlertSeverity007Label, - CreateAlertDialog.AlertSeverity008Label, - CreateAlertDialog.AlertSeverity009Label, - CreateAlertDialog.AlertSeverity010Label, - CreateAlertDialog.AlertSeverity011Label, - CreateAlertDialog.AlertSeverity012Label, - CreateAlertDialog.AlertSeverity013Label, - CreateAlertDialog.AlertSeverity014Label, - CreateAlertDialog.AlertSeverity015Label, - CreateAlertDialog.AlertSeverity016Label, - CreateAlertDialog.AlertSeverity017Label, - CreateAlertDialog.AlertSeverity018Label, - CreateAlertDialog.AlertSeverity019Label, - CreateAlertDialog.AlertSeverity020Label, - CreateAlertDialog.AlertSeverity021Label, - CreateAlertDialog.AlertSeverity022Label, - CreateAlertDialog.AlertSeverity023Label, - CreateAlertDialog.AlertSeverity024Label, - CreateAlertDialog.AlertSeverity025Label + AlertDialog.AlertSeverity001Label, + AlertDialog.AlertSeverity002Label, + AlertDialog.AlertSeverity003Label, + AlertDialog.AlertSeverity004Label, + AlertDialog.AlertSeverity005Label, + AlertDialog.AlertSeverity006Label, + AlertDialog.AlertSeverity007Label, + AlertDialog.AlertSeverity008Label, + AlertDialog.AlertSeverity009Label, + AlertDialog.AlertSeverity010Label, + AlertDialog.AlertSeverity011Label, + AlertDialog.AlertSeverity012Label, + AlertDialog.AlertSeverity013Label, + AlertDialog.AlertSeverity014Label, + AlertDialog.AlertSeverity015Label, + AlertDialog.AlertSeverity016Label, + AlertDialog.AlertSeverity017Label, + AlertDialog.AlertSeverity018Label, + AlertDialog.AlertSeverity019Label, + AlertDialog.AlertSeverity020Label, + AlertDialog.AlertSeverity021Label, + AlertDialog.AlertSeverity022Label, + AlertDialog.AlertSeverity023Label, + AlertDialog.AlertSeverity024Label, + AlertDialog.AlertSeverity025Label ]; // Response tab strings @@ -158,10 +158,10 @@ export class CreateAlertDialog { let databases = await AgentUtils.getDatabases(this.ownerUri); await this.model.initialize(); - this.dialog = sqlops.window.modelviewdialog.createDialog(CreateAlertDialog.DialogTitle); - this.generalTab = sqlops.window.modelviewdialog.createTab(CreateAlertDialog.GeneralTabText); - this.responseTab = sqlops.window.modelviewdialog.createTab(CreateAlertDialog.ResponseTabText); - this.optionsTab = sqlops.window.modelviewdialog.createTab(CreateAlertDialog.OptionsTabText); + this.dialog = sqlops.window.modelviewdialog.createDialog(AlertDialog.DialogTitle); + this.generalTab = sqlops.window.modelviewdialog.createTab(AlertDialog.GeneralTabText); + this.responseTab = sqlops.window.modelviewdialog.createTab(AlertDialog.ResponseTabText); + this.optionsTab = sqlops.window.modelviewdialog.createTab(AlertDialog.OptionsTabText); this.initializeGeneralTab(databases); this.initializeResponseTab(); @@ -170,8 +170,8 @@ export class CreateAlertDialog { this.dialog.content = [this.generalTab, this.responseTab, this.optionsTab]; this.dialog.okButton.onClick(async () => await this.execute()); this.dialog.cancelButton.onClick(async () => await this.cancel()); - this.dialog.okButton.label = CreateAlertDialog.OkButtonText; - this.dialog.cancelButton.label = CreateAlertDialog.CancelButtonText; + this.dialog.okButton.label = AlertDialog.OkButtonText; + this.dialog.cancelButton.label = AlertDialog.CancelButtonText; sqlops.window.modelviewdialog.openDialog(this.dialog); } @@ -182,7 +182,7 @@ export class CreateAlertDialog { this.enabledCheckBox = view.modelBuilder.checkBox() .withProperties({ - label: CreateAlertDialog.EnabledCheckboxLabel + label: AlertDialog.EnabledCheckboxLabel }).component(); this.databaseDropDown = view.modelBuilder.dropDown() @@ -193,19 +193,19 @@ export class CreateAlertDialog { this.typeDropDown = view.modelBuilder.dropDown() .withProperties({ - value: CreateAlertDialog.AlertTypes[0], - values: CreateAlertDialog.AlertTypes + value: AlertDialog.AlertTypes[0], + values: AlertDialog.AlertTypes }).component(); this.severityDropDown = view.modelBuilder.dropDown() .withProperties({ - value: CreateAlertDialog.AlertSeverities[0], - values: CreateAlertDialog.AlertSeverities + value: AlertDialog.AlertSeverities[0], + values: AlertDialog.AlertSeverities }).component(); this.raiseAlertMessageCheckBox = view.modelBuilder.checkBox() .withProperties({ - label: CreateAlertDialog.RaiseIfMessageContainsLabel + label: AlertDialog.RaiseIfMessageContainsLabel }).component(); this.raiseAlertMessageTextBox = view.modelBuilder.inputBox().component(); @@ -213,22 +213,22 @@ export class CreateAlertDialog { let formModel = view.modelBuilder.formContainer() .withFormItems([{ component: this.nameTextBox, - title: CreateAlertDialog.NameLabel + title: AlertDialog.NameLabel }, { component: this.enabledCheckBox, title: '' }, { component: this.typeDropDown, - title: CreateAlertDialog.TypeLabel + title: AlertDialog.TypeLabel }, { component: this.databaseDropDown, - title: CreateAlertDialog.DatabaseLabel + title: AlertDialog.DatabaseLabel }, { component: this.raiseAlertMessageCheckBox, - title: CreateAlertDialog.RaiseIfMessageContainsLabel + title: AlertDialog.RaiseIfMessageContainsLabel }, { component: this.raiseAlertMessageTextBox, - title: CreateAlertDialog.MessageTextLabel + title: AlertDialog.MessageTextLabel } ]).withLayout({ width: '100%' }).component(); @@ -240,27 +240,27 @@ export class CreateAlertDialog { this.responseTab.registerContent(async view => { this.executeJobCheckBox = view.modelBuilder.checkBox() .withProperties({ - label: CreateAlertDialog.ExecuteJobCheckBoxLabel + label: AlertDialog.ExecuteJobCheckBoxLabel }).component(); this.executeJobTextBox = view.modelBuilder.inputBox().component(); this.newJobButton = view.modelBuilder.button().withProperties({ - label: CreateAlertDialog.NewJobButtonLabel, + label: AlertDialog.NewJobButtonLabel, width: 80 }).component(); this.notifyOperatorsCheckBox = view.modelBuilder.checkBox() .withProperties({ - label: CreateAlertDialog.NotifyOperatorsTextBoxLabel + label: AlertDialog.NotifyOperatorsTextBoxLabel }).component(); this.operatorsTable = view.modelBuilder.table() .withProperties({ columns: [ - CreateAlertDialog.OperatorNameColumnLabel, - CreateAlertDialog.OperatorEmailColumnLabel, - CreateAlertDialog.OperatorPagerColumnLabel + AlertDialog.OperatorNameColumnLabel, + AlertDialog.OperatorEmailColumnLabel, + AlertDialog.OperatorPagerColumnLabel ], data: [], height: 500 @@ -277,16 +277,16 @@ export class CreateAlertDialog { title: '' }, { component: this.executeJobTextBox, - title: CreateAlertDialog.ExecuteJobTextBoxLabel + title: AlertDialog.ExecuteJobTextBoxLabel }, { component: this.newJobButton, - title: CreateAlertDialog.NewJobButtonLabel + title: AlertDialog.NewJobButtonLabel }, { component: this.notifyOperatorsCheckBox, title: '' }, { component: this.operatorsTable, - title: CreateAlertDialog.OperatorListLabel, + title: AlertDialog.OperatorListLabel, actions: [this.newOperatorButton] }]).withLayout({ width: '100%' }).component(); @@ -299,12 +299,12 @@ export class CreateAlertDialog { this.includeErrorInEmailTextBox = view.modelBuilder.checkBox() .withProperties({ - label: CreateAlertDialog.IncludeErrorInEmailCheckBoxLabel + label: AlertDialog.IncludeErrorInEmailCheckBoxLabel }).component(); this.includeErrorInPagerTextBox = view.modelBuilder.checkBox() .withProperties({ - label: CreateAlertDialog.IncludeErrorInPagerCheckBoxLabel + label: AlertDialog.IncludeErrorInPagerCheckBoxLabel }).component(); this.additionalMessageTextBox = view.modelBuilder.inputBox().component(); @@ -322,13 +322,13 @@ export class CreateAlertDialog { title: '' }, { component: this.additionalMessageTextBox, - title: CreateAlertDialog.AdditionalMessageTextBoxLabel + title: AlertDialog.AdditionalMessageTextBoxLabel }, { component: this.delayMinutesTextBox, - title: CreateAlertDialog.DelayMinutesTextBoxLabel + title: AlertDialog.DelayMinutesTextBoxLabel }, { component: this.delaySecondsTextBox, - title: CreateAlertDialog.DelaySecondsTextBoxLabel + title: AlertDialog.DelaySecondsTextBoxLabel }]).withLayout({ width: '100%' }).component(); await view.initializeModel(formModel); diff --git a/extensions/agent/src/dialogs/createJobDialog.ts b/extensions/agent/src/dialogs/jobDialog.ts similarity index 98% rename from extensions/agent/src/dialogs/createJobDialog.ts rename to extensions/agent/src/dialogs/jobDialog.ts index bd5a39c6e0..eb617ed483 100644 --- a/extensions/agent/src/dialogs/createJobDialog.ts +++ b/extensions/agent/src/dialogs/jobDialog.ts @@ -5,11 +5,11 @@ 'use strict'; import * as sqlops from 'sqlops'; import { CreateJobData } from '../data/createJobData'; -import { CreateStepDialog } from './createStepDialog'; +import { JobStepDialog } from './jobStepDialog'; import { PickScheduleDialog } from './pickScheduleDialog'; -import { CreateAlertDialog } from './createAlertDialog'; +import { AlertDialog } from './alertDialog'; -export class CreateJobDialog { +export class JobDialog { // TODO: localize // Top level @@ -200,7 +200,7 @@ export class CreateJobDialog { }).component(); this.newStepButton.onDidClick((e)=>{ - let stepDialog = new CreateStepDialog(this.model.ownerUri, '', '', 1, this.model); + let stepDialog = new JobStepDialog(this.model.ownerUri, '', '', 1, this.model); stepDialog.openNewStepDialog(); }); @@ -247,7 +247,7 @@ export class CreateJobDialog { }).component(); this.newAlertButton.onDidClick((e)=>{ - let alertDialog = new CreateAlertDialog(this.model.ownerUri); + let alertDialog = new AlertDialog(this.model.ownerUri); alertDialog.onSuccess((dialogModel) => { }); alertDialog.showDialog(); diff --git a/extensions/agent/src/dialogs/createStepDialog.ts b/extensions/agent/src/dialogs/jobStepDialog.ts similarity index 91% rename from extensions/agent/src/dialogs/createStepDialog.ts rename to extensions/agent/src/dialogs/jobStepDialog.ts index c6a812e9c6..4a8d82de64 100644 --- a/extensions/agent/src/dialogs/createStepDialog.ts +++ b/extensions/agent/src/dialogs/jobStepDialog.ts @@ -10,7 +10,7 @@ import { AgentUtils } from '../agentUtils'; import { CreateJobData } from '../data/createJobData'; const path = require('path'); -export class CreateStepDialog { +export class JobStepDialog { // TODO: localize // Top level @@ -98,24 +98,24 @@ export class CreateStepDialog { } private initializeUIComponents() { - this.dialog = sqlops.window.modelviewdialog.createDialog(CreateStepDialog.DialogTitle); - this.generalTab = sqlops.window.modelviewdialog.createTab(CreateStepDialog.GeneralTabText); - this.advancedTab = sqlops.window.modelviewdialog.createTab(CreateStepDialog.AdvancedTabText); + this.dialog = sqlops.window.modelviewdialog.createDialog(JobStepDialog.DialogTitle); + this.generalTab = sqlops.window.modelviewdialog.createTab(JobStepDialog.GeneralTabText); + this.advancedTab = sqlops.window.modelviewdialog.createTab(JobStepDialog.AdvancedTabText); this.dialog.content = [this.generalTab, this.advancedTab]; this.dialog.okButton.onClick(async () => await this.execute()); - this.dialog.okButton.label = CreateStepDialog.OkButtonText; - this.dialog.cancelButton.label = CreateStepDialog.CancelButtonText; + this.dialog.okButton.label = JobStepDialog.OkButtonText; + this.dialog.cancelButton.label = JobStepDialog.CancelButtonText; } private createCommands(view, queryProvider: sqlops.QueryProvider) { this.openButton = view.modelBuilder.button() .withProperties({ - label: CreateStepDialog.OpenCommandText, + label: JobStepDialog.OpenCommandText, width: '80px' }).component(); this.parseButton = view.modelBuilder.button() .withProperties({ - label: CreateStepDialog.ParseCommandText, + label: JobStepDialog.ParseCommandText, width: '80px' }).component(); this.parseButton.onDidClick(e => { @@ -139,13 +139,13 @@ export class CreateStepDialog { .component(); this.nextButton = view.modelBuilder.button() .withProperties({ - label: CreateStepDialog.NextButtonText, + label: JobStepDialog.NextButtonText, enabled: false, width: '80px' }).component(); this.previousButton = view.modelBuilder.button() .withProperties({ - label: CreateStepDialog.PreviousButtonText, + label: JobStepDialog.PreviousButtonText, enabled: false, width: '80px' }).component(); @@ -159,8 +159,8 @@ export class CreateStepDialog { this.nameTextBox.required = true; this.typeDropdown = view.modelBuilder.dropDown() .withProperties({ - value: CreateStepDialog.TSQLScript, - values: [CreateStepDialog.TSQLScript] + value: JobStepDialog.TSQLScript, + values: [JobStepDialog.TSQLScript] }) .component(); this.runAsDropdown = view.modelBuilder.dropDown() @@ -171,8 +171,8 @@ export class CreateStepDialog { .component(); this.runAsDropdown.enabled = false; this.typeDropdown.onValueChanged((type) => { - if (type.selected !== CreateStepDialog.TSQLScript) { - this.runAsDropdown.value = CreateStepDialog.AgentServiceAccount; + if (type.selected !== JobStepDialog.TSQLScript) { + this.runAsDropdown.value = JobStepDialog.AgentServiceAccount; this.runAsDropdown.values = [this.runAsDropdown.value]; } else { this.runAsDropdown.value = ''; @@ -251,15 +251,15 @@ export class CreateStepDialog { this.advancedTab.registerContent(async (view) => { this.successActionDropdown = view.modelBuilder.dropDown() .withProperties({ - value: CreateStepDialog.NextStep, - values: [CreateStepDialog.NextStep, CreateStepDialog.QuitJobReportingSuccess, CreateStepDialog.QuitJobReportingFailure] + value: JobStepDialog.NextStep, + values: [JobStepDialog.NextStep, JobStepDialog.QuitJobReportingSuccess, JobStepDialog.QuitJobReportingFailure] }) .component(); let retryFlexContainer = this.createRetryCounters(view); this.failureActionDropdown = view.modelBuilder.dropDown() .withProperties({ - value: CreateStepDialog.QuitJobReportingFailure, - values: [CreateStepDialog.QuitJobReportingFailure, CreateStepDialog.NextStep, CreateStepDialog.QuitJobReportingSuccess] + value: JobStepDialog.QuitJobReportingFailure, + values: [JobStepDialog.QuitJobReportingFailure, JobStepDialog.NextStep, JobStepDialog.QuitJobReportingSuccess] }) .component(); let optionsGroup = this.createTSQLOptions(view); @@ -289,13 +289,13 @@ export class CreateStepDialog { .withFormItems( [{ component: this.successActionDropdown, - title: CreateStepDialog.SuccessAction + title: JobStepDialog.SuccessAction }, { component: retryFlexContainer, title: '' }, { component: this.failureActionDropdown, - title: CreateStepDialog.FailureAction + title: JobStepDialog.FailureAction }, { component: optionsGroup, title: 'Transact-SQL script (T-SQL)' @@ -362,7 +362,7 @@ export class CreateStepDialog { } private openFileBrowserDialog() { - let fileBrowserTitle = CreateStepDialog.FileBrowserDialogTitle + `${this.server}`; + let fileBrowserTitle = JobStepDialog.FileBrowserDialogTitle + `${this.server}`; this.fileBrowserDialog = sqlops.window.modelviewdialog.createDialog(fileBrowserTitle); let fileBrowserTab = sqlops.window.modelviewdialog.createTab('File Browser'); this.fileBrowserDialog.content = [fileBrowserTab]; @@ -406,8 +406,8 @@ export class CreateStepDialog { this.fileBrowserDialog.okButton.onClick(() => { this.outputFileNameBox.value = path.join(path.dirname(this.selectedPathTextBox.value), this.fileBrowserNameBox.value); }); - this.fileBrowserDialog.okButton.label = CreateStepDialog.OkButtonText; - this.fileBrowserDialog.cancelButton.label = CreateStepDialog.CancelButtonText; + this.fileBrowserDialog.okButton.label = JobStepDialog.OkButtonText; + this.fileBrowserDialog.cancelButton.label = JobStepDialog.CancelButtonText; sqlops.window.modelviewdialog.openDialog(this.fileBrowserDialog); } diff --git a/extensions/agent/src/dialogs/createOperatorDialog.ts b/extensions/agent/src/dialogs/operatorDialog.ts similarity index 85% rename from extensions/agent/src/dialogs/createOperatorDialog.ts rename to extensions/agent/src/dialogs/operatorDialog.ts index cd3d7d96d6..6fd813698f 100644 --- a/extensions/agent/src/dialogs/createOperatorDialog.ts +++ b/extensions/agent/src/dialogs/operatorDialog.ts @@ -12,7 +12,7 @@ import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); -export class CreateOperatorDialog { +export class OperatorDialog { // Top level private static readonly DialogTitle: string = localize('createOperator.createOperator', 'Create Operator'); @@ -72,9 +72,9 @@ export class CreateOperatorDialog { public async showDialog() { await this.model.initialize(); - this.dialog = sqlops.window.modelviewdialog.createDialog(CreateOperatorDialog.DialogTitle); - this.generalTab = sqlops.window.modelviewdialog.createTab(CreateOperatorDialog.GeneralTabText); - this.notificationsTab = sqlops.window.modelviewdialog.createTab(CreateOperatorDialog.NotificationsTabText); + this.dialog = sqlops.window.modelviewdialog.createDialog(OperatorDialog.DialogTitle); + this.generalTab = sqlops.window.modelviewdialog.createTab(OperatorDialog.GeneralTabText); + this.notificationsTab = sqlops.window.modelviewdialog.createTab(OperatorDialog.NotificationsTabText); this.initializeGeneralTab(); this.initializeNotificationTab(); @@ -82,8 +82,8 @@ export class CreateOperatorDialog { this.dialog.content = [this.generalTab, this.notificationsTab]; this.dialog.okButton.onClick(async () => await this.execute()); this.dialog.cancelButton.onClick(async () => await this.cancel()); - this.dialog.okButton.label = CreateOperatorDialog.OkButtonText; - this.dialog.cancelButton.label = CreateOperatorDialog.CancelButtonText; + this.dialog.okButton.label = OperatorDialog.OkButtonText; + this.dialog.cancelButton.label = OperatorDialog.CancelButtonText; sqlops.window.modelviewdialog.openDialog(this.dialog); } @@ -94,7 +94,7 @@ export class CreateOperatorDialog { this.enabledCheckBox = view.modelBuilder.checkBox() .withProperties({ - label: CreateOperatorDialog.EnabledCheckboxLabel + label: OperatorDialog.EnabledCheckboxLabel }).component(); this.emailNameTextBox = view.modelBuilder.inputBox().component(); @@ -103,57 +103,57 @@ export class CreateOperatorDialog { this.enabledCheckBox = view.modelBuilder.checkBox() .withProperties({ - label: CreateOperatorDialog.EnabledCheckboxLabel + label: OperatorDialog.EnabledCheckboxLabel }).component(); this.pagerMondayCheckBox = view.modelBuilder.checkBox() .withProperties({ - label: CreateOperatorDialog.PagerMondayCheckBoxLabel + label: OperatorDialog.PagerMondayCheckBoxLabel }).component(); this.pagerTuesdayCheckBox = view.modelBuilder.checkBox() .withProperties({ - label: CreateOperatorDialog.PagerTuesdayCheckBoxLabel + label: OperatorDialog.PagerTuesdayCheckBoxLabel }).component(); this.pagerWednesdayCheckBox = view.modelBuilder.checkBox() .withProperties({ - label: CreateOperatorDialog.PagerWednesdayCheckBoxLabel + label: OperatorDialog.PagerWednesdayCheckBoxLabel }).component(); this.pagerThursdayCheckBox = view.modelBuilder.checkBox() .withProperties({ - label: CreateOperatorDialog.PagerThursdayCheckBoxLabel + label: OperatorDialog.PagerThursdayCheckBoxLabel }).component(); this.pagerFridayCheckBox = view.modelBuilder.checkBox() .withProperties({ - label: CreateOperatorDialog.PagerFridayCheckBoxLabel + label: OperatorDialog.PagerFridayCheckBoxLabel }).component(); this.pagerSaturdayCheckBox = view.modelBuilder.checkBox() .withProperties({ - label: CreateOperatorDialog.PagerSaturdayCheckBoxLabel + label: OperatorDialog.PagerSaturdayCheckBoxLabel }).component(); this.pagerSundayCheckBox = view.modelBuilder.checkBox() .withProperties({ - label: CreateOperatorDialog.PagerSundayCheckBoxLabel + label: OperatorDialog.PagerSundayCheckBoxLabel }).component(); let formModel = view.modelBuilder.formContainer() .withFormItems([{ component: this.nameTextBox, - title: CreateOperatorDialog.NameLabel + title: OperatorDialog.NameLabel }, { component: this.enabledCheckBox, title: '' }, { component: this.emailNameTextBox, - title: CreateOperatorDialog.EmailNameTextLabel + title: OperatorDialog.EmailNameTextLabel }, { component: this.pagerEmailNameTextBox, - title: CreateOperatorDialog.PagerEmailNameTextLabel + title: OperatorDialog.PagerEmailNameTextLabel }, { component: this.pagerTuesdayCheckBox, title: '' @@ -184,9 +184,9 @@ export class CreateOperatorDialog { this.alertsTable = view.modelBuilder.table() .withProperties({ columns: [ - CreateOperatorDialog.AlertNameColumnLabel, - CreateOperatorDialog.AlertEmailColumnLabel, - CreateOperatorDialog.AlertPagerColumnLabel + OperatorDialog.AlertNameColumnLabel, + OperatorDialog.AlertEmailColumnLabel, + OperatorDialog.AlertPagerColumnLabel ], data: [], height: 500 @@ -195,7 +195,7 @@ export class CreateOperatorDialog { let formModel = view.modelBuilder.formContainer() .withFormItems([{ component: this.alertsTable, - title: CreateOperatorDialog.AlertsTableLabel + title: OperatorDialog.AlertsTableLabel }]).withLayout({ width: '100%' }).component(); await view.initializeModel(formModel); diff --git a/extensions/agent/src/dialogs/createProxyDialog.ts b/extensions/agent/src/dialogs/proxyDialog.ts similarity index 85% rename from extensions/agent/src/dialogs/createProxyDialog.ts rename to extensions/agent/src/dialogs/proxyDialog.ts index 8d5bf5445c..06efebd8e0 100644 --- a/extensions/agent/src/dialogs/createProxyDialog.ts +++ b/extensions/agent/src/dialogs/proxyDialog.ts @@ -12,7 +12,7 @@ import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); -export class CreateProxyDialog { +export class ProxyDialog { // Top level private static readonly DialogTitle: string = localize('createProxy.createAlert', 'Create Alert'); @@ -48,16 +48,16 @@ export class CreateProxyDialog { public async showDialog() { await this.model.initialize(); - this.dialog = sqlops.window.modelviewdialog.createDialog(CreateProxyDialog.DialogTitle); - this.generalTab = sqlops.window.modelviewdialog.createTab(CreateProxyDialog.GeneralTabText); + this.dialog = sqlops.window.modelviewdialog.createDialog(ProxyDialog.DialogTitle); + this.generalTab = sqlops.window.modelviewdialog.createTab(ProxyDialog.GeneralTabText); this.initializeGeneralTab(); this.dialog.content = [this.generalTab]; this.dialog.okButton.onClick(async () => await this.execute()); this.dialog.cancelButton.onClick(async () => await this.cancel()); - this.dialog.okButton.label = CreateProxyDialog.OkButtonText; - this.dialog.cancelButton.label = CreateProxyDialog.CancelButtonText; + this.dialog.okButton.label = ProxyDialog.OkButtonText; + this.dialog.cancelButton.label = ProxyDialog.CancelButtonText; sqlops.window.modelviewdialog.openDialog(this.dialog); } @@ -74,7 +74,7 @@ export class CreateProxyDialog { this.subsystemsTable = view.modelBuilder.table() .withProperties({ columns: [ - CreateProxyDialog.SubsystemNameColumnLabel + ProxyDialog.SubsystemNameColumnLabel ], data: [], height: 500 @@ -83,16 +83,16 @@ export class CreateProxyDialog { let formModel = view.modelBuilder.formContainer() .withFormItems([{ component: this.proxyNameTextBox, - title: CreateProxyDialog.ProxyNameTextBoxLabel + title: ProxyDialog.ProxyNameTextBoxLabel }, { component: this.credentialNameTextBox, - title: CreateProxyDialog.CredentialNameTextBoxLabel + title: ProxyDialog.CredentialNameTextBoxLabel }, { component: this.descriptionTextBox, - title: CreateProxyDialog.DescriptionTextBoxLabel + title: ProxyDialog.DescriptionTextBoxLabel }, { component: this.subsystemsTable, - title: CreateProxyDialog.SubsystemsTableLabel + title: ProxyDialog.SubsystemsTableLabel }]).withLayout({ width: '100%' }).component(); await view.initializeModel(formModel); diff --git a/extensions/agent/src/dialogs/createScheduleDialog.ts b/extensions/agent/src/dialogs/scheduleDialog.ts similarity index 98% rename from extensions/agent/src/dialogs/createScheduleDialog.ts rename to extensions/agent/src/dialogs/scheduleDialog.ts index 5f1994b3f9..b408279b8e 100644 --- a/extensions/agent/src/dialogs/createScheduleDialog.ts +++ b/extensions/agent/src/dialogs/scheduleDialog.ts @@ -9,7 +9,7 @@ import * as sqlops from 'sqlops'; import * as vscode from 'vscode'; import { CreateScheduleData } from '../data/createScheduleData'; -export class CreateScheduleDialog { +export class ScheduleDialog { // Top level private readonly DialogTitle: string = 'New Schedule'; diff --git a/extensions/agent/src/mainController.ts b/extensions/agent/src/mainController.ts index be32105491..fc7b992d19 100644 --- a/extensions/agent/src/mainController.ts +++ b/extensions/agent/src/mainController.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; import * as vscode from 'vscode'; -import { CreateAlertDialog } from './dialogs/createAlertDialog'; -import { CreateJobDialog } from './dialogs/createJobDialog'; -import { CreateOperatorDialog } from './dialogs/createOperatorDialog'; -import { CreateProxyDialog } from './dialogs/createProxyDialog'; -import { CreateStepDialog } from './dialogs/createStepDialog'; +import { AlertDialog } from './dialogs/alertDialog'; +import { JobDialog } from './dialogs/jobDialog'; +import { OperatorDialog } from './dialogs/operatorDialog'; +import { ProxyDialog } from './dialogs/proxyDialog'; +import { JobStepDialog } from './dialogs/jobStepDialog'; import { PickScheduleDialog } from './dialogs/pickScheduleDialog'; /** @@ -27,11 +27,11 @@ export class MainController { */ public activate(): void { vscode.commands.registerCommand('agent.openCreateJobDialog', (ownerUri: string) => { - let dialog = new CreateJobDialog(ownerUri); + let dialog = new JobDialog(ownerUri); dialog.showDialog(); }); vscode.commands.registerCommand('agent.openNewStepDialog', (ownerUri: string, jobId: string, server: string, stepId: number) => { - let dialog = new CreateStepDialog(ownerUri, jobId, server, stepId); + let dialog = new JobStepDialog(ownerUri, jobId, server, stepId); dialog.openNewStepDialog(); }); vscode.commands.registerCommand('agent.openPickScheduleDialog', (ownerUri: string) => { @@ -39,15 +39,15 @@ export class MainController { dialog.showDialog(); }); vscode.commands.registerCommand('agent.openCreateAlertDialog', (ownerUri: string) => { - let dialog = new CreateAlertDialog(ownerUri); + let dialog = new AlertDialog(ownerUri); dialog.showDialog(); }); vscode.commands.registerCommand('agent.openCreateOperatorDialog', (ownerUri: string) => { - let dialog = new CreateOperatorDialog(ownerUri); + let dialog = new OperatorDialog(ownerUri); dialog.showDialog(); }); vscode.commands.registerCommand('agent.openCreateProxyDialog', (ownerUri: string) => { - let dialog = new CreateProxyDialog(ownerUri); + let dialog = new ProxyDialog(ownerUri); dialog.showDialog(); }); } diff --git a/src/sql/parts/jobManagement/views/jobActions.ts b/src/sql/parts/jobManagement/common/jobActions.ts similarity index 100% rename from src/sql/parts/jobManagement/views/jobActions.ts rename to src/sql/parts/jobManagement/common/jobActions.ts diff --git a/src/sql/parts/jobManagement/views/alertsView.component.ts b/src/sql/parts/jobManagement/views/alertsView.component.ts index 2552e54ac5..159cb4031e 100644 --- a/src/sql/parts/jobManagement/views/alertsView.component.ts +++ b/src/sql/parts/jobManagement/views/alertsView.component.ts @@ -17,18 +17,19 @@ import * as dom from 'vs/base/browser/dom'; import * as nls from 'vs/nls'; import * as sqlops from 'sqlops'; import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit } from '@angular/core'; +import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces'; +import { EditAlert, DeleteAlert } from 'sql/parts/jobManagement/common/jobActions'; import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IAction } from 'vs/base/common/actions'; import { TPromise } from 'vs/base/common/winjs.base'; -import { EditAlert, DeleteAlert } from 'sql/parts/jobManagement/views/jobActions'; + import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; export const VIEW_SELECTOR: string = 'jobalertsview-component'; diff --git a/src/sql/parts/jobManagement/views/jobHistory.component.ts b/src/sql/parts/jobManagement/views/jobHistory.component.ts index aa5ac446aa..d578eff46d 100644 --- a/src/sql/parts/jobManagement/views/jobHistory.component.ts +++ b/src/sql/parts/jobManagement/views/jobHistory.component.ts @@ -5,18 +5,19 @@ import 'vs/css!./jobHistory'; import 'vs/css!sql/media/icons/common-icons'; -import { OnInit, OnChanges, Component, Inject, Input, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, ChangeDetectionStrategy, Injectable } from '@angular/core'; + import * as sqlops from 'sqlops'; -import { Taskbar, ITaskbarContent } from 'sql/base/browser/ui/taskbar/taskbar'; -import { RunJobAction, StopJobAction, NewStepAction } from 'sql/parts/jobManagement/views/jobActions'; +import { OnInit, Component, Inject, Input, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, ChangeDetectionStrategy, Injectable } from '@angular/core'; +import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; +import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; +import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { RunJobAction, StopJobAction, NewStepAction } from 'sql/parts/jobManagement/common/jobActions'; import { JobCacheObject } from 'sql/parts/jobManagement/common/jobManagementService'; import { JobManagementUtilities } from 'sql/parts/jobManagement/common/jobManagementUtilities'; import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; import { JobHistoryController, JobHistoryDataSource, JobHistoryRenderer, JobHistoryFilter, JobHistoryModel, JobHistoryRow } from 'sql/parts/jobManagement/views/jobHistoryTree'; -import { JobStepsViewRow } from './jobStepsViewTree'; +import { JobStepsViewRow } from 'sql/parts/jobManagement/views/jobStepsViewTree'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { attachListStyler } from 'vs/platform/theme/common/styler'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; diff --git a/src/sql/parts/jobManagement/views/jobsView.component.ts b/src/sql/parts/jobManagement/views/jobsView.component.ts index db289b0f8a..2f30e7cc25 100644 --- a/src/sql/parts/jobManagement/views/jobsView.component.ts +++ b/src/sql/parts/jobManagement/views/jobsView.component.ts @@ -16,23 +16,23 @@ import * as sqlops from 'sqlops'; import * as nls from 'vs/nls'; import * as dom from 'vs/base/browser/dom'; import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, AfterContentChecked, OnInit } from '@angular/core'; +import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowdetailview'; import { JobCacheObject } from 'sql/parts/jobManagement/common/jobManagementService'; +import { EditJob, DeleteJob } from 'sql/parts/jobManagement/common/jobActions'; import { JobManagementUtilities } from 'sql/parts/jobManagement/common/jobManagementUtilities'; import { HeaderFilter } from 'sql/base/browser/ui/table/plugins/headerFilter.plugin'; import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces'; import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { TPromise } from 'vs/base/common/winjs.base'; import { IAction } from 'vs/base/common/actions'; -import { EditJob, DeleteJob } from 'sql/parts/jobManagement/views/jobActions'; export const JOBSVIEW_SELECTOR: string = 'jobsview-component'; export const ROW_HEIGHT: number = 45; diff --git a/src/sql/parts/jobManagement/views/operatorsView.component.ts b/src/sql/parts/jobManagement/views/operatorsView.component.ts index a0c59b7525..7568cf7330 100644 --- a/src/sql/parts/jobManagement/views/operatorsView.component.ts +++ b/src/sql/parts/jobManagement/views/operatorsView.component.ts @@ -12,23 +12,24 @@ import 'vs/css!../common/media/jobs'; import 'vs/css!sql/media/icons/common-icons'; import 'vs/css!sql/base/browser/ui/table/media/table'; -import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as dom from 'vs/base/browser/dom'; import * as nls from 'vs/nls'; +import * as sqlops from 'sqlops'; +import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit } from '@angular/core'; import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; -import * as dom from 'vs/base/browser/dom'; -import { IJobManagementService } from '../common/interfaces'; +import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces'; +import { EditOperator, DeleteOperator } from 'sql/parts/jobManagement/common/jobActions'; +import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { ICommandService } from 'vs/platform/commands/common/commands'; -import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { TPromise } from 'vs/base/common/winjs.base'; import { IAction } from 'vs/base/common/actions'; -import { EditOperator, DeleteOperator } from 'sql/parts/jobManagement/views/jobActions'; + export const VIEW_SELECTOR: string = 'joboperatorsview-component'; export const ROW_HEIGHT: number = 45; diff --git a/src/sql/parts/jobManagement/views/proxiesView.component.ts b/src/sql/parts/jobManagement/views/proxiesView.component.ts index 3ec7109e5c..4d026b03f0 100644 --- a/src/sql/parts/jobManagement/views/proxiesView.component.ts +++ b/src/sql/parts/jobManagement/views/proxiesView.component.ts @@ -19,7 +19,7 @@ import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces'; -import { EditProxy, DeleteProxy } from 'sql/parts/jobManagement/views/jobActions'; +import { EditProxy, DeleteProxy } from 'sql/parts/jobManagement/common/jobActions'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView';