🏷️ Correct types to match their query counterparts

nsdeschenes · nsdeschenes · commit 899d596d5507 · 2025-12-04T13:16:26.000-04:00
diff --git a/static/app/utils/timeSeries/useFetchEventsTimeSeries.tsx b/static/app/utils/timeSeries/useFetchEventsTimeSeries.tsx
@@ -5,7 +5,7 @@ import {encodeSort} from 'sentry/utils/discover/eventView';
 import type {Sort} from 'sentry/utils/discover/fields';
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {useApiQuery, type UseApiQueryOptions} from 'sentry/utils/queryClient';
-import type {MutableSearch} from 'sentry/utils/tokenizeSearch';
+import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import type {TimeSeries} from 'sentry/views/dashboards/widgets/common/types';
@@ -139,6 +139,29 @@ export function useFetchEventsTimeSeries<YAxis extends string, Attribute extends
     );
   }
 
+  let queryParam: string | undefined;
+  let logQueryParams: string[] | undefined;
+  let metricQueryParams: string[] | undefined;
+  let spanQueryParams: string[] | undefined;
+  if (query) {
+    queryParam = query instanceof MutableSearch ? query.formatString() : query;
+  }
+  if (Array.isArray(logQuery) && logQuery.length) {
+    logQueryParams = logQuery.map(q =>
+      q instanceof MutableSearch ? q.formatString() : q
+    );
+  }
+  if (Array.isArray(metricQuery) && metricQuery.length) {
+    metricQueryParams = metricQuery.map(q =>
+      q instanceof MutableSearch ? q.formatString() : q
+    );
+  }
+  if (Array.isArray(spanQuery) && spanQuery.length) {
+    spanQueryParams = spanQuery.map(q =>
+      q instanceof MutableSearch ? q.formatString() : q
+    );
+  }
+
   return useApiQuery<EventsTimeSeriesResponse>(
     [
       `/organizations/${organization.slug}/events-timeseries/`,
@@ -153,11 +176,7 @@ export function useFetchEventsTimeSeries<YAxis extends string, Attribute extends
           project: selection.projects,
           environment: selection.environments,
           interval,
-          query: query
-            ? typeof query === 'string'
-              ? query
-              : query.formatString()
-            : undefined,
+          query: queryParam,
           sampling: sampling ?? DEFAULT_SAMPLING_MODE,
           topEvents,
           groupBy,
@@ -168,9 +187,9 @@ export function useFetchEventsTimeSeries<YAxis extends string, Attribute extends
               : '1'
             : undefined,
           caseInsensitive: caseInsensitive ? 1 : 0,
-          ...(Array.isArray(logQuery) && logQuery.length > 0 ? {logQuery} : {}),
-          ...(Array.isArray(metricQuery) && metricQuery.length > 0 ? {metricQuery} : {}),
-          ...(Array.isArray(spanQuery) && spanQuery.length > 0 ? {spanQuery} : {}),
+          logQuery: logQueryParams,
+          metricQuery: metricQueryParams,
+          spanQuery: spanQueryParams,
         },
       },
     ],
diff --git a/static/app/views/explore/hooks/useExploreTracesTable.tsx b/static/app/views/explore/hooks/useExploreTracesTable.tsx
@@ -2,7 +2,6 @@ import {useMemo} from 'react';
 
 import type {CaseInsensitive} from 'sentry/components/searchQueryBuilder/hooks';
 import {decodeScalar} from 'sentry/utils/queryString';
-import type {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useTraces} from 'sentry/views/explore/hooks/useTraces';
 
@@ -12,9 +11,9 @@ interface UseExploreTracesTableOptions {
   query: string;
   queryExtras?: {
     caseInsensitive?: CaseInsensitive;
-    logQuery?: Array<MutableSearch | string>;
-    metricQuery?: Array<MutableSearch | string>;
-    spanQuery?: Array<MutableSearch | string>;
+    logQuery?: string[];
+    metricQuery?: string[];
+    spanQuery?: string[];
   };
 }
 
diff --git a/static/app/views/explore/hooks/useProgressiveQuery.tsx b/static/app/views/explore/hooks/useProgressiveQuery.tsx
@@ -1,5 +1,4 @@
 import type {CaseInsensitive} from 'sentry/components/searchQueryBuilder/hooks';
