Skip to content

Commit 941888b

Browse files
authored
feat(dashboards): Pass AreaChart series meta alongside the data (#82653)
Exactly the same thing as #82047 but for `AreaChartWidget`
1 parent cc70ff1 commit 941888b

6 files changed

+19
-44
lines changed

static/app/views/dashboards/widgets/areaChartWidget/areaChartWidget.spec.tsx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@ describe('AreaChartWidget', () => {
1212
title="eps()"
1313
description="Number of events per second"
1414
timeseries={[sampleLatencyTimeSeries, sampleSpanDurationTimeSeries]}
15-
meta={{
16-
fields: {
17-
'eps()': 'rate',
18-
},
19-
units: {
20-
'eps()': '1/second',
21-
},
22-
}}
2315
/>
2416
);
2517
});

static/app/views/dashboards/widgets/areaChartWidget/areaChartWidget.stories.tsx

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,6 @@ export default storyBook(AreaChartWidget, story => {
6666
title="Duration Breakdown"
6767
description="Explains what proportion of total duration is taken up by latency vs. span duration"
6868
timeseries={[latencyTimeSeries, spanDurationTimeSeries]}
69-
meta={{
70-
fields: {
71-
'avg(latency)': 'duration',
72-
'avg(span.duration)': 'duration',
73-
},
74-
units: {
75-
'avg(latency)': 'millisecond',
76-
'avg(span.duration)': 'millisecond',
77-
},
78-
}}
7969
/>
8070
</SmallSizingWindow>
8171
</Fragment>
@@ -135,16 +125,6 @@ export default storyBook(AreaChartWidget, story => {
135125

136126
{...sampleSpanDurationTimeSeries, color: theme.warning},
137127
]}
138-
meta={{
139-
fields: {
140-
'avg(latency)': 'duration',
141-
'avg(span.duration)': 'duration',
142-
},
143-
units: {
144-
'avg(latency)': 'millisecond',
145-
'avg(span.duration)': 'millisecond',
146-
},
147-
}}
148128
/>
149129
</MediumWidget>
150130
</Fragment>
@@ -175,16 +155,6 @@ export default storyBook(AreaChartWidget, story => {
175155
<AreaChartWidget
176156
title="error_rate()"
177157
timeseries={[sampleLatencyTimeSeries, sampleSpanDurationTimeSeries]}
178-
meta={{
179-
fields: {
180-
'avg(latency)': 'duration',
181-
'avg(span.duration)': 'duration',
182-
},
183-
units: {
184-
'avg(latency)': 'millisecond',
185-
'avg(span.duration)': 'millisecond',
186-
},
187-
}}
188158
releases={releases}
189159
/>
190160
</MediumWidget>

static/app/views/dashboards/widgets/areaChartWidget/areaChartWidget.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ export function AreaChartWidget(props: AreaChartWidgetProps) {
5555
<AreaChartWidgetVisualization
5656
timeseries={timeseries}
5757
releases={props.releases}
58-
meta={props.meta}
5958
/>
6059
</AreaChartWrapper>
6160
)}

static/app/views/dashboards/widgets/areaChartWidget/areaChartWidgetVisualization.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@ import {useWidgetSyncContext} from '../../contexts/widgetSyncContext';
2323
import {formatTooltipValue} from '../common/formatTooltipValue';
2424
import {formatYAxisValue} from '../common/formatYAxisValue';
2525
import {ReleaseSeries} from '../common/releaseSeries';
26-
import type {Meta, Release, TimeseriesData} from '../common/types';
26+
import type {Release, TimeseriesData} from '../common/types';
2727

2828
export interface AreaChartWidgetVisualizationProps {
2929
timeseries: TimeseriesData[];
30-
meta?: Meta;
3130
releases?: Release[];
3231
}
3332

@@ -37,7 +36,6 @@ export function AreaChartWidgetVisualization(props: AreaChartWidgetVisualization
3736

3837
const pageFilters = usePageFilters();
3938
const {start, end, period, utc} = pageFilters.selection.datetime;
40-
const {meta} = props;
4139

4240
const theme = useTheme();
4341
const organization = useOrganization();
@@ -69,8 +67,8 @@ export function AreaChartWidgetVisualization(props: AreaChartWidgetVisualization
6967

7068
// TODO: Raise error if attempting to plot series of different types or units
7169
const firstSeriesField = firstSeries?.field;
72-
const type = meta?.fields?.[firstSeriesField] ?? 'number';
73-
const unit = meta?.units?.[firstSeriesField] ?? undefined;
70+
const type = firstSeries?.meta?.fields?.[firstSeriesField] ?? 'number';
71+
const unit = firstSeries?.meta?.units?.[firstSeriesField] ?? undefined;
7472

7573
const formatter: TooltipFormatterCallback<TopLevelFormatterParams> = (
7674
params,

static/app/views/dashboards/widgets/areaChartWidget/sampleLatencyTimeSeries.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
{
22
"field": "avg(latency)",
3+
"meta": {
4+
"fields": {
5+
"avg(latency)": "duration"
6+
},
7+
"units": {
8+
"avg(latency)": "millisecond"
9+
}
10+
},
311
"data": [
412
{
513
"timestamp": "2024-12-09T22:00:00Z",

static/app/views/dashboards/widgets/areaChartWidget/sampleSpanDurationTimeSeries.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
{
22
"field": "avg(span.duration)",
3+
"meta": {
4+
"fields": {
5+
"avg(span.duration)": "duration"
6+
},
7+
"units": {
8+
"avg(span.duration)": "millisecond"
9+
}
10+
},
311
"data": [
412
{
513
"timestamp": "2024-12-09T22:00:00Z",

0 commit comments

Comments
 (0)