Move queries to queries folder

coder · BrunoQuaresma · Oct 3, 2023 · Oct 2, 2023 · Oct 2, 2023 · Oct 2, 2023
commit 53c282d032df26d0eeb1765d5bd8a920bfefb0b8
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -1471,25 +1471,31 @@ export const getWorkspaceParameters = async (workspace: TypesGen.Workspace) => {
   };
 };
 
-type InsightsFilter = {
+export type InsightsParams = {
   start_time: string;
   end_time: string;
   template_ids: string;
 };
 
 export const getInsightsUserLatency = async (
-  filters: InsightsFilter,
+  filters: InsightsParams,
 ): Promise<TypesGen.UserLatencyInsightsResponse> => {
   const params = new URLSearchParams(filters);
   const response = await axios.get(`/api/v2/insights/user-latency?${params}`);
   return response.data;
 };
 
+export type InsightsTemplateParams = InsightsParams & {
+  interval: "day" | "week";
+};
+
 export const getInsightsTemplate = async (
-  filters: InsightsFilter & { interval: "day" | "week" },
+  params: InsightsTemplateParams,
 ): Promise<TypesGen.TemplateInsightsResponse> => {
-  const params = new URLSearchParams(filters);
-  const response = await axios.get(`/api/v2/insights/templates?${params}`);
+  const searchParams = new URLSearchParams(params);
+  const response = await axios.get(
+    `/api/v2/insights/templates?${searchParams}`,
+  );
   return response.data;
 };
 

diff --git a/site/src/api/queries/insights.ts b/site/src/api/queries/insights.ts
@@ -0,0 +1,15 @@
+import * as API from "api/api";
+
+export const insightsTemplate = (params: API.InsightsTemplateParams) => {
+  return {
+    queryKey: ["insights", "templates", params.template_ids, params],
+    queryFn: () => API.getInsightsTemplate(params),
+  };
+};
+
+export const insightsUserLatency = (params: API.InsightsParams) => {
+  return {
+    queryKey: ["insights", "userLatency", params.template_ids, params],
+    queryFn: () => API.getInsightsUserLatency(params),
+  };
+};
diff --git a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
@@ -3,7 +3,6 @@ import Box from "@mui/material/Box";
 import { styled, useTheme } from "@mui/material/styles";
 import { BoxProps } from "@mui/system";
 import { useQuery } from "@tanstack/react-query";
-import { getInsightsTemplate, getInsightsUserLatency } from "api/api";
 import {
   ActiveUsersTitle,
   ActiveUserChart,
@@ -48,6 +47,7 @@ import Tooltip from "@mui/material/Tooltip";
 import LinkOutlined from "@mui/icons-material/LinkOutlined";
 import { InsightsInterval, IntervalMenu } from "./IntervalMenu";
 import { WeeklyPreset, WeeklyPresetsMenu } from "./WeeklyPresetsMenu";
+import { insightsTemplate, insightsUserLatency } from "api/queries/insights";
 
 export default function TemplateInsightsPage() {
   const { template } = useTemplateLayoutContext();
@@ -77,14 +77,8 @@ export default function TemplateInsightsPage() {
     ...getDateRangeFilter(dateRange),
   };
   const insightsFilter = { ...commonFilters, interval };
-  const { data: templateInsights } = useQuery({
-    queryKey: ["templates", template.id, "usage", insightsFilter],
-    queryFn: () => getInsightsTemplate(insightsFilter),
-  });
-  const { data: userLatency } = useQuery({
-    queryKey: ["templates", template.id, "user-latency", commonFilters],
-    queryFn: () => getInsightsUserLatency(commonFilters),
-  });
+  const { data: templateInsights } = useQuery(insightsTemplate(insightsFilter));
+  const { data: userLatency } = useQuery(insightsUserLatency(commonFilters));
 
   return (
     <>