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

Histogram: Fix crash when state was undefined (when combine was enabled) (#34514)

Browse Source
This commit is contained in:
Torkel Ödegaard 2021-05-20 17:36:20 +02:00 committed by GitHub
parent aa14621d29
commit d0769397b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/api/frontendsettings.go
View File

@ -285,16 +285,18 @@ func getPanelSort(id string) int {
sort = 10 sort = 10
case "status-grid": case "status-grid":
sort = 11 sort = 11
case "graph": case "histogram":
sort = 12 sort = 12
case "text": case "graph":
sort = 13 sort = 13
case "alertlist": case "text":
sort = 14 sort = 14
case "dashlist": case "alertlist":
sort = 15 sort = 15
case "news": case "dashlist":
sort = 16 sort = 16
case "news":
sort = 17
} }
return sort return sort
} }

2
public/app/features/dashboard/components/PanelEditor/VisualizationSelectPane.tsx
View File

@ -57,7 +57,7 @@ export const VisualizationSelectPane: FC<Props> = ({ panel }) => {
const match = filterPluginList(plugins, query, plugin.meta); const match = filterPluginList(plugins, query, plugin.meta);
if (match && match.length) { if (match && match.length) {
onPluginTypeChange(match[0], true); onPluginTypeChange(match[0], false);
} }
} }
}, },

3
public/app/plugins/panel/histogram/Histogram.tsx
View File

@ -123,7 +123,8 @@ const prepConfig = (frame: DataFrame, theme: GrafanaTheme2) => {
for (let i = 2; i < frame.fields.length; i++) { for (let i = 2; i < frame.fields.length; i++) {
const field = frame.fields[i]; const field = frame.fields[i];
field.state!.seriesIndex = seriesIndex++; field.state = field.state ?? {};
field.state.seriesIndex = seriesIndex++;
const customConfig = { ...field.config.custom }; const customConfig = { ...field.config.custom };