From 601455190e7b870fab419577cf9176d75f9c2b65 Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Thu, 13 May 2021 02:04:22 -0500
Subject: [PATCH] Timeline: rename modes, grid -> Periodic samples, spans ->
State changes (#34033)
---
.../panel-timeline/timeline-modes.json | 12 ++++++------
public/app/plugins/panel/timeline/module.tsx | 8 ++++----
public/app/plugins/panel/timeline/timeline.ts | 12 ++++++------
public/app/plugins/panel/timeline/types.ts | 4 ++--
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/devenv/dev-dashboards/panel-timeline/timeline-modes.json b/devenv/dev-dashboards/panel-timeline/timeline-modes.json
index 003b2af6108..07d71ceac91 100644
--- a/devenv/dev-dashboards/panel-timeline/timeline-modes.json
+++ b/devenv/dev-dashboards/panel-timeline/timeline-modes.json
@@ -55,7 +55,7 @@
"displayMode": "list",
"placement": "bottom"
},
- "mode": "spans",
+ "mode": "changes",
"rowHeight": 0.9,
"showValue": "always"
},
@@ -187,7 +187,7 @@
"scenarioId": "manual_entry"
}
],
- "title": "Spans Mode",
+ "title": "\"State changes\" Mode",
"type": "timeline"
},
{
@@ -228,7 +228,7 @@
"displayMode": "list",
"placement": "bottom"
},
- "mode": "spans",
+ "mode": "changes",
"rowHeight": 0.9,
"showValue": "always"
},
@@ -252,7 +252,7 @@
"stringInput": "true,null,false,null,true,false"
}
],
- "title": "Spans Mode (strings & booleans)",
+ "title": "\"State changes\" Mode (strings & booleans)",
"type": "timeline"
},
{
@@ -296,7 +296,7 @@
"displayMode": "list",
"placement": "bottom"
},
- "mode": "grid",
+ "mode": "samples",
"rowHeight": 0.9,
"showValue": "always"
},
@@ -331,7 +331,7 @@
"stringInput": ""
}
],
- "title": "Grid Mode",
+ "title": "\"Periodic samples\" Mode",
"type": "timeline"
}
],
diff --git a/public/app/plugins/panel/timeline/module.tsx b/public/app/plugins/panel/timeline/module.tsx
index 39577c7c402..ea2fe5be0fd 100755
--- a/public/app/plugins/panel/timeline/module.tsx
+++ b/public/app/plugins/panel/timeline/module.tsx
@@ -59,11 +59,11 @@ export const plugin = new PanelPlugin<TimelineOptions, TimelineFieldConfig>(Time
.addRadio({
path: 'mode',
name: 'Mode',
- defaultValue: TimelineMode.Spans,
+ defaultValue: TimelineMode.Changes,
settings: {
options: [
- { label: 'Spans', value: TimelineMode.Spans },
- { label: 'Grid', value: TimelineMode.Grid },
+ { label: 'State changes', value: TimelineMode.Changes },
+ { label: 'Periodic samples', value: TimelineMode.Samples },
],
},
})
@@ -98,7 +98,7 @@ export const plugin = new PanelPlugin<TimelineOptions, TimelineFieldConfig>(Time
max: 1,
step: 0.01,
},
- showIf: ({ mode }) => mode === TimelineMode.Grid,
+ showIf: ({ mode }) => mode === TimelineMode.Samples,
});
//addLegendOptions(builder);
diff --git a/public/app/plugins/panel/timeline/timeline.ts b/public/app/plugins/panel/timeline/timeline.ts
index f9f30cda62f..f1580495d72 100644
--- a/public/app/plugins/panel/timeline/timeline.ts
+++ b/public/app/plugins/panel/timeline/timeline.ts
@@ -79,7 +79,7 @@ export function getConfig(opts: TimelineCoreOptions) {
const hovered: Array<Rect | null> = Array(numSeries).fill(null);
- const size = [colWidth, 100];
+ const size = [colWidth, Infinity];
const gapFactor = 1 - size[0];
const maxWidth = (size[1] ?? Infinity) * pxRatio;
@@ -174,7 +174,7 @@ export function getConfig(opts: TimelineCoreOptions) {
u.ctx.clip();
walk(rowHeight, sidx - 1, numSeries, yDim, (iy, y0, hgt) => {
- if (mode === TimelineMode.Spans) {
+ if (mode === TimelineMode.Changes) {
for (let ix = 0; ix < dataY.length; ix++) {
if (dataY[ix] != null) {
let lft = Math.round(valToPosX(dataX[ix], scaleX, xDim, xOff));
@@ -207,7 +207,7 @@ export function getConfig(opts: TimelineCoreOptions) {
ix = nextIx - 1;
}
}
- } else if (mode === TimelineMode.Grid) {
+ } else if (mode === TimelineMode.Samples) {
let colWid = valToPosX(dataX[1], scaleX, xDim, xOff) - valToPosX(dataX[0], scaleX, xDim, xOff);
let gapWid = colWid * gapFactor;
let barWid = round(min(maxWidth, colWid - gapWid) - strokeWidth);
@@ -258,7 +258,7 @@ export function getConfig(opts: TimelineCoreOptions) {
u.ctx.font = font;
u.ctx.fillStyle = 'black';
- u.ctx.textAlign = mode === TimelineMode.Spans ? 'left' : 'center';
+ u.ctx.textAlign = mode === TimelineMode.Changes ? 'left' : 'center';
u.ctx.textBaseline = 'middle';
uPlot.orient(
@@ -364,7 +364,7 @@ export function getConfig(opts: TimelineCoreOptions) {
cursor,
xSplits:
- mode === TimelineMode.Grid
+ mode === TimelineMode.Samples
? (u: uPlot, axisIdx: number, scaleMin: number, scaleMax: number, foundIncr: number, foundSpace: number) => {
let splits = [];
@@ -389,7 +389,7 @@ export function getConfig(opts: TimelineCoreOptions) {
let min = r.from.valueOf();
let max = r.to.valueOf();
- if (mode === TimelineMode.Grid) {
+ if (mode === TimelineMode.Samples) {
let colWid = u.data[0][1] - u.data[0][0];
let scalePad = colWid / 2;
diff --git a/public/app/plugins/panel/timeline/types.ts b/public/app/plugins/panel/timeline/types.ts
index aa557973e31..aaf3008760f 100644
--- a/public/app/plugins/panel/timeline/types.ts
+++ b/public/app/plugins/panel/timeline/types.ts
@@ -33,6 +33,6 @@ export const defaultTimelineFieldConfig: TimelineFieldConfig = {
* @alpha
*/
export enum TimelineMode {
- Spans = 'spans',
- Grid = 'grid',
+ Changes = 'changes',
+ Samples = 'samples',
}