Skip to content

chore: refactor audit page to use window function for count #5133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Nov 21, 2022
Merged

chore: refactor audit page to use window function for count #5133

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
00342fb
Move count query to window function
presleyp Nov 15, 2022
31e8ae5
Unpack count and update types
presleyp Nov 15, 2022
2363361
Remove count endpoint
presleyp Nov 15, 2022
7363a70
Update tests, wip
presleyp Nov 16, 2022
04efd25
Fix tests
presleyp Nov 16, 2022
b40a80e
Update frontend, wip
presleyp Nov 16, 2022
1650803
Merge branch 'main' into window-audit/presleyp
presleyp Nov 16, 2022
fb46f46
Remove space
presleyp Nov 16, 2022
82d62c7
Fix frontend test
presleyp Nov 17, 2022
1797b58
Merge branch 'main' into window-audit/presleyp
presleyp Nov 17, 2022
0757395
Don't hang on error
presleyp Nov 18, 2022
eec1a61
Handle no results
presleyp Nov 18, 2022
0752245
Don't omit count
presleyp Nov 18, 2022
67d3944
Merge branch 'main' into window-audit/presleyp
presleyp Nov 18, 2022
8769f62
Fix frontend tests
presleyp Nov 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix frontend test
  • Loading branch information
@presleyp
presleyp committed Nov 17, 2022
commit 82d62c7ff70b3e2d65894cf2eba37c60ea1e2a4b
4 changes: 3 additions & 1 deletion site/src/pages/AuditPage/AuditPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ describe("AuditPage", () => {
render(<AuditPage />)

await waitForLoaderToBeRemoved()
getAuditLogsSpy.mockReset()
getAuditLogsSpy
.mockReset()
.mockResolvedValue({ audit_logs: [MockAuditLog], count: 1 })

const filterField = screen.getByLabelText("Filter")
const query = "resource_type:workspace action:create"
Expand Down
2 changes: 1 addition & 1 deletion site/src/testHelpers/handlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ export const handlers = [
ctx.status(200),
ctx.json({
audit_logs: [M.MockAuditLog, M.MockAuditLog2],
count: 2
count: 2,
}),
)
}),
Expand Down