From 67637a41f5d76c0a6458a339f4af29f0867cdd87 Mon Sep 17 00:00:00 2001 From: Aasim Khan Date: Fri, 15 Jul 2022 15:31:01 -0700 Subject: [PATCH] Making better ep highlights (#20055) --- package.json | 2 +- remote/package.json | 2 +- remote/web/package.json | 2 +- remote/web/yarn.lock | 6 +++--- remote/yarn.lock | 6 +++--- .../contrib/executionPlan/browser/azdataGraphView.ts | 3 +-- .../browser/executionPlanComparisonEditorView.ts | 2 -- yarn.lock | 6 +++--- 8 files changed, 13 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 88d158adac..3f8e1c54de 100755 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "angular2-grid": "2.0.6", "ansi_up": "^5.1.0", "applicationinsights": "1.0.8", - "azdataGraph": "github:Microsoft/azdataGraph#0.0.33", + "azdataGraph": "github:Microsoft/azdataGraph#0.0.36", "chart.js": "^2.9.4", "chokidar": "3.5.1", "graceful-fs": "4.2.8", diff --git a/remote/package.json b/remote/package.json index 2a93c0d8a3..7d155091b2 100755 --- a/remote/package.json +++ b/remote/package.json @@ -17,7 +17,7 @@ "applicationinsights": "1.0.8", "angular2-grid": "2.0.6", "ansi_up": "^5.1.0", - "azdataGraph": "github:Microsoft/azdataGraph#0.0.33", + "azdataGraph": "github:Microsoft/azdataGraph#0.0.36", "chart.js": "^2.9.4", "cookie": "^0.4.0", "graceful-fs": "4.2.8", diff --git a/remote/web/package.json b/remote/web/package.json index e4d86d9ec8..ff28c15643 100755 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -15,7 +15,7 @@ "@vscode/vscode-languagedetection": "1.0.21", "angular2-grid": "2.0.6", "ansi_up": "^5.1.0", - "azdataGraph": "github:Microsoft/azdataGraph#0.0.33", + "azdataGraph": "github:Microsoft/azdataGraph#0.0.36", "chart.js": "^2.9.4", "gridstack": "^3.1.3", "kburtram-query-plan": "2.6.1", diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index ba512c6b15..f91fb50860 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -150,9 +150,9 @@ array-uniq@^1.0.2: resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= -"azdataGraph@github:Microsoft/azdataGraph#0.0.33": - version "0.0.33" - resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/03b12598831a85f977f5e58f22cbd7ff37e16b04" +"azdataGraph@github:Microsoft/azdataGraph#0.0.36": + version "0.0.36" + resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/f93a93d5269ebb3768cc75ccb19f2085957f7eb2" chalk@^2.3.0, chalk@^2.4.1: version "2.4.2" diff --git a/remote/yarn.lock b/remote/yarn.lock index 99730037ba..14f9bab81e 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -198,9 +198,9 @@ array-uniq@^1.0.2: resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= -"azdataGraph@github:Microsoft/azdataGraph#0.0.33": - version "0.0.33" - resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/03b12598831a85f977f5e58f22cbd7ff37e16b04" +"azdataGraph@github:Microsoft/azdataGraph#0.0.36": + version "0.0.36" + resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/f93a93d5269ebb3768cc75ccb19f2085957f7eb2" bindings@^1.5.0: version "1.5.0" diff --git a/src/sql/workbench/contrib/executionPlan/browser/azdataGraphView.ts b/src/sql/workbench/contrib/executionPlan/browser/azdataGraphView.ts index bcaeb0e697..b95622f3f1 100644 --- a/src/sql/workbench/contrib/executionPlan/browser/azdataGraphView.ts +++ b/src/sql/workbench/contrib/executionPlan/browser/azdataGraphView.ts @@ -49,7 +49,6 @@ export class AzdataGraphView { this._diagram = new azdataGraph.azdataQueryPlan(queryPlanConfiguration); this.setGraphProperties(); - this.selectElement(this._executionPlan.root); this._cellInFocus = this._diagram.graph.getSelectionCell(); this.initializeGraphEvents(); } @@ -72,7 +71,7 @@ export class AzdataGraphView { this.onElementSelected = this._onElementSelectedEmitter.event; this._diagram.graph.getSelectionModel().addListener('change', (sender, evt) => { if (evt.properties?.removed) { - if (this._cellInFocus.id === evt.properties.removed[0].id) { + if (this._cellInFocus?.id === evt.properties.removed[0].id) { return; } const newSelection = evt.properties.removed[0]; diff --git a/src/sql/workbench/contrib/executionPlan/browser/executionPlanComparisonEditorView.ts b/src/sql/workbench/contrib/executionPlan/browser/executionPlanComparisonEditorView.ts index e59ede2b25..eb4842f3b1 100644 --- a/src/sql/workbench/contrib/executionPlan/browser/executionPlanComparisonEditorView.ts +++ b/src/sql/workbench/contrib/executionPlan/browser/executionPlanComparisonEditorView.ts @@ -193,7 +193,6 @@ export class ExecutionPlanComparisonEditorView { c.style.display = 'none'; }); this._topPlanDiagramContainers[e.index].style.display = ''; - this.topPlanDiagrams[e.index].selectElement(undefined); this._propertiesView.setTopElement(this._topPlanDiagramModels[e.index].root); this._topPlanRecommendations.recommendations = this._topPlanDiagramModels[e.index].recommendations; this._activeTopPlanIndex = e.index; @@ -221,7 +220,6 @@ export class ExecutionPlanComparisonEditorView { c.style.display = 'none'; }); this._bottomPlanDiagramContainers[e.index].style.display = ''; - this.bottomPlanDiagrams[e.index].selectElement(undefined); this._propertiesView.setTopElement(this._bottomPlanDiagramModels[e.index].root); this._bottomPlanRecommendations.recommendations = this._bottomPlanDiagramModels[e.index].recommendations; this._activeBottomPlanIndex = e.index; diff --git a/yarn.lock b/yarn.lock index 687ba29b30..497b5d86b4 100755 --- a/yarn.lock +++ b/yarn.lock @@ -1891,9 +1891,9 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== -"azdataGraph@github:Microsoft/azdataGraph#0.0.33": - version "0.0.33" - resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/03b12598831a85f977f5e58f22cbd7ff37e16b04" +"azdataGraph@github:Microsoft/azdataGraph#0.0.36": + version "0.0.36" + resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/f93a93d5269ebb3768cc75ccb19f2085957f7eb2" bach@^1.0.0: version "1.2.0"