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

Merge pull request #15160 from grafana/fix/time-region-missing-colors

Browse Source 
Do not render time region line or fill if colors not provided
This commit is contained in:
Torkel Ödegaard 2019-01-31 13:23:12 +01:00 committed by GitHub
commit 06a9c7bacc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
public/app/plugins/panel/graph/specs/time_region_manager.test.ts
View File

@ -43,6 +43,25 @@ describe('TimeRegionManager', () => {
}); });
} }
describe('When colors missing in config', () => {
plotOptionsScenario('should not throw an error when fillColor is undefined', ctx => {
const regions = [
{ fromDayOfWeek: 1, toDayOfWeek: 1, fill: true, line: true, lineColor: '#ffffff', colorMode: 'custom' },
];
const from = moment('2018-01-01T00:00:00+01:00');
const to = moment('2018-01-01T23:59:00+01:00');
expect(() => ctx.setup(regions, from, to)).not.toThrow();
});
plotOptionsScenario('should not throw an error when lineColor is undefined', ctx => {
const regions = [
{ fromDayOfWeek: 1, toDayOfWeek: 1, fill: true, fillColor: '#ffffff', line: true, colorMode: 'custom' },
];
const from = moment('2018-01-01T00:00:00+01:00');
const to = moment('2018-01-01T23:59:00+01:00');
expect(() => ctx.setup(regions, from, to)).not.toThrow();
});
});
describe('When creating plot markings using local time', () => { describe('When creating plot markings using local time', () => {
plotOptionsScenario('for day of week region', ctx => { plotOptionsScenario('for day of week region', ctx => {
const regions = [{ fromDayOfWeek: 1, toDayOfWeek: 1, fill: true, line: true, colorMode: 'red' }]; const regions = [{ fromDayOfWeek: 1, toDayOfWeek: 1, fill: true, line: true, colorMode: 'red' }];

8
public/app/plugins/panel/graph/time_region_manager.ts
View File

@ -50,8 +50,8 @@ function getColor(timeRegion, theme: GrafanaTheme): TimeRegionColorDefinition {
if (timeRegion.colorMode === 'custom') { if (timeRegion.colorMode === 'custom') {
return { return {
fill: getColorFromHexRgbOrName(timeRegion.fillColor, theme), fill: timeRegion.fill && timeRegion.fillColor ? getColorFromHexRgbOrName(timeRegion.fillColor, theme) : null,
line: getColorFromHexRgbOrName(timeRegion.lineColor, theme), line: timeRegion.line && timeRegion.lineColor ? getColorFromHexRgbOrName(timeRegion.lineColor, theme) : null,
}; };
} }
@ -62,8 +62,8 @@ function getColor(timeRegion, theme: GrafanaTheme): TimeRegionColorDefinition {
} }
return { return {
fill: getColorFromHexRgbOrName(colorMode.color.fill, theme), fill: timeRegion.fill ? getColorFromHexRgbOrName(colorMode.color.fill, theme) : null,
line: getColorFromHexRgbOrName(colorMode.color.line, theme), line: timeRegion.fill ? getColorFromHexRgbOrName(colorMode.color.line, theme) : null,
}; };
} }