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

GraphNG: optimize cursor (#37460)

Browse Source
This commit is contained in:
Leon Sorokin
2021-08-04 16:13:11 -05:00
committed by GitHub
parent 27b94139ed
commit d49ce5ad47
5 changed files with 77 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/grafana-ui/src/components/GraphNG/__snapshots__/utils.test.ts.snap
View File

@@ -118,7 +118,9 @@ Object {
},
"select": undefined,
"series": Array [
Object {},
Object {
"value": [Function],
},
Object {
"dash": Array [
1,
@@ -138,6 +140,7 @@ Object {
"show": true,
"spanGaps": false,
"stroke": "#ff0000",
"value": [Function],
"width": 2,
},
Object {
@@ -159,6 +162,7 @@ Object {
"show": true,
"spanGaps": false,
"stroke": "#ff0000",
"value": [Function],
"width": 2,
},
Object {
@@ -180,6 +184,7 @@ Object {
"show": true,
"spanGaps": false,
"stroke": "#ff0000",
"value": [Function],
"width": 2,
},
Object {
@@ -201,6 +206,7 @@ Object {
"show": true,
"spanGaps": false,
"stroke": "#ff0000",
"value": [Function],
"width": 2,
},
Object {
@@ -222,6 +228,7 @@ Object {
"show": true,
"spanGaps": false,
"stroke": "#ff0000",
"value": [Function],
"width": 2,
},
],

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

@@ -40,7 +40,9 @@ describe('UPlotConfigBuilder', () => {
"scales": Object {},
"select": undefined,
"series": Array [
Object {},
Object {
"value": [Function],
},
],
"tzDate": [Function],
}
@@ -104,7 +106,9 @@ describe('UPlotConfigBuilder', () => {
},
"select": undefined,
"series": Array [
Object {},
Object {
"value": [Function],
},
],
"tzDate": [Function],
}
@@ -173,7 +177,9 @@ describe('UPlotConfigBuilder', () => {
},
"select": undefined,
"series": Array [
Object {},
Object {
"value": [Function],
},
],
"tzDate": [Function],
}
@@ -222,7 +228,9 @@ describe('UPlotConfigBuilder', () => {
},
"select": undefined,
"series": Array [
Object {},
Object {
"value": [Function],
},
],
"tzDate": [Function],
}
@@ -272,7 +280,9 @@ describe('UPlotConfigBuilder', () => {
},
"select": undefined,
"series": Array [
Object {},
Object {
"value": [Function],
},
],
"tzDate": [Function],
}
@@ -375,7 +385,9 @@ describe('UPlotConfigBuilder', () => {
"scales": Object {},
"select": undefined,
"series": Array [
Object {},
Object {
"value": [Function],
},
],
"tzDate": [Function],
}
@@ -491,7 +503,9 @@ describe('UPlotConfigBuilder', () => {
"scales": Object {},
"select": undefined,
"series": Array [
Object {},
Object {
"value": [Function],
},
Object {
"fill": [Function],
"paths": [Function],
@@ -506,6 +520,7 @@ describe('UPlotConfigBuilder', () => {
"show": true,
"spanGaps": false,
"stroke": "#0000ff",
"value": [Function],
"width": 1,
},
],
@@ -601,7 +616,9 @@ describe('UPlotConfigBuilder', () => {
"scales": Object {},
"select": undefined,
"series": Array [
Object {},
Object {
"value": [Function],
},
Object {
"fill": [Function],
"paths": [Function],
@@ -616,6 +633,7 @@ describe('UPlotConfigBuilder', () => {
"show": true,
"spanGaps": false,
"stroke": "#0000ff",
"value": [Function],
"width": 1,
},
Object {
@@ -632,6 +650,7 @@ describe('UPlotConfigBuilder', () => {
"show": true,
"spanGaps": false,
"stroke": "#00ff00",
"value": [Function],
"width": 1,
},
Object {
@@ -648,6 +667,7 @@ describe('UPlotConfigBuilder', () => {
"show": true,
"spanGaps": false,
"stroke": "#ff0000",
"value": [Function],
"width": 1,
},
],

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

@@ -170,7 +170,13 @@ export class UPlotConfigBuilder {
}
getConfig() {
const config: PlotConfig = { series: [{}] };
const config: PlotConfig = {
series: [
{
value: () => '',
},
],
};
config.axes = this.ensureNonOverlappingAxes(Object.values(this.axes)).map((a) => a.getConfig());
config.series = [...config.series, ...this.series.map((s) => s.getConfig())];
config.scales = this.scales.reduce((acc, s) => {

2
packages/grafana-ui/src/components/uPlot/config/UPlotSeriesBuilder.ts
View File

@@ -30,6 +30,7 @@ export interface SeriesProps extends LineConfig, BarConfig, FillConfig, PointsCo
show?: boolean;
dataFrameFieldIndex?: DataFrameFieldIndex;
theme: GrafanaTheme2;
value?: uPlot.Series.Value;
}
export class UPlotSeriesBuilder extends PlotConfigBuilder<SeriesProps, Series> {
@@ -114,6 +115,7 @@ export class UPlotSeriesBuilder extends PlotConfigBuilder<SeriesProps, Series> {
return {
scale: scaleKey,
spanGaps: typeof spanNulls === 'number' ? false : spanNulls,
value: () => '',
pxAlign,
show,
fill: this.getFill(),

40
public/app/plugins/panel/barchart/__snapshots__/utils.test.ts.snap
View File

@@ -103,7 +103,9 @@ Object {
},
"select": undefined,
"series": Array [
Object {},
Object {
"value": [Function],
},
Object {
"fill": [Function],
"paths": [Function],
@@ -118,6 +120,7 @@ Object {
"show": true,
"spanGaps": undefined,
"stroke": "#808080",
"value": [Function],
"width": 2,
},
],
@@ -228,7 +231,9 @@ Object {
},
"select": undefined,
"series": Array [
Object {},
Object {
"value": [Function],
},
Object {
"fill": [Function],
"paths": [Function],
@@ -243,6 +248,7 @@ Object {
"show": true,
"spanGaps": undefined,
"stroke": "#808080",
"value": [Function],
"width": 2,
},
],
@@ -353,7 +359,9 @@ Object {
},
"select": undefined,
"series": Array [
Object {},
Object {
"value": [Function],
},
Object {
"fill": [Function],
"paths": [Function],
@@ -368,6 +376,7 @@ Object {
"show": true,
"spanGaps": undefined,
"stroke": "#808080",
"value": [Function],
"width": 2,
},
],
@@ -478,7 +487,9 @@ Object {
},
"select": undefined,
"series": Array [
Object {},
Object {
"value": [Function],
},
Object {
"fill": [Function],
"paths": [Function],
@@ -493,6 +504,7 @@ Object {
"show": true,
"spanGaps": undefined,
"stroke": "#808080",
"value": [Function],
"width": 2,
},
],
@@ -603,7 +615,9 @@ Object {
},
"select": undefined,
"series": Array [
Object {},
Object {
"value": [Function],
},
Object {
"fill": [Function],
"paths": [Function],
@@ -618,6 +632,7 @@ Object {
"show": true,
"spanGaps": undefined,
"stroke": "#808080",
"value": [Function],
"width": 2,
},
],
@@ -728,7 +743,9 @@ Object {
},
"select": undefined,
"series": Array [
Object {},
Object {
"value": [Function],
},
Object {
"fill": [Function],
"paths": [Function],
@@ -743,6 +760,7 @@ Object {
"show": true,
"spanGaps": undefined,
"stroke": "#808080",
"value": [Function],
"width": 2,
},
],
@@ -853,7 +871,9 @@ Object {
},
"select": undefined,
"series": Array [
Object {},
Object {
"value": [Function],
},
Object {
"fill": [Function],
"paths": [Function],
@@ -868,6 +888,7 @@ Object {
"show": true,
"spanGaps": undefined,
"stroke": "#808080",
"value": [Function],
"width": 2,
},
],
@@ -978,7 +999,9 @@ Object {
},
"select": undefined,
"series": Array [
Object {},
Object {
"value": [Function],
},
Object {
"fill": [Function],
"paths": [Function],
@@ -993,6 +1016,7 @@ Object {
"show": true,
"spanGaps": undefined,
"stroke": "#808080",
"value": [Function],
"width": 2,
},
],