public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Panels: avoid crash while switching between panels types (#35286) (#35289)

Browse Source 
(cherry picked from commit 351400b82e)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
This commit is contained in:
Grot (@grafanabot)
2021-06-04 21:36:57 +02:00
committed by GitHub
co-authored by Ryan McKinley
parent 557c310c8c
commit d76bcd082f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/dashboard/state/getPanelOptionsWithDefaults.ts
+3 -1
View File
@@ -198,7 +198,9 @@ export function restoreCustomOverrideRules(current: FieldConfigSource, old: Fiel
if (isCustomFieldProp(prop)) { if (isCustomFieldProp(prop)) {
const currentOverride = result.overrides.find((o) => isEqual(o.matcher, override.matcher)); const currentOverride = result.overrides.find((o) => isEqual(o.matcher, override.matcher));
if (currentOverride) { if (currentOverride) {
currentOverride.properties.push(prop); if (currentOverride !== override) {
currentOverride.properties.push(prop);
}
} else { } else {
result.overrides.push(override); result.overrides.push(override);
} }