ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Bump azdataGraph version to 0.0.32 (#19954)

Browse Source 
* Update azdataGraph version to 0.0.31

* Adds icons

* Bumps azdataGraph version to 0.0.32

* Removes whitespace

* Uses icon that better adapts to color theme changes.

* Disables collapse for execution plans in plan comparison editor view
This commit is contained in:
Lewis Sanchez
2022-07-11 21:26:34 -07:00
committed by GitHub
parent 53a0388858
commit e25a9574a7
11 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -76,7 +76,7 @@
"angular2-grid": "2.0.6", "angular2-grid": "2.0.6",
"ansi_up": "^5.1.0", "ansi_up": "^5.1.0",
"applicationinsights": "1.0.8", "applicationinsights": "1.0.8",
"azdataGraph": "github:Microsoft/azdataGraph#0.0.29", "azdataGraph": "github:Microsoft/azdataGraph#0.0.32",
"chart.js": "^2.9.4", "chart.js": "^2.9.4",
"chokidar": "3.5.1", "chokidar": "3.5.1",
"graceful-fs": "4.2.8", "graceful-fs": "4.2.8",

2
remote/package.json
View File

@@ -17,7 +17,7 @@
"applicationinsights": "1.0.8", "applicationinsights": "1.0.8",
"angular2-grid": "2.0.6", "angular2-grid": "2.0.6",
"ansi_up": "^5.1.0", "ansi_up": "^5.1.0",
"azdataGraph": "github:Microsoft/azdataGraph#0.0.29", "azdataGraph": "github:Microsoft/azdataGraph#0.0.32",
"chart.js": "^2.9.4", "chart.js": "^2.9.4",
"cookie": "^0.4.0", "cookie": "^0.4.0",
"graceful-fs": "4.2.8", "graceful-fs": "4.2.8",

2
remote/web/package.json
View File

@@ -15,7 +15,7 @@
"@vscode/vscode-languagedetection": "1.0.21", "@vscode/vscode-languagedetection": "1.0.21",
"angular2-grid": "2.0.6", "angular2-grid": "2.0.6",
"ansi_up": "^5.1.0", "ansi_up": "^5.1.0",
"azdataGraph": "github:Microsoft/azdataGraph#0.0.29", "azdataGraph": "github:Microsoft/azdataGraph#0.0.32",
"chart.js": "^2.9.4", "chart.js": "^2.9.4",
"gridstack": "^3.1.3", "gridstack": "^3.1.3",
"kburtram-query-plan": "2.6.1", "kburtram-query-plan": "2.6.1",

6
remote/web/yarn.lock
View File

@@ -150,9 +150,9 @@ array-uniq@^1.0.2:
resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
"azdataGraph@github:Microsoft/azdataGraph#0.0.29": "azdataGraph@github:Microsoft/azdataGraph#0.0.32":
version "0.0.29" version "0.0.32"
resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/a4fb6daaffe19cbfaf8d5a33cd44ddedd597e228" resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/96bc3b9c61e060ea3a4fa7ed2e556e814cf0060e"
chalk@^2.3.0, chalk@^2.4.1: chalk@^2.3.0, chalk@^2.4.1:
version "2.4.2" version "2.4.2"

6
remote/yarn.lock
View File

@@ -198,9 +198,9 @@ array-uniq@^1.0.2:
resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
"azdataGraph@github:Microsoft/azdataGraph#0.0.29": "azdataGraph@github:Microsoft/azdataGraph#0.0.32":
version "0.0.29" version "0.0.32"
resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/a4fb6daaffe19cbfaf8d5a33cd44ddedd597e228" resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/96bc3b9c61e060ea3a4fa7ed2e556e814cf0060e"
bindings@^1.5.0: bindings@^1.5.0:
version "1.5.0" version "1.5.0"

8
src/sql/workbench/contrib/executionPlan/browser/azdataGraphView.ts
View File

@@ -8,7 +8,7 @@ import * as azdata from 'azdata';
import * as sqlExtHostType from 'sql/workbench/api/common/sqlExtHostTypes'; import * as sqlExtHostType from 'sql/workbench/api/common/sqlExtHostTypes';
import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
import { isString } from 'vs/base/common/types'; import { isString } from 'vs/base/common/types';
import { badgeIconPaths, executionPlanNodeIconPaths } from 'sql/workbench/contrib/executionPlan/browser/constants'; import { badgeIconPaths, collapseExpandNodeIconPaths, executionPlanNodeIconPaths } from 'sql/workbench/contrib/executionPlan/browser/constants';
import { localize } from 'vs/nls'; import { localize } from 'vs/nls';
import { Event, Emitter } from 'vs/base/common/event'; import { Event, Emitter } from 'vs/base/common/event';
import { IColorTheme, ICssStyleCollector, registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import { IColorTheme, ICssStyleCollector, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
@@ -38,7 +38,7 @@ export class AzdataGraphView {
) { ) {
this._parentContainer.tabIndex = 0; this._parentContainer.tabIndex = 0;
this._diagramModel = this.populate(this._executionPlan.root); this._diagramModel = this.populate(this._executionPlan.root);
this._diagram = new azdataGraph.azdataQueryPlan(this._parentContainer, this._diagramModel, executionPlanNodeIconPaths, badgeIconPaths); this._diagram = new azdataGraph.azdataQueryPlan(this._parentContainer, this._diagramModel, executionPlanNodeIconPaths, badgeIconPaths, collapseExpandNodeIconPaths);
this.setGraphProperties(); this.setGraphProperties();
this.selectElement(this._executionPlan.root); this.selectElement(this._executionPlan.root);
this._cellInFocus = this._diagram.graph.getSelectionCell(); this._cellInFocus = this._diagram.graph.getSelectionCell();
@@ -409,6 +409,10 @@ export class AzdataGraphView {
public clearSubtreePolygon(): void { public clearSubtreePolygon(): void {
this._diagram.removeDrawnPolygons(); this._diagram.removeDrawnPolygons();
} }
public disableNodeCollapse(disable: boolean): void {
this._diagram.disableNodeCollapse(disable);
}
} }
export interface InternalExecutionPlanEdge extends azdata.executionPlan.ExecutionPlanEdge { export interface InternalExecutionPlanEdge extends azdata.executionPlan.ExecutionPlanEdge {

5
src/sql/workbench/contrib/executionPlan/browser/constants.ts
View File

@@ -257,6 +257,11 @@ export const badgeIconPaths = {
criticalWarning: imageBasePath + 'badge_critical_warning.svg' criticalWarning: imageBasePath + 'badge_critical_warning.svg'
}; };
export const collapseExpandNodeIconPaths = {
collapse: imageBasePath + 'collapse.svg',
expand: imageBasePath + 'expand.svg'
};
export const savePlanIconClassNames = 'ep-save-plan-icon'; export const savePlanIconClassNames = 'ep-save-plan-icon';
export const openPropertiesIconClassNames = 'ep-open-properties-icon'; export const openPropertiesIconClassNames = 'ep-open-properties-icon';
export const openQueryIconClassNames = 'ep-open-query-icon'; export const openQueryIconClassNames = 'ep-open-query-icon';

4
src/sql/workbench/contrib/executionPlan/browser/executionPlanComparisonEditorView.ts
View File

@@ -197,6 +197,8 @@ export class ExecutionPlanComparisonEditorView {
this._propertiesView.setTopElement(this._topPlanDiagramModels[e.index].root); this._propertiesView.setTopElement(this._topPlanDiagramModels[e.index].root);
this._topPlanRecommendations.recommendations = this._topPlanDiagramModels[e.index].recommendations; this._topPlanRecommendations.recommendations = this._topPlanDiagramModels[e.index].recommendations;
this._activeTopPlanIndex = e.index; this._activeTopPlanIndex = e.index;
this._activeTopPlanDiagram.disableNodeCollapse(true);
await this.getSkeletonNodes(); await this.getSkeletonNodes();
}); });
attachSelectBoxStyler(this._topPlanDropdown, this.themeService); attachSelectBoxStyler(this._topPlanDropdown, this.themeService);
@@ -223,6 +225,8 @@ export class ExecutionPlanComparisonEditorView {
this._propertiesView.setTopElement(this._bottomPlanDiagramModels[e.index].root); this._propertiesView.setTopElement(this._bottomPlanDiagramModels[e.index].root);
this._bottomPlanRecommendations.recommendations = this._bottomPlanDiagramModels[e.index].recommendations; this._bottomPlanRecommendations.recommendations = this._bottomPlanDiagramModels[e.index].recommendations;
this._activeBottomPlanIndex = e.index; this._activeBottomPlanIndex = e.index;
this._activeBottomPlanDiagram.disableNodeCollapse(true);
await this.getSkeletonNodes(); await this.getSkeletonNodes();
}); });
attachSelectBoxStyler(this._bottomPlanDropdown, this.themeService); attachSelectBoxStyler(this._bottomPlanDropdown, this.themeService);