-import type {MutableSearch} from 'sentry/utils/tokenizeSearch';
 
 export const SAMPLING_MODE = {
   NORMAL: 'NORMAL',
@@ -24,10 +23,10 @@ export type SamplingMode = (typeof SAMPLING_MODE)[keyof typeof SAMPLING_MODE];
 export type RPCQueryExtras = {
   caseInsensitive?: CaseInsensitive;
   disableAggregateExtrapolation?: string;
-  logQuery?: Array<MutableSearch | string>;
-  metricQuery?: Array<MutableSearch | string>;
+  logQuery?: string[];
+  metricQuery?: string[];
   samplingMode?: SamplingMode;
-  spanQuery?: Array<MutableSearch | string>;
+  spanQuery?: string[];
 };
 
 interface ProgressiveQueryOptions<TQueryFn extends (...args: any[]) => any> {
diff --git a/static/app/views/explore/hooks/useTraces.tsx b/static/app/views/explore/hooks/useTraces.tsx
@@ -9,7 +9,6 @@ import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import type {UseApiQueryOptions, UseApiQueryResult} from 'sentry/utils/queryClient';
 import {useApiQuery} from 'sentry/utils/queryClient';
 import type RequestError from 'sentry/utils/requestError/requestError';
-import type {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 
@@ -67,11 +66,11 @@ interface UseTracesOptions
   enabled?: boolean;
   keepPreviousData?: boolean;
   limit?: number;
-  logQuery?: Array<MutableSearch | string>;
-  metricQuery?: Array<MutableSearch | string>;
+  logQuery?: string[];
+  metricQuery?: string[];
   query?: string | string[];
   sort?: 'timestamp' | '-timestamp';
-  spanQuery?: Array<MutableSearch | string>;
+  spanQuery?: string[];
 }
 
 type UseTracesResult = Omit<UseApiQueryResult<TraceResults, RequestError>, 'error'> & {
diff --git a/static/app/views/insights/common/queries/useSortedTimeSeries.tsx b/static/app/views/insights/common/queries/useSortedTimeSeries.tsx
@@ -43,13 +43,13 @@ interface Options<Fields> {
   enabled?: boolean;
   fields?: string[];
   interval?: string;
-  logQuery?: Array<MutableSearch | string>;
-  metricQuery?: Array<MutableSearch | string>;
+  logQuery?: string[];
+  metricQuery?: string[];
   orderby?: string | string[];
   referrer?: string;
   samplingMode?: SamplingMode;
   search?: MutableSearch;
-  spanQuery?: Array<MutableSearch | string>;
+  spanQuery?: string[];
   topEvents?: number;
   yAxis?: Fields;
 }
diff --git a/static/app/views/insights/common/queries/useSpansQuery.tsx b/static/app/views/insights/common/queries/useSpansQuery.tsx
@@ -12,7 +12,6 @@ import {useGenericDiscoverQuery} from 'sentry/utils/discover/genericDiscoverQuer
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {intervalToMilliseconds} from 'sentry/utils/duration/intervalToMilliseconds';
 import {keepPreviousData as keepPreviousDataFn} from 'sentry/utils/queryClient';
-import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
@@ -131,12 +130,12 @@ type WrappedDiscoverTimeseriesQueryProps = {
   cursor?: string;
   enabled?: boolean;
   initialData?: any;
-  logQuery?: Array<MutableSearch | string>;
-  metricQuery?: Array<MutableSearch | string>;
+  logQuery?: string[];
+  metricQuery?: string[];
   overriddenRoute?: string;
   referrer?: string;
   samplingMode?: SamplingMode;
-  spanQuery?: Array<MutableSearch | string>;
+  spanQuery?: string[];
 };
 
 function useWrappedDiscoverTimeseriesQueryBase<T>({
@@ -252,13 +251,13 @@ type WrappedDiscoverQueryProps<T> = {
   initialData?: T;
   keepPreviousData?: boolean;
   limit?: number;
-  logQuery?: Array<MutableSearch | string>;
-  metricQuery?: Array<MutableSearch | string>;
+  logQuery?: string[];
+  metricQuery?: string[];
   noPagination?: boolean;
   referrer?: string;
   refetchInterval?: number;
   samplingMode?: SamplingMode;
-  spanQuery?: Array<MutableSearch | string>;
+  spanQuery?: string[];
 };
 
 function useWrappedDiscoverQueryBase<T>({
@@ -306,21 +305,15 @@ function useWrappedDiscoverQueryBase<T>({
   }
 
   if (Array.isArray(logQuery) && logQuery.length > 0) {
-    queryExtras.logQuery = logQuery.map(query =>
-      query instanceof MutableSearch ? query.formatString() : query
-    );
+    queryExtras.logQuery = logQuery;
   }
 
   if (Array.isArray(metricQuery) && metricQuery.length > 0) {
-    queryExtras.metricQuery = metricQuery.map(query =>
-      query instanceof MutableSearch ? query.formatString() : query
-    );
+    queryExtras.metricQuery = metricQuery;
   }
 
   if (Array.isArray(spanQuery) && spanQuery.length > 0) {
-    queryExtras.spanQuery = spanQuery.map(query =>
-      query instanceof MutableSearch ? query.formatString() : query
-    );
+    queryExtras.spanQuery = spanQuery;
   }
 
   if (allowAggregateConditions !== undefined) {
