fix(tracemetrics): Decode saved query sorts into separate sample and aggregate sorts

Split orderby → sortBys and aggregateOrderby → aggregateSortBys when
restoring a saved query URL, so each table retains its own sort order.
Add tests covering the new decoding and backwards compatibility.

Author: nsdeschenes

static/app/views/explore/metrics/utils.spec.tsx

@@ -1,4 +1,13 @@
-import {mapMetricUnitToFieldType} from 'sentry/views/explore/metrics/utils';
+import qs from 'query-string';
+import {OrganizationFixture} from 'sentry-fixture/organization';
+
+import {SavedQuery} from 'sentry/views/explore/hooks/useGetSavedQueries';
+import {decodeMetricsQueryParams} from 'sentry/views/explore/metrics/metricQuery';
+import {
+  getMetricsUrlFromSavedQueryUrl,
+  mapMetricUnitToFieldType,
+} from 'sentry/views/explore/metrics/utils';
+import {Mode} from 'sentry/views/explore/queryParams/mode';
 
 describe('mapMetricUnitToFieldType', () => {
   it.each([
@@ -18,3 +27,144 @@ describe('mapMetricUnitToFieldType', () => {
     expect(mapMetricUnitToFieldType(unit)).toEqual(expected);
   });
 });
+
+describe('getMetricsUrlFromSavedQueryUrl', () => {
+  const organization = OrganizationFixture();
+
+  function decodeMetricFromUrl(url: string) {
+    const query = qs.parseUrl(url).query;
+    const metricParam = Array.isArray(query.metric) ? query.metric[0] : query.metric;
+    return decodeMetricsQueryParams(metricParam!);
+  }
+
+  it('decodes orderby into sortBys', () => {
+    const url = getMetricsUrlFromSavedQueryUrl({
+      organization,
+      savedQuery: new SavedQuery({
+        id: 1,
+        interval: '5m',
+        name: 'test query',
+        projects: [],
+        dataset: 'metrics',
+        dateAdded: '2025-01-01T00:00:00.000000Z',
+        dateUpdated: '2025-01-01T00:00:00.000000Z',
+        lastVisited: '2025-01-01T00:00:00.000000Z',
+        starred: false,
+        position: null,
+        query: [
+          {
+            mode: Mode.SAMPLES,
+            query: '',
+            fields: ['id', 'timestamp'],
+            orderby: '-value',
+            aggregateField: [{yAxes: ['sum(value,test_metric,counter,-)']}],
+            metric: {name: 'test_metric', type: 'counter'},
+          },
+        ],
+      }),
+    });
+
+    const decoded = decodeMetricFromUrl(url);
+    expect(decoded?.queryParams.sortBys).toEqual([{field: 'value', kind: 'desc'}]);
+  });
+
+  it('decodes aggregateOrderby into aggregateSortBys', () => {
+    const url = getMetricsUrlFromSavedQueryUrl({
+      organization,
+      savedQuery: new SavedQuery({
+        id: 1,
+        interval: '5m',
+        name: 'test query',
+        projects: [],
+        dataset: 'metrics',
+        dateAdded: '2025-01-01T00:00:00.000000Z',
+        dateUpdated: '2025-01-01T00:00:00.000000Z',
+        lastVisited: '2025-01-01T00:00:00.000000Z',
+        starred: false,
+        position: null,
+        query: [
+          {
+            mode: Mode.SAMPLES,
+            query: '',
+            fields: ['id', 'timestamp'],
+            orderby: '-timestamp',
+            aggregateOrderby: '-sum(value,test_metric,counter,-)',
+            aggregateField: [{yAxes: ['sum(value,test_metric,counter,-)']}],
+            metric: {name: 'test_metric', type: 'counter'},
+          },
+        ],
+      }),
+    });
+
+    const decoded = decodeMetricFromUrl(url);
+    expect(decoded?.queryParams.sortBys).toEqual([{field: 'timestamp', kind: 'desc'}]);
+    expect(decoded?.queryParams.aggregateSortBys).toEqual([
+      {field: 'sum(value,test_metric,counter,-)', kind: 'desc'},
+    ]);
+  });
+
+  it('falls back to defaults when aggregateOrderby is missing (backwards compat)', () => {
+    const url = getMetricsUrlFromSavedQueryUrl({
+      organization,
+      savedQuery: new SavedQuery({
+        id: 1,
+        interval: '5m',
+        name: 'test query',
+        projects: [],
+        dataset: 'metrics',
+        dateAdded: '2025-01-01T00:00:00.000000Z',
+        dateUpdated: '2025-01-01T00:00:00.000000Z',
+        lastVisited: '2025-01-01T00:00:00.000000Z',
+        starred: false,
+        position: null,
+        query: [
+          {
+            mode: Mode.SAMPLES,
+            query: '',
+            fields: ['id', 'timestamp'],
+            orderby: '-timestamp',
+            aggregateField: [{yAxes: ['sum(value,test_metric,counter,-)']}],
+            metric: {name: 'test_metric', type: 'counter'},
+          },
+        ],
+      }),
+    });
+
+    const decoded = decodeMetricFromUrl(url);
+    expect(decoded?.queryParams.sortBys).toEqual([{field: 'timestamp', kind: 'desc'}]);
+    expect(decoded?.queryParams.aggregateSortBys).toEqual([
+      {field: 'sum(value,test_metric,counter,-)', kind: 'desc'},
+    ]);
+  });
+
+  it('falls back to defaults when orderby is missing', () => {
+    const url = getMetricsUrlFromSavedQueryUrl({
+      organization,
+      savedQuery: new SavedQuery({
+        id: 1,
+        interval: '5m',
+        name: 'test query',
+        projects: [],
+        dataset: 'metrics',
+        dateAdded: '2025-01-01T00:00:00.000000Z',
+        dateUpdated: '2025-01-01T00:00:00.000000Z',
+        lastVisited: '2025-01-01T00:00:00.000000Z',
+        starred: false,
+        position: null,
+        query: [
+          {
+            mode: Mode.SAMPLES,
+            query: '',
+            fields: ['id', 'timestamp'],
+            orderby: '',
+            aggregateField: [{yAxes: ['sum(value,test_metric,counter,-)']}],
+            metric: {name: 'test_metric', type: 'counter'},
+          },
+        ],
+      }),
+    });
+
+    const decoded = decodeMetricFromUrl(url);
+    expect(decoded?.queryParams.sortBys).toEqual([{field: 'timestamp', kind: 'desc'}]);
+  });
+});

static/app/views/explore/metrics/utils.tsx

@@ -145,7 +145,10 @@ export function getMetricsUrlFromSavedQueryUrl({
         mode: queryItem.mode,
         query: queryItem.query,
         aggregateFields,
-        aggregateSortBys: decodeSorts(queryItem.orderby) || [],
+        aggregateSortBys: queryItem.aggregateOrderby
+          ? decodeSorts(queryItem.aggregateOrderby)
+          : undefined,
+        sortBys: queryItem.orderby ? decodeSorts(queryItem.orderby) : undefined,
       }),
     };
   });