Skip to content

Commit 397df6d

Browse files
Zylphrexandrewshie-sentry
authored andcommitted
feat(logs): Swap logs to query params context for aggregate sort by r… (#97698)
…eadonly Switch the read parts for the aggregate sort bys to query params.
1 parent 506b896 commit 397df6d

File tree

6 files changed

+14
-13
lines changed

6 files changed

+14
-13
lines changed

static/app/views/explore/contexts/logs/logsPageParams.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -393,11 +393,6 @@ export function usePersistedLogsPageParams() {
393393
});
394394
}
395395

396-
export function useLogsAggregateSortBys() {
397-
const {aggregateSortBys} = useLogsPageParams();
398-
return aggregateSortBys;
399-
}
400-
401396
export function useLogsAggregateCursor() {
402397
const {aggregateCursor} = useLogsPageParams();
403398
return aggregateCursor;

static/app/views/explore/logs/logsTab.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import {defaultLogFields} from 'sentry/views/explore/contexts/logs/fields';
3030
import {useLogsAutoRefreshEnabled} from 'sentry/views/explore/contexts/logs/logsAutoRefreshContext';
3131
import {useLogsPageDataQueryResult} from 'sentry/views/explore/contexts/logs/logsPageData';
3232
import {
33-
useLogsAggregateSortBys,
3433
useLogsFields,
3534
useLogsSearch,
3635
useSetLogsFields,
@@ -79,6 +78,7 @@ import {useSaveAsItems} from 'sentry/views/explore/logs/useSaveAsItems';
7978
import {useStreamingTimeseriesResult} from 'sentry/views/explore/logs/useStreamingTimeseriesResult';
8079
import {calculateAverageLogsPerSecond} from 'sentry/views/explore/logs/utils';
8180
import {
81+
useQueryParamsAggregateSortBys,
8282
useQueryParamsGroupBys,
8383
useQueryParamsMode,
8484
useQueryParamsTopEventsLimit,
@@ -105,7 +105,7 @@ export function LogsTabContent({
105105
const mode = useQueryParamsMode();
106106
const topEventsLimit = useQueryParamsTopEventsLimit();
107107
const queryClient = useQueryClient();
108-
const sortBys = useLogsAggregateSortBys();
108+
const sortBys = useQueryParamsAggregateSortBys();
109109
const setMode = useSetQueryParamsMode();
110110
const setFields = useSetLogsFields();
111111
const tableData = useLogsPageDataQueryResult();

static/app/views/explore/logs/tables/logsAggregateTable.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {useLocation} from 'sentry/utils/useLocation';
1111
import useOrganization from 'sentry/utils/useOrganization';
1212
import {
1313
LOGS_AGGREGATE_CURSOR_KEY,
14-
useLogsAggregateSortBys,
1514
useSetLogsPageParams,
1615
} from 'sentry/views/explore/contexts/logs/logsPageParams';
1716
import {LOGS_AGGREGATE_SORT_BYS_KEY} from 'sentry/views/explore/contexts/logs/sortBys';
@@ -21,6 +20,7 @@ import {getLogColors} from 'sentry/views/explore/logs/styles';
2120
import {useLogsAggregatesQuery} from 'sentry/views/explore/logs/useLogsQuery';
2221
import {SeverityLevel} from 'sentry/views/explore/logs/utils';
2322
import {
23+
useQueryParamsAggregateSortBys,
2424
useQueryParamsGroupBys,
2525
useQueryParamsVisualizes,
2626
} from 'sentry/views/explore/queryParams/context';
@@ -33,7 +33,7 @@ export function LogsAggregateTable() {
3333
const setLogsPageParams = useSetLogsPageParams();
3434
const groupBys = useQueryParamsGroupBys();
3535
const visualizes = useQueryParamsVisualizes();
36-
const aggregateSortBys = useLogsAggregateSortBys();
36+
const aggregateSortBys = useQueryParamsAggregateSortBys();
3737
const location = useLocation();
3838
const theme = useTheme();
3939
const organization = useOrganization();

static/app/views/explore/logs/useLogsQuery.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import usePageFilters from 'sentry/utils/usePageFilters';
2323
import {useLogsAutoRefreshEnabled} from 'sentry/views/explore/contexts/logs/logsAutoRefreshContext';
2424
import {
2525
useLogsAggregateCursor,
26-
useLogsAggregateSortBys,
2726
useLogsBaseSearch,
2827
useLogsCursor,
2928
useLogsFields,
@@ -53,6 +52,7 @@ import {
5352
} from 'sentry/views/explore/logs/useVirtualStreaming';
5453
import {getTimeBasedSortBy} from 'sentry/views/explore/logs/utils';
5554
import {
55+
useQueryParamsAggregateSortBys,
5656
useQueryParamsGroupBys,
5757
useQueryParamsVisualizes,
5858
} from 'sentry/views/explore/queryParams/context';
@@ -119,7 +119,7 @@ function useLogsAggregatesQueryKey({
119119
const projectIds = useLogsProjectIds();
120120
const groupBys = useQueryParamsGroupBys();
121121
const visualizes = useQueryParamsVisualizes();
122-
const aggregateSortBys = useLogsAggregateSortBys();
122+
const aggregateSortBys = useQueryParamsAggregateSortBys();
123123
const aggregateCursor = useLogsAggregateCursor();
124124
const fields: string[] = [];
125125
fields.push(...groupBys.filter(Boolean));
@@ -135,7 +135,7 @@ function useLogsAggregatesQueryKey({
135135
const eventView = getEventView(
136136
search,
137137
fields,
138-
aggregateSortBys,
138+
aggregateSortBys.slice(),
139139
pageFilters,
140140
dataset,
141141
projectIds

static/app/views/explore/logs/useSaveAsItems.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ interface UseSaveAsItemsOptions {
3737
interval: string;
3838
mode: Mode;
3939
search: MutableSearch;
40-
sortBys: Sort[];
40+
sortBys: readonly Sort[];
4141
visualizes: readonly Visualize[];
4242
}
4343

static/app/views/explore/queryParams/context.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import type {ReactNode} from 'react';
22
import {useCallback, useMemo} from 'react';
33

4+
import type {Sort} from 'sentry/utils/discover/fields';
45
import {createDefinedContext} from 'sentry/utils/performance/contexts/utils';
56
import {TOP_EVENTS_LIMIT} from 'sentry/views/explore/hooks/useTopEvents';
67
import type {Mode} from 'sentry/views/explore/queryParams/mode';
@@ -82,3 +83,8 @@ export function useQueryParamsTopEventsLimit(): number | undefined {
8283
const groupBys = useQueryParamsGroupBys();
8384
return groupBys.every(groupBy => groupBy === '') ? undefined : TOP_EVENTS_LIMIT;
8485
}
86+
87+
export function useQueryParamsAggregateSortBys(): readonly Sort[] {
88+
const queryParams = useQueryParams();
89+
return queryParams.aggregateSortBys;
90+
}

0 commit comments

Comments
 (0)