fix(apiOptions): prevent empty options from being included in queryKey

Author: TkDodo

static/app/utils/api/apiOptions.spec.tsx

@@ -40,6 +40,20 @@ describe('apiOptions', () => {
     ]);
   });
 
+  it('should not include options in queryKey when all values are undefined', () => {
+    const options = apiOptions.as<unknown>()('/api-tokens/$tokenId/', {
+      staleTime: 0,
+      path: {tokenId: '123'},
+      query: undefined,
+      method: undefined,
+    });
+
+    expect(options.queryKey).toEqual([
+      {infinite: false, version: 'v2'},
+      '/api-tokens/123/',
+    ]);
+  });
+
   it('should stringify number path params', () => {
     const options = apiOptions.as<unknown>()('/api-tokens/$tokenId/', {
       staleTime: 0,

static/app/utils/api/apiOptions.ts

@@ -16,13 +16,17 @@ import {parseLinkHeader} from 'sentry/utils/parseLinkHeader';
 
 type KnownApiUrls = KnownGetsentryApiUrls | KnownSentryApiUrls;
 
-type Options = QueryKeyEndpointOptions & {staleTime: number};
+type Options = QueryKeyEndpointOptions & {staleTime: number | 'static'};
 
 type PathParamOptions<TApiPath extends string> =
   ExtractPathParams<TApiPath> extends never
     ? {path?: never}
     : {path: Record<ExtractPathParams<TApiPath>, string | number> | SkipToken};
 
+function hasDefinedValues(obj: Record<string, unknown>): boolean {
+  return Object.values(obj).some(v => v !== undefined);
+}
+
 const selectJson = <TData>(data: ApiResponse<TData>) => data.json;
 
 export const selectJsonWithHeaders = <TData>(
@@ -45,10 +49,9 @@ function _apiOptions<
   const url = getApiUrl(path, ...([{path: pathParams}] as OptionalPathParams<TApiPath>));
 
   return queryOptions({
-    queryKey:
-      Object.keys(options).length > 0
-        ? ([{infinite: false, version: 'v2'}, url, options] as ApiQueryKey)
-        : ([{infinite: false, version: 'v2'}, url] as ApiQueryKey),
+    queryKey: hasDefinedValues(options)
+      ? ([{infinite: false, version: 'v2'}, url, options] as ApiQueryKey)
+      : ([{infinite: false, version: 'v2'}, url] as ApiQueryKey),
     queryFn: pathParams === skipToken ? skipToken : apiFetch<TActualData>,
     enabled: pathParams !== skipToken,
     staleTime,
@@ -79,10 +82,9 @@ function _apiOptionsInfinite<
   const url = getApiUrl(path, ...([{path: pathParams}] as OptionalPathParams<TApiPath>));
 
   return infiniteQueryOptions({
-    queryKey:
-      Object.keys(options).length > 0
-        ? ([{infinite: true, version: 'v2'}, url, options] as InfiniteApiQueryKey)
-        : ([{infinite: true, version: 'v2'}, url] as InfiniteApiQueryKey),
+    queryKey: hasDefinedValues(options)
+      ? ([{infinite: true, version: 'v2'}, url, options] as InfiniteApiQueryKey)
+      : ([{infinite: true, version: 'v2'}, url] as InfiniteApiQueryKey),
     queryFn: pathParams === skipToken ? skipToken : apiFetchInfinite<TActualData>,
     getPreviousPageParam: parsePageParam('previous'),
     getNextPageParam: parsePageParam('next'),