1
src/sql/workbench/contrib/executionPlan/browser/images/icons/collapse.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style type="text/css">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-bg{fill:#424242;} .icon-vs-fg{fill:#F0EFF1;} .icon-vs-action-blue{fill:#00539C;}</style><path class="icon-canvas-transparent" d="M16 16h-16v-16h16v16z" id="canvas"/><path class="icon-vs-out" d="M14 2v12h-12v-12h12z" id="outline"/><path class="icon-vs-bg" d="M3 3v10h10v-10h-10zm9 9h-8v-8h8v8z" id="iconBg"/><path class="icon-vs-fg" d="M4 4v8h8v-8h-8zm7 5h-6v-2h6v2z" id="iconFg"/><path class="icon-vs-action-blue" d="M11 7v2h-6v-2h6z" id="colorAction"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 629 B

1
src/sql/workbench/contrib/executionPlan/browser/images/icons/expand.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style type="text/css">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-bg{fill:#424242;} .icon-vs-fg{fill:#F0EFF1;} .icon-vs-action-blue{fill:#00539C;}</style><path class="icon-canvas-transparent" d="M16 16h-16v-16h16v16z" id="canvas"/><path class="icon-vs-out" d="M14 2v12h-12v-12h12z" id="outline"/><path class="icon-vs-bg" d="M3 3v10h10v-10h-10zm9 9h-8v-8h8v8z" id="iconBg"/><path class="icon-vs-fg" d="M4 4v8h8v-8h-8zm7 5h-2v2h-2v-2h-2v-2h2v-2h2v2h2v2z" id="iconFg"/><path class="icon-vs-action-blue" d="M11 7v2h-2v2h-2v-2h-2v-2h2v-2h2v2h2z" id="colorAction"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 669 B

6
yarn.lock
View File

@@ -1891,9 +1891,9 @@ aws4@^1.8.0:
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
"azdataGraph@github:Microsoft/azdataGraph#0.0.29": "azdataGraph@github:Microsoft/azdataGraph#0.0.32":
version "0.0.29" version "0.0.32"
resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/a4fb6daaffe19cbfaf8d5a33cd44ddedd597e228" resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/96bc3b9c61e060ea3a4fa7ed2e556e814cf0060e"
bach@^1.0.0: bach@^1.0.0:
version "1.2.0" version "1.2.0"