ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixing chartjs (#23831) (#23851)

Browse Source
This commit is contained in:
Aasim Khan
2023-07-13 09:22:25 -07:00
committed by GitHub
parent a644558bd0
commit 5299cd4bbe
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/sql/workbench/contrib/charts/browser/graphInsight.ts
View File

@@ -220,11 +220,11 @@ export class Graph implements IInsight {
}; };
if (options.xAxisMax !== undefined) { if (options.xAxisMax !== undefined) {
retval.scales = mixin(retval.scales, { xAxes: [{ ticks: { max: options.xAxisMax } }] }, true, customMixin); retval.scales = mixin(retval.scales, { x: { max: options.xAxisMax } }, true, customMixin);
} }
if (options.xAxisMin !== undefined) { if (options.xAxisMin !== undefined) {
retval.scales = mixin(retval.scales, { xAxes: [{ ticks: { min: options.xAxisMin } }] }, true, customMixin); retval.scales = mixin(retval.scales, { x: { min: options.xAxisMin } }, true, customMixin);
} }
retval.scales.y = { retval.scales.y = {
@@ -242,11 +242,11 @@ export class Graph implements IInsight {
}; };
if (options.yAxisMax !== undefined) { if (options.yAxisMax !== undefined) {
retval.scales = mixin(retval.scales, { yAxes: [{ ticks: { max: options.yAxisMax } }] }, true, customMixin); retval.scales = mixin(retval.scales, { y: { max: options.yAxisMax } }, true, customMixin);
} }
if (options.yAxisMin !== undefined) { if (options.yAxisMin !== undefined) {
retval.scales = mixin(retval.scales, { yAxes: [{ ticks: { min: options.yAxisMin } }] }, true, customMixin); retval.scales = mixin(retval.scales, { y: { min: options.yAxisMin } }, true, customMixin);
} }
if (this.originalType === ChartType.TimeSeries) { if (this.originalType === ChartType.TimeSeries) {
@@ -254,11 +254,9 @@ export class Graph implements IInsight {
if (options.xAxisMax !== undefined) { if (options.xAxisMax !== undefined) {
retval = mixin(retval, { retval = mixin(retval, {
scales: { scales: {
xAxes: [{ x: {
time: { max: options.xAxisMax
max: options.xAxisMax }
}
}],
} }
}, true, customMixin); }, true, customMixin);
} }
@@ -266,11 +264,9 @@ export class Graph implements IInsight {
if (options.xAxisMin !== undefined) { if (options.xAxisMin !== undefined) {
retval = mixin(retval, { retval = mixin(retval, {
scales: { scales: {
xAxes: [{ x: {
time: { min: options.xAxisMin
min: options.xAxisMin }
}
}],
} }
}, true, customMixin); }, true, customMixin);
} }