@@ -65,7 +65,8 @@ export type ChartConfigDisplaySettings = Pick<
6565 // PromQL-only: Handlebars template over each series' Prometheus label set
6666 // that renders the legend/tooltip name.
6767 legendTemplate ?: string ;
68- // Distribution heatmaps only; stored on the heatmap's select[0].
68+ // Distribution heatmaps only; stored on a builder heatmap's select[0] and
69+ // on a PromQL heatmap's `heatmap.scaleType`.
6970 heatmapScaleType ?: HeatmapScaleType ;
7071} ;
7172
@@ -90,6 +91,8 @@ interface ChartDisplaySettingsDrawerProps {
9091 promqlUsesRange ?: boolean ;
9192 /** A builder heatmap's mode; only distribution heatmaps have a numeric y axis to scale. */
9293 heatmapMode ?: HeatmapMode ;
94+ /** The heatmap scale used when the tile has none set. */
95+ defaultHeatmapScaleType ?: HeatmapScaleType ;
9396 previousDateRange ?: [ Date , Date ] ;
9497 onChange : ( settings : ChartConfigDisplaySettings , isDirty : boolean ) => void ;
9598 onClose : ( ) => void ;
@@ -98,7 +101,8 @@ interface ChartDisplaySettingsDrawerProps {
98101
99102function applyDefaultSettings (
100103 settings : ChartConfigDisplaySettings ,
101- fallbackNumberFormat ?: NumberFormat ,
104+ fallbackNumberFormat : NumberFormat | undefined ,
105+ defaultHeatmapScaleType : HeatmapScaleType ,
102106) : DrawerFormValues {
103107 return {
104108 numberFormat :
@@ -121,7 +125,7 @@ function applyDefaultSettings(
121125 ? attachLocalIds ( settings . colorRules )
122126 : undefined ,
123127 backgroundChart : settings . backgroundChart ,
124- heatmapScaleType : settings . heatmapScaleType ?? 'log' ,
128+ heatmapScaleType : settings . heatmapScaleType ?? defaultHeatmapScaleType ,
125129 } ;
126130}
127131
@@ -132,15 +136,21 @@ export default function ChartDisplaySettingsDrawer({
132136 configType,
133137 promqlUsesRange = false ,
134138 heatmapMode,
139+ defaultHeatmapScaleType = 'log' ,
135140 defaultNumberFormat,
136141 onChange,
137142 onClose,
138143 previousDateRange,
139144 isPerSeriesNumberFormatAllowed = false ,
140145} : ChartDisplaySettingsDrawerProps ) {
141146 const appliedDefaults = useMemo (
142- ( ) => applyDefaultSettings ( settings , defaultNumberFormat ) ,
143- [ settings , defaultNumberFormat ] ,
147+ ( ) =>
148+ applyDefaultSettings (
149+ settings ,
150+ defaultNumberFormat ,
151+ defaultHeatmapScaleType ,
152+ ) ,
153+ [ settings , defaultNumberFormat , defaultHeatmapScaleType ] ,
144154 ) ;
145155
146156 const {
@@ -197,9 +207,10 @@ export default function ChartDisplaySettingsDrawer({
197207 applyDefaultSettings (
198208 { } as ChartConfigDisplaySettings ,
199209 defaultNumberFormat ,
210+ defaultHeatmapScaleType ,
200211 ) ,
201212 ) ;
202- } , [ reset , defaultNumberFormat ] ) ;
213+ } , [ reset , defaultNumberFormat , defaultHeatmapScaleType ] ) ;
203214
204215 const isTimeChart = isTimeSeriesDisplayType ( displayType ) ;
205216
@@ -212,12 +223,17 @@ export default function ChartDisplaySettingsDrawer({
212223 const isClientSideSeriesLimit =
213224 showSeriesLimit && ( configType === 'sql' || configType === 'promql' ) ;
214225
226+ const isDistributionHeatmap =
227+ displayType === DisplayType . Heatmap && heatmapMode === 'distribution' ;
228+
215229 // Every PromQL display that surfaces a series name. A number tile shows one
216- // value and a table gives each label its own column, so neither has a legend.
230+ // value, a table gives each label its own column, and a distribution heatmap
231+ // merges every series into one, so none has a legend.
217232 const showLegendTemplate =
218233 configType === 'promql' &&
219234 displayType !== DisplayType . Number &&
220- displayType !== DisplayType . Table ;
235+ displayType !== DisplayType . Table &&
236+ ! isDistributionHeatmap ;
221237
222238 // On pie/bar builder charts, seriesLimit becomes a plain SQL LIMIT on the
223239 // number of slices/bars; on PromQL it trims the reduced series client-side
@@ -254,8 +270,7 @@ export default function ChartDisplaySettingsDrawer({
254270 : 'Available on query-builder number tiles.' ;
255271
256272 // Log scale only means something on a numeric (distribution mode) y axis
257- const showHeatmapScale =
258- displayType === DisplayType . Heatmap && heatmapMode === 'distribution' ;
273+ const showHeatmapScale = isDistributionHeatmap ;
259274
260275 return (
261276 < Drawer
@@ -343,7 +358,7 @@ export default function ChartDisplaySettingsDrawer({
343358 name = "heatmapScaleType"
344359 render = { ( { field : { onChange, value } } ) => (
345360 < HeatmapScaleControl
346- value = { value ?? 'log' }
361+ value = { value ?? defaultHeatmapScaleType }
347362 onChange = { onChange }
348363 />
349364 ) }
0 commit comments