Update frontend, wip

presleyp · presleyp · commit b40a80ea1f54 · 2022-11-16T16:25:15.000Z
diff --git a/codersdk/audit.go b/codersdk/audit.go
@@ -113,7 +113,7 @@ type AuditLogsRequest struct {
 
 type AuditLogResponse struct {
 	AuditLogs []AuditLog `json:"audit_logs"`
-	Count     int64      `json:"q, omitempty"`
+	Count     int64      `json:"count, omitempty"`
 }
 
 type CreateTestAuditLogRequest struct {
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -554,14 +554,6 @@ export const getAuditLogs = async (
   return response.data
 }
 
-export const getAuditLogsCount = async (
-  options: TypesGen.AuditLogCountRequest = {},
-): Promise<TypesGen.AuditLogCountResponse> => {
-  const url = getURLWithSearchParams("/api/v2/audit/count", options)
-  const response = await axios.get(url)
-  return response.data
-}
-
 export const getTemplateDAUs = async (
   templateId: string,
 ): Promise<TypesGen.TemplateDAUsResponse> => {
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -73,7 +73,7 @@ export interface AuditLog {
 // From codersdk/audit.go
 export interface AuditLogResponse {
   readonly audit_logs: AuditLog[]
-  readonly q: number
+  readonly count: number
 }
 
 // From codersdk/audit.go
diff --git a/site/src/pages/AuditPage/AuditPage.test.tsx b/site/src/pages/AuditPage/AuditPage.test.tsx
@@ -31,7 +31,7 @@ describe("AuditPage", () => {
     it("filters by typing", async () => {
       const getAuditLogsSpy = jest
         .spyOn(API, "getAuditLogs")
-        .mockResolvedValue({ audit_logs: [MockAuditLog] })
+        .mockResolvedValue({ audit_logs: [MockAuditLog], count: 1 })
 
       render(<AuditPage />)
       await waitForLoaderToBeRemoved()
@@ -55,7 +55,7 @@ describe("AuditPage", () => {
     it("filters by URL", async () => {
       const getAuditLogsSpy = jest
         .spyOn(API, "getAuditLogs")
-        .mockResolvedValue({ audit_logs: [MockAuditLog] })
+        .mockResolvedValue({ audit_logs: [MockAuditLog], count: 1 })
 
       const query = "resource_type:workspace action:create"
       history.push(`/audit?filter=${encodeURIComponent(query)}`)
@@ -69,7 +69,7 @@ describe("AuditPage", () => {
     it("resets page to 1 when filter is changed", async () => {
       const getAuditLogsSpy = jest
         .spyOn(API, "getAuditLogs")
-        .mockResolvedValue({ audit_logs: [MockAuditLog] })
+        .mockResolvedValue({ audit_logs: [MockAuditLog], count: 1 })
 
       history.push(`/audit?page=2`)
       render(<AuditPage />)
diff --git a/site/src/testHelpers/handlers.ts b/site/src/testHelpers/handlers.ts
@@ -213,14 +213,11 @@ export const handlers = [
       ctx.status(200),
       ctx.json({
         audit_logs: [M.MockAuditLog, M.MockAuditLog2],
+        count: 2
       }),
     )
   }),
 
-  rest.get("/api/v2/audit/count", (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json({ count: 1000 }))
-  }),
-
   // Applications host
   rest.get("/api/v2/applications/host", (req, res, ctx) => {
     return res(ctx.status(200), ctx.json({ host: "*.dev.coder.com" }))
diff --git a/site/src/xServices/audit/auditXService.ts b/site/src/xServices/audit/auditXService.ts
@@ -1,6 +1,6 @@
-import { getAuditLogs, getAuditLogsCount } from "api/api"
+import { getAuditLogs } from "api/api"
 import { getErrorMessage } from "api/errors"
-import { AuditLog } from "api/typesGenerated"
+import { AuditLog, AuditLogResponse } from "api/typesGenerated"
 import { displayError } from "components/GlobalSnackbar/utils"
 import { getPaginationData } from "components/PaginationWidget/utils"
 import {
@@ -29,10 +29,7 @@ export const auditMachine = createMachine(
       context: {} as AuditContext,
       services: {} as {
         loadAuditLogsAndCount: {
-          data: {
-            auditLogs: AuditLog[]
-            count: number
-          }
+          data: AuditLogResponse
         }
       },
       events: {} as
@@ -91,7 +88,7 @@ export const auditMachine = createMachine(
         auditLogs: (_) => undefined,
       }),
       assignAuditLogsAndCount: assign({
-        auditLogs: (_, event) => event.data.auditLogs,
+        auditLogs: (_, event) => event.data.audit_logs,
         count: (_, event) => event.data.count,
       }),
       assignPaginationRef: assign({
@@ -117,21 +114,11 @@ export const auditMachine = createMachine(
       loadAuditLogsAndCount: async (context) => {
         if (context.paginationRef) {
           const { offset, limit } = getPaginationData(context.paginationRef)
-          const [auditLogs, count] = await Promise.all([
-            getAuditLogs({
-              offset,
-              limit,
-              q: context.filter,
-            }).then((data) => data.audit_logs),
-            getAuditLogsCount({
-              q: context.filter,
-            }).then((data) => data.count),
-          ])
-
-          return {
-            auditLogs,
-            count,
-          }
+          return getAuditLogs({
+            offset,
+            limit,
+            q: context.filter,
+          })
         } else {
           throw new Error("Cannot get audit logs without pagination data")
         }

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ type AuditLogsRequest struct {`
`113`	`113`
`114`	`114`	`type AuditLogResponse struct {`
`115`	`115`	AuditLogs []AuditLog `json:"audit_logs"`
`116`		- Count int64 `json:"q, omitempty"`
	`116`	+ Count int64 `json:"count, omitempty"`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`type CreateTestAuditLogRequest struct {`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ export interface AuditLog {`
`73`	`73`	`// From codersdk/audit.go`
`74`	`74`	`export interface AuditLogResponse {`
`75`	`75`	`readonly audit_logs: AuditLog[]`
`76`		`- readonly q: number`
	`76`	`+ readonly count: number`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`// From codersdk/audit.go`