Fix FE to use singulare DAUsResponse

coder · Emyrk · May 30, 2023 · May 23, 2023 · May 23, 2023 · May 23, 2023
commit bf1bd47ea2fdfd639a02d5ebb68ee5322586f930
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -826,13 +826,13 @@ export const getAuditLogs = async (
 
 export const getTemplateDAUs = async (
   templateId: string,
-): Promise<TypesGen.TemplateDAUsResponse> => {
+): Promise<TypesGen.DAUsResponse> => {
   const response = await axios.get(`/api/v2/templates/${templateId}/daus`)
   return response.data
 }
 
 export const getDeploymentDAUs =
-  async (): Promise<TypesGen.DeploymentDAUsResponse> => {
+  async (): Promise<TypesGen.DAUsResponse> => {
     const response = await axios.get(`/api/v2/insights/daus`)
     return response.data
   }

diff --git a/site/src/components/DAUChart/DAUChart.tsx b/site/src/components/DAUChart/DAUChart.tsx
@@ -38,7 +38,7 @@ ChartJS.register(
 )
 
 export interface DAUChartProps {
-  daus: TypesGen.TemplateDAUsResponse | TypesGen.DeploymentDAUsResponse
+  daus: TypesGen.DAUsResponse
 }
 export const Language = {
   loadingText: "DAU stats are loading. Check back later.",

diff --git a/site/src/components/DeploySettingsLayout/DeploySettingsLayout.tsx b/site/src/components/DeploySettingsLayout/DeploySettingsLayout.tsx
@@ -5,7 +5,7 @@ import { Sidebar } from "./Sidebar"
 import { createContext, Suspense, useContext, FC } from "react"
 import { useMachine } from "@xstate/react"
 import { Loader } from "components/Loader/Loader"
-import { DeploymentDAUsResponse } from "api/typesGenerated"
+import { DAUsResponse } from "api/typesGenerated"
 import { deploymentConfigMachine } from "xServices/deploymentConfig/deploymentConfigMachine"
 import { RequirePermission } from "components/RequirePermission/RequirePermission"
 import { usePermissions } from "hooks/usePermissions"
@@ -15,7 +15,7 @@ import { DeploymentConfig } from "api/types"
 type DeploySettingsContextValue = {
   deploymentValues: DeploymentConfig
   getDeploymentValuesError: unknown
-  deploymentDAUs?: DeploymentDAUsResponse
+  deploymentDAUs?: DAUsResponse
   getDeploymentDAUsError: unknown
 }
 

diff --git a/site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPageView.tsx b/site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPageView.tsx
@@ -1,5 +1,5 @@
 import { DeploymentOption } from "api/types"
-import { DeploymentDAUsResponse } from "api/typesGenerated"
+import { DAUsResponse } from "api/typesGenerated"
 import { ErrorAlert } from "components/Alert/ErrorAlert"
 import { DAUChart } from "components/DAUChart/DAUChart"
 import { Header } from "components/DeploySettingsLayout/Header"
@@ -9,7 +9,7 @@ import { useDeploymentOptions } from "utils/deployOptions"
 
 export type GeneralSettingsPageViewProps = {
   deploymentOptions: DeploymentOption[]
-  deploymentDAUs?: DeploymentDAUsResponse
+  deploymentDAUs?: DAUsResponse
   getDeploymentDAUsError: unknown
 }
 export const GeneralSettingsPageView = ({

diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -16,14 +16,16 @@ export const MockOrganization: TypesGen.Organization = {
   updated_at: "",
 }
 
-export const MockTemplateDAUResponse: TypesGen.TemplateDAUsResponse = {
+export const MockTemplateDAUResponse: TypesGen.DAUsResponse = {
+  tz_hour_offset: 0,
   entries: [
     { date: "2022-08-27T00:00:00Z", amount: 1 },
     { date: "2022-08-29T00:00:00Z", amount: 2 },
     { date: "2022-08-30T00:00:00Z", amount: 1 },
   ],
 }
-export const MockDeploymentDAUResponse: TypesGen.DeploymentDAUsResponse = {
+export const MockDeploymentDAUResponse: TypesGen.DAUsResponse = {
+  tz_hour_offset: 0,
   entries: [
     { date: "2022-08-27T00:00:00Z", amount: 1 },
     { date: "2022-08-29T00:00:00Z", amount: 2 },

diff --git a/site/src/xServices/deploymentConfig/deploymentConfigMachine.ts b/site/src/xServices/deploymentConfig/deploymentConfigMachine.ts
@@ -1,4 +1,4 @@
-import { DeploymentDAUsResponse } from "./../../api/typesGenerated"
+import { DAUsResponse } from "./../../api/typesGenerated"
 import { getDeploymentValues, getDeploymentDAUs } from "api/api"
 import { createMachine, assign } from "xstate"
 import { DeploymentConfig } from "api/types"
@@ -12,7 +12,7 @@ export const deploymentConfigMachine = createMachine(
       context: {} as {
         deploymentValues?: DeploymentConfig
         getDeploymentValuesError?: unknown
-        deploymentDAUs?: DeploymentDAUsResponse
+        deploymentDAUs?: DAUsResponse
         getDeploymentDAUsError?: unknown
       },
       events: {} as { type: "LOAD" },
@@ -21,7 +21,7 @@ export const deploymentConfigMachine = createMachine(
           data: DeploymentConfig
         }
         getDeploymentDAUs: {
-          data: DeploymentDAUsResponse
+          data: DAUsResponse
         }
       },
     },