fix(heatmap): skip orderby for value-based axis sorts (#39290)

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Richard Fogaca Nienkotter
2026-04-13 14:29:26 -03:00
committed by GitHub
parent de98fdc37b
commit c971ea3ec6
2 changed files with 80 additions and 20 deletions

View File

@@ -19,6 +19,7 @@
import {
QueryFormColumn,
QueryFormData,
QueryObject,
QueryFormOrderBy,
buildQueryContext,
ensureIsArray,
@@ -37,17 +38,13 @@ export default function buildQuery(formData: QueryFormData) {
...ensureIsArray(groupby),
];
const orderby: QueryFormOrderBy[] = [];
if (sort_x_axis) {
orderby.push([
sort_x_axis.includes('value') ? metric : columns[0],
sort_x_axis.includes('asc'),
]);
if (sort_x_axis && !sort_x_axis.includes('value')) {
// Value sorts are applied post-query; SQL orderby biases row_limit truncation.
orderby.push([columns[0], sort_x_axis.includes('asc')]);
}
if (sort_y_axis) {
orderby.push([
sort_y_axis.includes('value') ? metric : columns[1],
sort_y_axis.includes('asc'),
]);
if (sort_y_axis && !sort_y_axis.includes('value')) {
// Value sorts are applied post-query; SQL orderby biases row_limit truncation.
orderby.push([columns[1], sort_y_axis.includes('asc')]);
}
const group_by =
normalize_across === 'x'
@@ -55,7 +52,7 @@ export default function buildQuery(formData: QueryFormData) {
: normalize_across === 'y'
? getColumnLabel(groupby as unknown as QueryFormColumn)
: undefined;
return buildQueryContext(formData, baseQueryObject => [
return buildQueryContext(formData, (baseQueryObject: QueryObject) => [
{
...baseQueryObject,
columns,