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

XYChart/Trend: Fix min/max and units/decimals x-field overrides (#70214)

Browse Source
This commit is contained in:
Leon Sorokin 2023-06-16 11:10:53 -05:00 committed by GitHub
parent 82c125d450
commit 66b0e6b77f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,6 +181,7 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<{
scaleKey: xScaleKey,
orientation: ScaleOrientation.Horizontal,
direction: ScaleDirection.Right,
range: (u, dataMin, dataMax) => [xField.config.min ?? dataMin, xField.config.max ?? dataMax],
});
builder.addAxis({
@ -190,6 +191,7 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<{
label: xField.config.custom?.axisLabel,
theme,
grid: { show: xField.config.custom?.axisGridShow },
formatValue: (v, decimals) => formattedValueToString(xField.display!(v, decimals)),
});
}

4
public/app/plugins/panel/trend/TrendPanel.tsx
View File

@ -92,9 +92,7 @@ export const TrendPanel = ({
options={options}
>
{(config, alignedDataFrame) => {
if (
alignedDataFrame.fields.filter((f) => f.config.links !== undefined && f.config.links.length > 0).length > 0
) {
if (alignedDataFrame.fields.some((f) => Boolean(f.config.links?.length))) {
alignedDataFrame = regenerateLinksSupplier(alignedDataFrame, info.frames!, replaceVariables, timeZone);
}

3
public/app/plugins/panel/xychart/scatter.ts
View File

@ -604,8 +604,7 @@ const prepConfig = (
isTime: false,
orientation: ScaleOrientation.Horizontal,
direction: ScaleDirection.Right,
min: xField.config.min,
max: xField.config.max,
range: (u, dataMin, dataMax) => [xField.config.min ?? dataMin, xField.config.max ?? dataMax],
});
// why does this fall back to '' instead of null or undef?