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

This file was deleted.

4 changes: 2 additions & 2 deletions static/app/views/explore/hooks/useAnalytics.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {trackAnalytics} from 'sentry/utils/analytics';
import type {LogsAnalyticsPageSource} from 'sentry/utils/analytics/logsAnalyticsEvent';
import type {Sort} from 'sentry/utils/discover/fields';
import {DiscoverDatasets} from 'sentry/utils/discover/types';
import {decodeScalar} from 'sentry/utils/queryString';
import {MutableSearch} from 'sentry/utils/tokenizeSearch';
import {useLocation} from 'sentry/utils/useLocation';
import {useOrganization} from 'sentry/utils/useOrganization';
Expand All @@ -16,7 +17,6 @@ import {useChartSelection} from 'sentry/views/explore/components/attributeBreakd
import {useLogsAutoRefreshEnabled} from 'sentry/views/explore/contexts/logs/logsAutoRefreshContext';
import {Mode} from 'sentry/views/explore/contexts/pageParamsContext/mode';
import {formatSort} from 'sentry/views/explore/contexts/pageParamsContext/sortBys';
import {getTitleFromLocation} from 'sentry/views/explore/contexts/pageParamsContext/title';
import type {AggregatesTableResult} from 'sentry/views/explore/hooks/useExploreAggregatesTable';
import type {SpansTableResult} from 'sentry/views/explore/hooks/useExploreSpansTable';
import type {TracesTableResult} from 'sentry/views/explore/hooks/useExploreTracesTable';
Expand Down Expand Up @@ -1010,7 +1010,7 @@ export function useMetricsAnalytics({
const organization = useOrganization();
const {selection} = usePageFilters();
const location = useLocation();
const title = getTitleFromLocation(location);
const title = decodeScalar(location.query.title);

const {
data: {hasExceededPerformanceUsageLimit},
Expand Down
4 changes: 2 additions & 2 deletions static/app/views/explore/hooks/useSaveMultiQuery.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import {useCallback, useMemo} from 'react';

import {usePageFilters} from 'sentry/components/pageFilters/usePageFilters';
import {encodeSort} from 'sentry/utils/discover/eventView';
import {decodeScalar} from 'sentry/utils/queryString';
import {useApi} from 'sentry/utils/useApi';
import {useChartInterval} from 'sentry/utils/useChartInterval';
import {useLocation} from 'sentry/utils/useLocation';
import {useOrganization} from 'sentry/utils/useOrganization';
import {getIdFromLocation} from 'sentry/views/explore/contexts/pageParamsContext/id';
import {getTitleFromLocation} from 'sentry/views/explore/contexts/pageParamsContext/title';
import {useInvalidateSavedQueries} from 'sentry/views/explore/hooks/useGetSavedQueries';
import {MAX_QUERIES_ALLOWED} from 'sentry/views/explore/multiQueryMode/content';
import {useReadQueriesFromLocation} from 'sentry/views/explore/multiQueryMode/locationUtils';
Expand All @@ -17,7 +17,7 @@ const TRACE_EXPLORER_DATASET = 'spans';
export function useSaveMultiQuery() {
const location = useLocation();
const id = getIdFromLocation(location);
const title = getTitleFromLocation(location);
const title = decodeScalar(location.query.title);

const queries = useReadQueriesFromLocation().slice(0, MAX_QUERIES_ALLOWED);

Expand Down
3 changes: 1 addition & 2 deletions static/app/views/explore/logs/logsQueryParams.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import {getQueryFromLocation} from 'sentry/views/explore/queryParams/query';
import {ReadableQueryParams} from 'sentry/views/explore/queryParams/readableQueryParams';
import {
getIdFromLocation,
getTitleFromLocation,
ID_KEY,
TITLE_KEY,
} from 'sentry/views/explore/queryParams/savedQuery';
Expand Down Expand Up @@ -75,7 +74,7 @@ export function getReadableQueryParamsFromLocation(
) ?? defaultAggregateSortBys(aggregateFields);

const id = getIdFromLocation(location, LOGS_ID_KEY);
const title = getTitleFromLocation(location, LOGS_TITLE_KEY);
const title = decodeScalar(location.query?.[LOGS_TITLE_KEY]);

return new ReadableQueryParams({
extrapolate: true,
Expand Down
4 changes: 2 additions & 2 deletions static/app/views/explore/metrics/content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {SentryDocumentTitle} from 'sentry/components/sentryDocumentTitle';
import {t} from 'sentry/locale';
import {DataCategory} from 'sentry/types/core';
import {defined} from 'sentry/utils';
import {decodeScalar} from 'sentry/utils/queryString';
import {useDatePageFilterProps} from 'sentry/utils/useDatePageFilterProps';
import {useLocation} from 'sentry/utils/useLocation';
import {useMaxPickableDays} from 'sentry/utils/useMaxPickableDays';
Expand All @@ -23,7 +24,6 @@ import {MetricsTabContent} from 'sentry/views/explore/metrics/metricsTab';
import {MultiMetricsQueryParamsProvider} from 'sentry/views/explore/metrics/multiMetricsQueryParams';
import {
getIdFromLocation,
getTitleFromLocation,
ID_KEY,
TITLE_KEY,
} from 'sentry/views/explore/queryParams/savedQuery';
Expand Down Expand Up @@ -91,7 +91,7 @@ const metricsFeedbackOptions = {
function MetricsHeader() {
const location = useLocation();
const pageId = getIdFromLocation(location, ID_KEY);
const title = getTitleFromLocation(location, TITLE_KEY);
const title = decodeScalar(location.query?.[TITLE_KEY]);
const organization = useOrganization();
const {data: savedQuery} = useGetSavedQuery(pageId);
const hasSavedQueryTitle =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import * as Sentry from '@sentry/react';
import {usePageFilters} from 'sentry/components/pageFilters/usePageFilters';
import {defined} from 'sentry/utils';
import {encodeSort} from 'sentry/utils/discover/eventView';
import {decodeScalar} from 'sentry/utils/queryString';
import {useApi} from 'sentry/utils/useApi';
import {useChartInterval} from 'sentry/utils/useChartInterval';
import {useLocation} from 'sentry/utils/useLocation';
import {useOrganization} from 'sentry/utils/useOrganization';
import {getIdFromLocation} from 'sentry/views/explore/contexts/pageParamsContext/id';
import {getTitleFromLocation} from 'sentry/views/explore/contexts/pageParamsContext/title';
import {useInvalidateSavedQueries} from 'sentry/views/explore/hooks/useGetSavedQueries';
import {useMultiMetricsQueryParams} from 'sentry/views/explore/metrics/multiMetricsQueryParams';
import {isGroupBy} from 'sentry/views/explore/queryParams/groupBy';
Expand All @@ -23,7 +23,7 @@ const METRICS_DATASET = 'metrics';
export function useSaveMetricsMultiQuery() {
const location = useLocation();
const id = getIdFromLocation(location);
const title = getTitleFromLocation(location);
const title = decodeScalar(location.query.title);

const metricQueries = useMultiMetricsQueryParams();

Expand Down
4 changes: 2 additions & 2 deletions static/app/views/explore/multiQueryMode/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import {NoAccess} from 'sentry/components/noAccess';
import {SentryDocumentTitle} from 'sentry/components/sentryDocumentTitle';
import {t} from 'sentry/locale';
import {defined} from 'sentry/utils';
import {decodeScalar} from 'sentry/utils/queryString';
import {useLocation} from 'sentry/utils/useLocation';
import {useOrganization} from 'sentry/utils/useOrganization';
import {getIdFromLocation} from 'sentry/views/explore/contexts/pageParamsContext/id';
import {getTitleFromLocation} from 'sentry/views/explore/contexts/pageParamsContext/title';
import {useGetSavedQuery} from 'sentry/views/explore/hooks/useGetSavedQueries';
import {MultiQueryModeContent} from 'sentry/views/explore/multiQueryMode/content';
import {SavedQueryEditMenu} from 'sentry/views/explore/savedQueryEditMenu';
Expand All @@ -21,7 +21,7 @@ import {makeTracesPathname} from 'sentry/views/traces/pathnames';
export default function MultiQueryMode() {
const location = useLocation();
const organization = useOrganization();
const title = getTitleFromLocation(location);
const title = decodeScalar(location.query.title);

const id = getIdFromLocation(location);
const {data: savedQuery} = useGetSavedQuery(id);
Expand Down
7 changes: 0 additions & 7 deletions static/app/views/explore/queryParams/savedQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,3 @@ export const TITLE_KEY = 'title';
export function getIdFromLocation(location: Location, key: string): string | undefined {
return decodeScalar(location.query?.[key]);
}

export function getTitleFromLocation(
location: Location,
key: string
): string | undefined {
return decodeScalar(location.query?.[key]);
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type {ReactNode} from 'react';
import {useCallback, useMemo} from 'react';
import type {Location} from 'history';

import {decodeScalar} from 'sentry/utils/queryString';
import {updateNullableLocation} from 'sentry/utils/url/updateNullableLocation';
import {useLocation} from 'sentry/utils/useLocation';
import {useNavigate} from 'sentry/utils/useNavigate';
Expand All @@ -11,7 +12,6 @@ import {getQueryFromLocation} from 'sentry/views/explore/queryParams/query';
import {ReadableQueryParams} from 'sentry/views/explore/queryParams/readableQueryParams';
import {
getIdFromLocation,
getTitleFromLocation,
ID_KEY,
TITLE_KEY,
} from 'sentry/views/explore/queryParams/savedQuery';
Expand All @@ -22,7 +22,7 @@ const REPLAY_QUERY_KEY = 'query';
function getReadableQueryParamsFromLocation(location: Location): ReadableQueryParams {
const query = getQueryFromLocation(location, REPLAY_QUERY_KEY) ?? '';
const id = getIdFromLocation(location, ID_KEY);
const title = getTitleFromLocation(location, TITLE_KEY);
const title = decodeScalar(location.query?.[TITLE_KEY]);

return new ReadableQueryParams({
extrapolate: false,
Expand Down
4 changes: 2 additions & 2 deletions static/app/views/explore/spans/spansQueryParams.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type {Location} from 'history';
import {defined} from 'sentry/utils';
import type {Sort} from 'sentry/utils/discover/fields';
import {DiscoverDatasets} from 'sentry/utils/discover/types';
import {decodeScalar} from 'sentry/utils/queryString';
import {updateNullableLocation} from 'sentry/utils/url/updateNullableLocation';
import {DEFAULT_VISUALIZATION} from 'sentry/views/explore/contexts/pageParamsContext/visualizes';
import type {AggregateField} from 'sentry/views/explore/queryParams/aggregateField';
Expand All @@ -22,7 +23,6 @@ import {getQueryFromLocation} from 'sentry/views/explore/queryParams/query';
import {ReadableQueryParams} from 'sentry/views/explore/queryParams/readableQueryParams';
import {
getIdFromLocation,
getTitleFromLocation,
ID_KEY,
TITLE_KEY,
} from 'sentry/views/explore/queryParams/savedQuery';
Expand Down Expand Up @@ -81,7 +81,7 @@ export function getReadableQueryParamsFromLocation(
) ?? defaultAggregateSortBys(aggregateFields);

const id = getIdFromLocation(location, SPANS_ID_KEY);
const title = getTitleFromLocation(location, SPANS_TITLE_KEY);
const title = decodeScalar(location.query?.[SPANS_TITLE_KEY]);

const crossEvents = getCrossEventsFromLocation(location, SPANS_CROSS_EVENTS_KEY);

Expand Down
Loading