diff --git a/extensions/agent/src/data/jobData.ts b/extensions/agent/src/data/jobData.ts index 71bb365262..c5b6bff3c0 100644 --- a/extensions/agent/src/data/jobData.ts +++ b/extensions/agent/src/data/jobData.ts @@ -117,7 +117,7 @@ export class JobData implements IAgentDialogData { if (!result || !result.success) { vscode.window.showErrorMessage( - localize('alertData.saveErrorMessage', "Alert update failed '{0}'", result.errorMessage ? result.errorMessage : 'Unknown')); + localize('jobData.saveErrorMessage', "Job update failed '{0}'", result.errorMessage ? result.errorMessage : 'Unknown')); } } diff --git a/extensions/agent/src/data/proxyData.ts b/extensions/agent/src/data/proxyData.ts index 7d7352db2a..d05683db73 100644 --- a/extensions/agent/src/data/proxyData.ts +++ b/extensions/agent/src/data/proxyData.ts @@ -35,7 +35,6 @@ export class ProxyData implements IAgentDialogData { public async save() { let agentService = await AgentUtils.getAgentService(); let result = await agentService.createProxy(this.ownerUri, this.toAgentProxyInfo()); - console.log(result); if (!result || !result.success) { // TODO handle error here } diff --git a/extensions/agent/src/dialogs/jobDialog.ts b/extensions/agent/src/dialogs/jobDialog.ts index 9f8700fbed..9840a8df97 100644 --- a/extensions/agent/src/dialogs/jobDialog.ts +++ b/extensions/agent/src/dialogs/jobDialog.ts @@ -204,7 +204,7 @@ export class JobDialog extends AgentDialog { this.StepsTable_FailureColumnString ], data: [], - height: 300 + height: 430 }).component(); this.moveStepUpButton = view.modelBuilder.button() @@ -261,7 +261,7 @@ export class JobDialog extends AgentDialog { this.AlertNameLabelString ], data: [], - height: 300, + height: 430, width: 400 }).component(); @@ -296,7 +296,7 @@ export class JobDialog extends AgentDialog { this.ScheduleNameLabelString ], data: [], - height: 300, + height: 430, width: 420 }).component(); diff --git a/extensions/agent/src/mainController.ts b/extensions/agent/src/mainController.ts index 30b446fd59..e0d1eedb6a 100644 --- a/extensions/agent/src/mainController.ts +++ b/extensions/agent/src/mainController.ts @@ -3,6 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ 'use strict'; + +import * as nls from 'vscode-nls'; import * as sqlops from 'sqlops'; import * as vscode from 'vscode'; import { AlertDialog } from './dialogs/alertDialog'; @@ -12,6 +14,8 @@ import { ProxyDialog } from './dialogs/proxyDialog'; import { JobStepDialog } from './dialogs/jobStepDialog'; import { PickScheduleDialog } from './dialogs/pickScheduleDialog'; +const localize = nls.loadMessageBundle(); + /** * The main controller class that initializes the extension */ @@ -23,6 +27,11 @@ export class MainController { this._context = context; } + public static showNotYetImplemented(): void { + vscode.window.showInformationMessage( + localize('mainController.notImplemented', "This feature is under development. Check-out the latest insiders build if you'd like to try out the most recent changes!")); + } + /** * Activates the extension */ @@ -48,8 +57,10 @@ export class MainController { dialog.openDialog(); }); vscode.commands.registerCommand('agent.openProxyDialog', (ownerUri: string, proxyInfo: sqlops.AgentProxyInfo, credentials: sqlops.CredentialInfo[]) => { - let dialog = new ProxyDialog(ownerUri, proxyInfo, credentials); - dialog.openDialog(); + //@TODO: reenable create proxy after snapping July release (7/14/18) + // let dialog = new ProxyDialog(ownerUri, proxyInfo, credentials); + // dialog.openDialog(); + MainController.showNotYetImplemented(); }); } diff --git a/src/sql/parts/jobManagement/common/media/jobs.css b/src/sql/parts/jobManagement/common/media/jobs.css index df2579e6bc..8c10d22367 100644 --- a/src/sql/parts/jobManagement/common/media/jobs.css +++ b/src/sql/parts/jobManagement/common/media/jobs.css @@ -352,6 +352,14 @@ jobsview-component .jobview-grid .slick-cell.error-row { background: #444444 !important; } +.vs-dark .jobalertsview-grid > .monaco-table .slick-header-columns .slick-resizable-handle { + border-left: 1px dotted white; +} + +.jobalertsview-grid > .monaco-table .slick-header-columns .slick-resizable-handle { + border-left: 1px dotted #444444; +} + .vs-dark #operatorsDiv joboperatorsview-component .joboperatorsview-grid .grid-canvas .ui-widget-content.slick-row .slick-cell { background:#333333; } @@ -375,6 +383,14 @@ jobsview-component .jobview-grid .slick-cell.error-row { background: #444444 !important; } +.vs-dark .joboperatorsview-grid > .monaco-table .slick-header-columns .slick-resizable-handle { + border-left: 1px dotted white; +} + +.joboperatorsview-grid > .monaco-table .slick-header-columns .slick-resizable-handle { + border-left: 1px dotted #444444; +} + .vs-dark #proxiesDiv jobproxiesview-component .jobproxiesview-grid .grid-canvas .ui-widget-content.slick-row .slick-cell { background:#333333; } @@ -397,3 +413,11 @@ jobsview-component .jobview-grid .slick-cell.error-row { .vs-dark #proxiesDiv .jobproxiesview-grid > .monaco-table .slick-viewport > .grid-canvas > .ui-widget-content.slick-row.hovered > .slick-cell { background: #444444 !important; } + +.vs-dark .jobproxiesview-grid > .monaco-table .slick-header-columns .slick-resizable-handle { + border-left: 1px dotted white; +} + +.jobproxiesview-grid > .monaco-table .slick-header-columns .slick-resizable-handle { + border-left: 1px dotted #444444; +} diff --git a/src/sql/parts/jobManagement/views/jobManagementView.ts b/src/sql/parts/jobManagement/views/jobManagementView.ts index fac3d29208..1e7619cbb3 100644 --- a/src/sql/parts/jobManagement/views/jobManagementView.ts +++ b/src/sql/parts/jobManagement/views/jobManagementView.ts @@ -59,6 +59,7 @@ export abstract class JobManagementView extends TabChild implements AfterContent this._showProgressWheel = true; this.isRefreshing = true; this.onFirstVisible(); + this.layout(); this._parentComponent.refresh = false; } else if (this.isVisible === true && this._visibilityElement.nativeElement.offsetParent === null) { this.isVisible = false;