mirror of
https://github.com/grafana/grafana.git
synced 2024-12-25 08:21:46 -06:00
Histogram: Send proper dataframe to PlotLegend (#53284)
* Send proper dataframe to PlotLegend * Update dataFrameFieldIndex for multiple frames
This commit is contained in:
parent
8185b6fdf7
commit
3893c46976
@ -41,6 +41,7 @@ export interface HistogramProps extends Themeable2 {
|
||||
height: number;
|
||||
structureRev?: number; // a number that will change when the frames[] structure changes
|
||||
legend: VizLegendOptions;
|
||||
rawSeries?: DataFrame[];
|
||||
children?: (builder: UPlotConfigBuilder, frame: DataFrame) => React.ReactNode;
|
||||
}
|
||||
|
||||
@ -209,8 +210,8 @@ const prepConfig = (frame: DataFrame, theme: GrafanaTheme2) => {
|
||||
|
||||
// The following properties are not used in the uPlot config, but are utilized as transport for legend config
|
||||
dataFrameFieldIndex: {
|
||||
fieldIndex: i,
|
||||
frameIndex: 0,
|
||||
fieldIndex: 1,
|
||||
frameIndex: i - 2,
|
||||
},
|
||||
});
|
||||
}
|
||||
@ -271,11 +272,11 @@ export class Histogram extends React.Component<HistogramProps, State> {
|
||||
|
||||
renderLegend(config: UPlotConfigBuilder) {
|
||||
const { legend } = this.props;
|
||||
if (!config || legend.showLegend === false) {
|
||||
if (!config || legend.showLegend === false || !this.props.rawSeries) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return <PlotLegend data={[this.props.alignedFrame]} config={config} maxHeight="35%" maxWidth="60%" {...legend} />;
|
||||
return <PlotLegend data={this.props.rawSeries} config={config} maxHeight="35%" maxWidth="60%" {...legend} />;
|
||||
}
|
||||
|
||||
componentDidUpdate(prevProps: HistogramProps) {
|
||||
|
@ -45,6 +45,7 @@ export const HistogramPanel: React.FC<Props> = ({ data, options, width, height }
|
||||
options={options}
|
||||
theme={theme}
|
||||
legend={options.legend}
|
||||
rawSeries={data.series}
|
||||
structureRev={data.structureRev}
|
||||
width={width}
|
||||
height={height}
|
||||
|
Loading…
Reference in New Issue
Block a user