From 6b1d552277a830a47cc6e9a561a154e9d4be6ecb Mon Sep 17 00:00:00 2001 From: Aditya Bist Date: Tue, 17 Jul 2018 10:51:31 -0700 Subject: [PATCH] Agent/step finishes (#1948) * misc fixes in dialogs * removed unused import * disabled more advanced options --- extensions/agent/src/dialogs/alertDialog.ts | 5 +++-- extensions/agent/src/dialogs/jobDialog.ts | 3 +++ extensions/mssql/yarn.lock | 6 +++--- src/sql/parts/modelComponents/table.component.ts | 1 - 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/extensions/agent/src/dialogs/alertDialog.ts b/extensions/agent/src/dialogs/alertDialog.ts index 5bc352f542..50e5bae810 100644 --- a/extensions/agent/src/dialogs/alertDialog.ts +++ b/extensions/agent/src/dialogs/alertDialog.ts @@ -63,8 +63,9 @@ export class AlertDialog extends AgentDialog { private static readonly AlertTypes: string[] = [ AlertData.AlertTypeSqlServerEventString, - AlertData.AlertTypePerformanceConditionString, - AlertData.AlertTypeWmiEventString + // Disabled until next release + // AlertData.AlertTypePerformanceConditionString, + // AlertData.AlertTypeWmiEventString ]; private static readonly AlertSeverities: string[] = [ diff --git a/extensions/agent/src/dialogs/jobDialog.ts b/extensions/agent/src/dialogs/jobDialog.ts index 9840a8df97..fb0e0657cf 100644 --- a/extensions/agent/src/dialogs/jobDialog.ts +++ b/extensions/agent/src/dialogs/jobDialog.ts @@ -219,6 +219,9 @@ export class JobDialog extends AgentDialog { width: 80 }).component(); + this.moveStepUpButton.enabled = false; + this.moveStepDownButton.enabled = false; + this.newStepButton = view.modelBuilder.button().withProperties({ label: this.NewStepButtonString, width: 80 diff --git a/extensions/mssql/yarn.lock b/extensions/mssql/yarn.lock index 6d444b3365..86a6896303 100644 --- a/extensions/mssql/yarn.lock +++ b/extensions/mssql/yarn.lock @@ -49,9 +49,9 @@ core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" -"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#0.1.9": - version "0.1.9" - resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/a1a79895cb79658b75d78aa5cfd745855019148d" +"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#0.2.0": + version "0.2.0" + resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/c7a691c7fc5ad54a147090784a7f11efda301f4b" dependencies: vscode-languageclient "3.5.0" diff --git a/src/sql/parts/modelComponents/table.component.ts b/src/sql/parts/modelComponents/table.component.ts index ad77eede26..81407f59ea 100644 --- a/src/sql/parts/modelComponents/table.component.ts +++ b/src/sql/parts/modelComponents/table.component.ts @@ -16,7 +16,6 @@ import { Table } from 'sql/base/browser/ui/table/table'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; import { attachTableStyler } from 'sql/common/theme/styler'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; -import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { getContentHeight, getContentWidth, Dimension } from 'vs/base/browser/dom'; import { RowSelectionModel } from 'sql/base/browser/ui/table/plugins/rowSelectionModel.plugin';