From 489259d36404b2d64b6d6e17a77b87e5f09e99a0 Mon Sep 17 00:00:00 2001 From: Aasim Khan Date: Thu, 9 Jun 2022 17:05:35 -0700 Subject: [PATCH] Fixing graph root padding and truncating long queries in execution plan (#19703) * Fixing graph root padding Truncating queries to one line * Updating remote package --- package.json | 2 +- remote/package.json | 2 +- remote/web/package.json | 2 +- remote/web/yarn.lock | 6 +++--- remote/yarn.lock | 6 +++--- .../browser/executionPlanViewHeader.ts | 1 + .../browser/media/executionPlan.css | 20 ++++++++++++++----- yarn.lock | 6 +++--- 8 files changed, 28 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 33bc4b3a4b..1ed5faaa42 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "angular2-grid": "2.0.6", "ansi_up": "^5.1.0", "applicationinsights": "1.0.8", - "azdataGraph": "github:Microsoft/azdataGraph#0.0.28", + "azdataGraph": "github:Microsoft/azdataGraph#0.0.29", "chart.js": "^2.9.4", "chokidar": "3.5.2", "graceful-fs": "4.2.6", diff --git a/remote/package.json b/remote/package.json index 68cf52ae36..8301a092aa 100644 --- a/remote/package.json +++ b/remote/package.json @@ -16,7 +16,7 @@ "applicationinsights": "1.0.8", "angular2-grid": "2.0.6", "ansi_up": "^5.1.0", - "azdataGraph": "github:Microsoft/azdataGraph#0.0.28", + "azdataGraph": "github:Microsoft/azdataGraph#0.0.29", "chart.js": "^2.9.4", "chokidar": "3.5.2", "cookie": "^0.4.0", diff --git a/remote/web/package.json b/remote/web/package.json index 52a87c25cb..0190237bb4 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -15,7 +15,7 @@ "@vscode/vscode-languagedetection": "1.0.18", "angular2-grid": "2.0.6", "ansi_up": "^5.1.0", - "azdataGraph": "github:Microsoft/azdataGraph#0.0.28", + "azdataGraph": "github:Microsoft/azdataGraph#0.0.29", "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 25afff2800..586cb3edd8 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.28": - version "0.0.28" - resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/fbee58ad09d9a2d155b07f75440b3e65f63ea7f3" +"azdataGraph@github:Microsoft/azdataGraph#0.0.29": + version "0.0.29" + resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/a4fb6daaffe19cbfaf8d5a33cd44ddedd597e228" chalk@^2.3.0, chalk@^2.4.1: version "2.4.2" diff --git a/remote/yarn.lock b/remote/yarn.lock index 7ffed1fc6e..422dd395cf 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.28": - version "0.0.28" - resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/fbee58ad09d9a2d155b07f75440b3e65f63ea7f3" +"azdataGraph@github:Microsoft/azdataGraph#0.0.29": + version "0.0.29" + resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/a4fb6daaffe19cbfaf8d5a33cd44ddedd597e228" binary-extensions@^2.0.0: version "2.0.0" diff --git a/src/sql/workbench/contrib/executionPlan/browser/executionPlanViewHeader.ts b/src/sql/workbench/contrib/executionPlan/browser/executionPlanViewHeader.ts index 710485e7d2..326cec04dc 100644 --- a/src/sql/workbench/contrib/executionPlan/browser/executionPlanViewHeader.ts +++ b/src/sql/workbench/contrib/executionPlan/browser/executionPlanViewHeader.ts @@ -88,6 +88,7 @@ export class ExecutionPlanViewHeader { private renderQueryText(): void { if (this._query) { this._queryContainer.innerText = this._query; + this._queryContainer.title = this._query; } } diff --git a/src/sql/workbench/contrib/executionPlan/browser/media/executionPlan.css b/src/sql/workbench/contrib/executionPlan/browser/media/executionPlan.css index 60407c78b2..bab255a4de 100644 --- a/src/sql/workbench/contrib/executionPlan/browser/media/executionPlan.css +++ b/src/sql/workbench/contrib/executionPlan/browser/media/executionPlan.css @@ -33,7 +33,7 @@ The actual sash element constructed by code. Important is used here because the width of the sash is fixed. However we always want it to be the width of the container it is resizing. */ -.eps-container .execution-plan-sash > div { +.eps-container .execution-plan-sash>div { width: 100% !important; } @@ -70,12 +70,12 @@ However we always want it to be the width of the container it is resizing. } /* input bar styling in search node action view */ -.eps-container .execution-plan .plan .plan-action-container .search-node-widget .select-container{ +.eps-container .execution-plan .plan .plan-action-container .search-node-widget .select-container { margin-left: 5px; } /* styling for select element in search node action view */ -.eps-container .execution-plan .plan .plan-action-container .search-node-widget .select-container > select{ +.eps-container .execution-plan .plan .plan-action-container .search-node-widget .select-container>select { height: 100%; } @@ -94,8 +94,18 @@ However we always want it to be the width of the container it is resizing. font-weight: bolder; } +/* execution plan header that contains the relative query cost, query statement and recommendations */ +.eps-container .execution-plan .plan .header .query-row { + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 1; + line-clamp: 1; + -webkit-box-orient: vertical; +} + /* each link in execution plan recommendations */ -.eps-container .execution-plan .plan .header .recommendations > a { +.eps-container .execution-plan .plan .header .recommendations>a { width: fit-content; align-items: left; text-align: left; @@ -664,7 +674,7 @@ However we always want it to be the width of the container it is resizing. } /* each link in execution plan recommendations */ -.eps-container .comparison-editor .plan-comparison-container .split-view-container .plan-container .recommendations > a { +.eps-container .comparison-editor .plan-comparison-container .split-view-container .plan-container .recommendations>a { width: fit-content; align-items: left; text-align: left; diff --git a/yarn.lock b/yarn.lock index 40f33e9c03..63ec12675d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1902,9 +1902,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.28": - version "0.0.28" - resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/fbee58ad09d9a2d155b07f75440b3e65f63ea7f3" +"azdataGraph@github:Microsoft/azdataGraph#0.0.29": + version "0.0.29" + resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/a4fb6daaffe19cbfaf8d5a33cd44ddedd597e228" bach@^1.0.0: version "1.2.0"