From 07c9c8ffd7deac01e3f5382feae8521c33a0a124 Mon Sep 17 00:00:00 2001
From: Victor Marin <36818606+mdvictor@users.noreply.github.com>
Date: Fri, 26 Aug 2022 09:45:19 +0300
Subject: [PATCH] Histogram cue model fixes (#54022)

---
 public/app/plugins/panel/histogram/Histogram.tsx | 4 ++--
 public/app/plugins/panel/histogram/models.cue    | 1 +
 public/app/plugins/panel/histogram/models.gen.ts | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/panel/histogram/Histogram.tsx b/public/app/plugins/panel/histogram/Histogram.tsx
index 2e68f168002..437d5ec5403 100644
--- a/public/app/plugins/panel/histogram/Histogram.tsx
+++ b/public/app/plugins/panel/histogram/Histogram.tsx
@@ -23,7 +23,7 @@ import {
   UPLOT_AXIS_FONT_SIZE,
 } from '@grafana/ui';
 
-import { PanelOptions } from './models.gen';
+import { defaultPanelFieldConfig, PanelFieldConfig, PanelOptions } from './models.gen';
 
 function incrRoundDn(num: number, incr: number) {
   return Math.floor(num / incr) * incr;
@@ -182,7 +182,7 @@ const prepConfig = (frame: DataFrame, theme: GrafanaTheme2) => {
     field.state = field.state ?? {};
     field.state.seriesIndex = seriesIndex++;
 
-    const customConfig = { ...field.config.custom };
+    const customConfig: PanelFieldConfig = { ...defaultPanelFieldConfig, ...field.config.custom };
 
     const scaleKey = 'y';
     const colorMode = getFieldColorModeForField(field);
diff --git a/public/app/plugins/panel/histogram/models.cue b/public/app/plugins/panel/histogram/models.cue
index be76acc0e0f..7fa7a8f2ebe 100644
--- a/public/app/plugins/panel/histogram/models.cue
+++ b/public/app/plugins/panel/histogram/models.cue
@@ -37,6 +37,7 @@ Panel: thema.#Lineage & {
 					} @cuetsy(kind="interface")
 
 					PanelFieldConfig: {
+						ui.AxisConfig
 						ui.HideableFieldConfig
 						// Controls line width of the bars.
 						lineWidth?:    uint32 & <= 10 | *1
diff --git a/public/app/plugins/panel/histogram/models.gen.ts b/public/app/plugins/panel/histogram/models.gen.ts
index 48fd8af0a89..278cc9e939c 100644
--- a/public/app/plugins/panel/histogram/models.gen.ts
+++ b/public/app/plugins/panel/histogram/models.gen.ts
@@ -19,7 +19,7 @@ export const defaultPanelOptions: Partial<PanelOptions> = {
   bucketOffset: 0,
 };
 
-export interface PanelFieldConfig extends ui.HideableFieldConfig {
+export interface PanelFieldConfig extends ui.AxisConfig, ui.HideableFieldConfig {
   fillOpacity?: number;
   gradientMode?: ui.GraphGradientMode;
   lineWidth?: number;