Fix types

BrunoQuaresma · BrunoQuaresma · commit cfe9d7d1c117 · 2022-09-07T16:50:56.000Z
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -394,12 +394,14 @@ interface GetAuditLogsOptions {
   offset: number
 }
 
-export const getAuditLogs = async (options: GetAuditLogsOptions): Promise<TypesGen.AuditLog[]> => {
+export const getAuditLogs = async (
+  options: GetAuditLogsOptions,
+): Promise<TypesGen.AuditLogResponse> => {
   const response = await axios.get(`/api/v2/audit?limit=${options.limit}&offset=${options.offset}`)
   return response.data
 }
 
-export const getAuditLogsCount = async (): Promise<number> => {
+export const getAuditLogsCount = async (): Promise<TypesGen.AuditLogCountResponse> => {
   const response = await axios.get(`/api/v2/audit/count`)
   return response.data
 }
diff --git a/site/src/xServices/audit/auditXService.ts b/site/src/xServices/audit/auditXService.ts
@@ -1,18 +1,17 @@
 import { getAuditLogs, getAuditLogsCount } from "api/api"
 import { getErrorMessage } from "api/errors"
+import { AuditLog } from "api/typesGenerated"
 import { displayError } from "components/GlobalSnackbar/utils"
 import { assign, createMachine } from "xstate"
 
-type AuditLogs = Awaited<ReturnType<typeof getAuditLogs>>
-
 export const auditMachine = createMachine(
   {
     id: "auditMachine",
     schema: {
-      context: {} as { auditLogs?: AuditLogs; count?: number; page: number; limit: number },
+      context: {} as { auditLogs?: AuditLog[]; count?: number; page: number; limit: number },
       services: {} as {
         loadAuditLogs: {
-          data: AuditLogs
+          data: AuditLog[]
         }
         loadAuditLogsCount: {
           data: number
@@ -111,8 +110,8 @@ export const auditMachine = createMachine(
           // The page in the API starts at 0
           offset: (page - 1) * limit,
           limit,
-        }),
-      loadAuditLogsCount: () => getAuditLogsCount(),
+        }).then((data) => data.audit_logs),
+      loadAuditLogsCount: () => getAuditLogsCount().then((data) => data.count),
     },
   },
 )

Original file line number	Diff line number	Diff line change
`@@ -394,12 +394,14 @@ interface GetAuditLogsOptions {`
`394`	`394`	`offset: number`
`395`	`395`	`}`
`396`	`396`
`397`		`-export const getAuditLogs = async (options: GetAuditLogsOptions): Promise<TypesGen.AuditLog[]> => {`
	`397`	`+export const getAuditLogs = async (`
	`398`	`+ options: GetAuditLogsOptions,`
	`399`	`+): Promise<TypesGen.AuditLogResponse> => {`
`398`	`400`	const response = await axios.get(`/api/v2/audit?limit=${options.limit}&offset=${options.offset}`)
`399`	`401`	`return response.data`
`400`	`402`	`}`
`401`	`403`
`402`		`-export const getAuditLogsCount = async (): Promise<number> => {`
	`404`	`+export const getAuditLogsCount = async (): Promise<TypesGen.AuditLogCountResponse> => {`
`403`	`405`	const response = await axios.get(`/api/v2/audit/count`)
`404`	`406`	`return response.data`
`405`	`407`	`}`