Optimize analytics overview queries

apps/web/src/app/(authenticated)/analytics/Analytics.tsx

@@ -25,9 +25,8 @@ import {
   parseTimePeriodParam,
 } from '@/types';
 import {
-  useAnalyticsChart,
   useAnalyticsDetails,
-  useAnalyticsFilters,
+  useAnalyticsOverview,
   usePullRequestAnalyticsOverview,
 } from '@/hooks/analytics';
 import { useDelayedRefetchLoading } from '@/hooks/useDelayedRefetchLoading';
@@ -128,7 +127,7 @@ export function Analytics({
   const availableGranularities = getAvailableAnalyticsGranularities(timePeriod);
   const analyticsReloadKey = String(reloadRequestId);
 
-  const chartQuery = useAnalyticsChart(
+  const overviewQuery = useAnalyticsOverview(
     {
       object,
       viewBy,
@@ -139,14 +138,6 @@ export function Analytics({
     },
     { enabled: object !== 'pullRequests' },
   );
-  const filtersQuery = useAnalyticsFilters(
-    {
-      object,
-      filters,
-      timePeriod,
-    },
-    { enabled: object !== 'pullRequests' },
-  );
   const pullRequestOverviewQuery = usePullRequestAnalyticsOverview(
     {
       viewBy,
@@ -176,13 +167,13 @@ export function Analytics({
   const chart =
     object === 'pullRequests'
       ? pullRequestOverviewQuery.data?.chart
-      : chartQuery.data;
+      : overviewQuery.data?.chart;
   const filterOptions =
     object === 'pullRequests'
       ? (pullRequestOverviewQuery.data?.filterOptions.filters ?? {})
-      : (filtersQuery.data?.filters ?? {});
+      : (overviewQuery.data?.filterOptions.filters ?? {});
   const activeChartQuery =
-    object === 'pullRequests' ? pullRequestOverviewQuery : chartQuery;
+    object === 'pullRequests' ? pullRequestOverviewQuery : overviewQuery;
   const showChartReloadLoading = useDelayedRefetchLoading({
     loadingKey: analyticsReloadKey,
     isFetching: isParamsTransitionPending || activeChartQuery.isFetching,

apps/web/src/hooks/analytics/index.ts

@@ -1,5 +1,3 @@
-export { useAnalyticsChart } from './useAnalyticsChart';
-export { useAnalyticsFilters } from './useAnalyticsFilters';
-
 export { useAnalyticsDetails } from './useAnalyticsDetails';
+export { useAnalyticsOverview } from './useAnalyticsOverview';
 export { usePullRequestAnalyticsOverview } from './usePullRequestAnalyticsOverview';

apps/web/src/hooks/analytics/useAnalyticsChart.ts → apps/web/src/hooks/analytics/useAnalyticsOverview.ts

@@ -12,7 +12,7 @@ import type {
 } from '@/types';
 import { useTRPC } from '@/trpc/client';
 
-export function useAnalyticsChart(
+export function useAnalyticsOverview(
   input: {
     object: AnalyticsObject;
     viewBy: AnalyticsDimension;
@@ -28,7 +28,7 @@ export function useAnalyticsChart(
   const trpc = useTRPC();
 
   return useQuery(
-    trpc.analytics.chart.queryOptions(input, {
+    trpc.analytics.overview.queryOptions(input, {
       placeholderData: keepPreviousData,
       enabled: options?.enabled,
     }),