IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

TimeSeries: don't auto-disable fill of fillBelowTo targets (#43165)

Browse Source
This commit is contained in:
Leon Sorokin 2021-12-16 14:52:47 -06:00 committed by GitHub
parent 1a762083d7
commit 8fdbc6cc20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devenv/dev-dashboards/datasource-testdata/new_features_in_v74.json
View File

@ -1991,7 +1991,7 @@
"axisLabel": "",
"axisPlacement": "auto",
"drawStyle": "line",
"fillOpacity": 29,
"fillOpacity": 0,
"gradientMode": {
"label": "None",
"value": "none"

2
devenv/dev-dashboards/panel-graph/graph-ng.json
View File

@ -1346,7 +1346,7 @@
"axisPlacement": "auto",
"drawStyle": "line",
"fillGradient": "hue",
"fillOpacity": 25,
"fillOpacity": 0,
"hideFrom": {
"graph": false,
"legend": false,

1
packages/grafana-ui/src/components/TimeSeries/utils.ts
View File

@ -307,7 +307,6 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<{ sync: DashboardCursor
}
if (stackingGroups.size !== 0) {
builder.setStacking(true);
for (const [_, seriesIds] of stackingGroups.entries()) {
const seriesIdxs = orderIdsByCalcs({ ids: seriesIds, legend, frame });
for (let j = seriesIdxs.length - 1; j > 0; j--) {

1
packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.test.ts
View File

@ -548,7 +548,6 @@ describe('UPlotConfigBuilder', () => {
describe('Stacking', () => {
it('allows stacking config', () => {
const builder = new UPlotConfigBuilder();
builder.setStacking();
builder.addSeries({
drawStyle: GraphDrawStyle.Line,
scaleKey: 'scale-x',

23
packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts
View File

@ -40,7 +40,6 @@ export class UPlotConfigBuilder {
private scales: UPlotScaleBuilder[] = [];
private bands: Band[] = [];
private cursor: Cursor | undefined;
private isStacking = false;
private select: uPlot.Select | undefined;
private hasLeftAxis = false;
private hooks: Hooks.Arrays = {};
@ -122,10 +121,6 @@ export class UPlotConfigBuilder {
this.select = select;
}
setStacking(enabled = true) {
this.isStacking = enabled;
}
addSeries(props: SeriesProps) {
this.series.push(new UPlotSeriesBuilder(props));
}
@ -224,24 +219,8 @@ export class UPlotConfigBuilder {
config.tzDate = this.tzDate;
config.padding = this.padding;
if (this.isStacking) {
// Let uPlot handle bands and fills
if (this.bands.length) {
config.bands = this.bands;
} else {
// When fillBelowTo option enabled, handle series bands fill manually
if (this.bands?.length) {
config.bands = this.bands;
const killFill = new Set<number>();
for (const b of config.bands) {
killFill.add(b.series[1]);
}
for (let i = 1; i < config.series.length; i++) {
if (killFill.has(i)) {
config.series[i].fill = undefined;
}
}
}
}
return config;

1
public/app/plugins/panel/barchart/utils.ts
View File

@ -213,7 +213,6 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<BarChartOptions> = ({
}
if (stackingGroups.size !== 0) {
builder.setStacking(true);
for (const [_, seriesIds] of stackingGroups.entries()) {
const seriesIdxs = orderIdsByCalcs({ ids: seriesIds, legend, frame });
for (let j = seriesIdxs.length - 1; j > 0; j--) {