Skip to content

feat: condition Audit log on licensing #3685

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 21 commits into from
Aug 25, 2022
Merged

feat: condition Audit log on licensing #3685

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
aced91f
Update XService
presleyp Aug 24, 2022
49f5652
Add simple wrapper
presleyp Aug 24, 2022
a641881
Add selector
presleyp Aug 24, 2022
4e79b2d
Condition page
presleyp Aug 24, 2022
6dfe4df
Condition link
presleyp Aug 24, 2022
17d8d1b
Format and lint
presleyp Aug 24, 2022
8fdc834
Integration test
presleyp Aug 24, 2022
3627ef3
Add username to api call
presleyp Aug 24, 2022
8b88265
Format
presleyp Aug 24, 2022
4fea785
Format
presleyp Aug 24, 2022
733954b
Fix link name
presleyp Aug 25, 2022
fc237a0
Upgrade xstate/react to fix crashing tests
presleyp Aug 25, 2022
cb20ccd
Fix tests
presleyp Aug 25, 2022
75f7f6e
Format
presleyp Aug 25, 2022
2e94269
Abstract strings
presleyp Aug 25, 2022
3c54e1e
Debug test
presleyp Aug 25, 2022
4d40c30
Increase timeout
presleyp Aug 25, 2022
a26786e
Add comments and try shorter timeout
presleyp Aug 25, 2022
a7d836b
Use PropsWithChildren
presleyp Aug 25, 2022
4f975b8
Undo PropsWithChildren, try lower timeout
presleyp Aug 25, 2022
9505faa
Format, lower timeout
presleyp Aug 25, 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
Add comments and try shorter timeout
  • Loading branch information
@presleyp
presleyp committed Aug 25, 2022
commit a26786ed727f49f5beb11fe1221d54f9e0db5b0c
38 changes: 26 additions & 12 deletions site/src/components/Navbar/Navbar.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,41 +15,55 @@ import { server } from "testHelpers/server"
*/
describe("Navbar", () => {
it("shows Audit Log link when permitted and entitled", async () => {
// set entitlements to allow audit log
server.use(
rest.get("/api/v2/entitlements", (req, res, ctx) => {
return res(ctx.status(200), ctx.json(MockEntitlementsWithAuditLog))
}),
)
render(<App />)
await waitFor(() => {
const link = screen.getByText(Language.users) // TODO change after debugging
expect(link).toBeDefined()
}, { timeout: 10000 })
await waitFor(
() => {
const link = screen.getByText(Language.audit)
expect(link).toBeDefined()
},
{ timeout: 5000 },
)
})

it("does not show Audit Log link when not entitled", async () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reading this code, how does one know Audit Log link is not entitled? Is it due to the lack of the mocked request or something?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the default handler in handlers.ts returns empty license data, as if you're an OSS user.

// by default, user is an Admin with permission to see the audit log,
// but is unlicensed so not entitled to see the audit log
render(<App />)
await waitFor(() => {
const link = screen.queryByText(Language.audit)
expect(link).toBe(null)
})
await waitFor(
() => {
const link = screen.queryByText(Language.audit)
expect(link).toBe(null)
},
{ timeout: 5000 },
)
})

it("does not show Audit Log link when not permitted via role", async () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same with this test. How does one know that a member is not permitted? I see MockMemberPermissions but hard to tell from code what role is being given or why they don't have permission.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Member role does not have auditing permissions.

// set permissions to Member (can't audit)
server.use(
rest.post(`/api/v2/users/${MockUser.id}/authorization`, async (req, res, ctx) => {
return res(ctx.status(200), ctx.json(MockMemberPermissions))
}),
)
// set entitlements to allow audit log
server.use(
rest.get("/api/v2/entitlements", (req, res, ctx) => {
return res(ctx.status(200), ctx.json(MockEntitlementsWithAuditLog))
}),
)
render(<App />)
await waitFor(() => {
const link = screen.queryByText(Language.audit)
expect(link).toBe(null)
})
await waitFor(
() => {
const link = screen.queryByText(Language.audit)
expect(link).toBe(null)
},
{ timeout: 5000 },
)
})
})