Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -322,10 +322,14 @@ describe('PageParamsProvider', function () {
query: '',
sortBys: [{field: 'max(span.duration)', kind: 'desc'}],
visualizes: [
new Visualize(['min(span.self_time)', 'max(span.duration)'], {
new Visualize(['min(span.self_time)'], {
label: 'A',
chartType: ChartType.AREA,
}),
new Visualize(['max(span.duration)'], {
label: 'B',
chartType: ChartType.AREA,
}),
],
});
});
Expand All @@ -352,10 +356,14 @@ describe('PageParamsProvider', function () {
query: '',
sortBys: [{field: 'min(span.self_time)', kind: 'desc'}],
visualizes: [
new Visualize(['min(span.self_time)', 'max(span.duration)'], {
new Visualize(['min(span.self_time)'], {
label: 'A',
chartType: ChartType.AREA,
}),
new Visualize(['max(span.duration)'], {
label: 'B',
chartType: ChartType.AREA,
}),
],
});
});
Expand Down Expand Up @@ -421,10 +429,14 @@ describe('PageParamsProvider', function () {
sortBys: [{field: 'count(span.self_time)', kind: 'asc'}],
visualizes: [
new Visualize(['count(span.self_time)'], {label: 'A', chartType: ChartType.AREA}),
new Visualize(['avg(span.duration)', 'avg(span.self_time)'], {
new Visualize(['avg(span.duration)'], {
label: 'B',
chartType: ChartType.LINE,
}),
new Visualize(['avg(span.self_time)'], {
label: 'C',
chartType: ChartType.LINE,
}),
],
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,18 +86,26 @@ export function getVisualizesFromLocation(
): Visualize[] {
const rawVisualizes = decodeList(location.query.visualize);

const result: Visualize[] = rawVisualizes
const visualizes: Visualize[] = [];

const baseVisualizes: BaseVisualize[] = rawVisualizes
.map(raw => parseVisualizes(raw, organization))
.filter(defined)
.filter(parsed => parsed.yAxes.length > 0)
.map((parsed, i) => {
return new Visualize(parsed.yAxes, {
label: String.fromCharCode(65 + i), // starts from 'A'
chartType: parsed.chartType,
});
});
.filter(defined);

let i = 0;
for (const visualize of baseVisualizes) {
for (const yAxis of visualize.yAxes) {
visualizes.push(
new Visualize([yAxis], {
label: String.fromCharCode(65 + i), // starts from 'A',
chartType: visualize.chartType,
})
);
i++;
}
}

return result.length ? result : defaultVisualizes();
return visualizes.length ? visualizes : defaultVisualizes();
}

function parseVisualizes(raw: string, organization: Organization): BaseVisualize | null {
Expand Down
3 changes: 1 addition & 2 deletions static/app/views/explore/hooks/useAddToDashboard.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,8 @@ describe('AddToDashboardButton', () => {
queries: [
{
aggregates: [
// because the visualizes get flattend, we only take the first y axis
'avg(span.duration)',
'max(span.duration)',
'min(span.duration)',
],
columns: [],
fields: [],
Expand Down
Loading