Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,24 @@ import type { RBACPolicy } from "@/server/Network/types/rbacPolicy"
interface RBACPolicyRowProps {
policy: RBACPolicy
onDelete: () => void
canDelete: boolean
}

export function RBACPolicyRow({ policy, onDelete }: RBACPolicyRowProps) {
export function RBACPolicyRow({ policy, onDelete, canDelete }: RBACPolicyRowProps) {
const { t } = useLingui()

return (
<DataGridRow>
<DataGridCell>{policy.target_tenant}</DataGridCell>
<DataGridCell>{policy.action}</DataGridCell>
<DataGridCell onClick={(e) => e.stopPropagation()} className="items-end justify-end pr-0">
<PopupMenu>
<PopupMenuOptions>
<PopupMenuItem label={t`Remove`} onClick={onDelete} />
</PopupMenuOptions>
</PopupMenu>
{canDelete && (
<PopupMenu>
<PopupMenuOptions>
<PopupMenuItem label={t`Remove`} onClick={onDelete} />
</PopupMenuOptions>
</PopupMenu>
)}
</DataGridCell>
</DataGridRow>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ import type { SecurityGroup } from "@/server/Network/types/securityGroup"
interface SecurityGroupBasicInfoProps {
securityGroup: SecurityGroup
onEdit?: () => void
isReadOnly?: boolean
canUpdate: boolean
}

export function SecurityGroupBasicInfo({ securityGroup, onEdit, isReadOnly = false }: SecurityGroupBasicInfoProps) {
export function SecurityGroupBasicInfo({ securityGroup, onEdit, canUpdate }: SecurityGroupBasicInfoProps) {
const { t } = useLingui()

const BooleanValue = ({ value }: { value: boolean | undefined }) => <span>{value ? t`Yes` : t`No`}</span>

return (
<div>
<div className="mb-4 flex flex-row-reverse">
{onEdit && !isReadOnly && (
<Button variant="primary" onClick={onEdit} disabled={isReadOnly}>
{onEdit && canUpdate && (
<Button variant="primary" onClick={onEdit} disabled={!canUpdate}>
<Trans>Edit</Trans>
</Button>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ describe("SecurityGroupRBACPolicies", () => {
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

Expand All @@ -217,7 +217,7 @@ describe("SecurityGroupRBACPolicies", () => {
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

Expand All @@ -231,7 +231,7 @@ describe("SecurityGroupRBACPolicies", () => {
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

Expand All @@ -245,7 +245,7 @@ describe("SecurityGroupRBACPolicies", () => {
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

Expand All @@ -263,7 +263,7 @@ describe("SecurityGroupRBACPolicies", () => {
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

Expand All @@ -279,26 +279,12 @@ describe("SecurityGroupRBACPolicies", () => {
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

expect(screen.getByRole("button", { name: /Share Security Group/i })).toBeInTheDocument()
})

it("displays correct count in toolbar", () => {
vi.mocked(trpcReact.network.rbacPolicy.list.useQuery).mockReturnValue(
createMockQueryResult<RBACPolicy[]>({
data: mockPolicies,
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
wrapper: createWrapper(),
})

expect(screen.getByText(/3.*projects/i)).toBeInTheDocument()
})
})

describe("Search functionality", () => {
Expand All @@ -309,11 +295,11 @@ describe("SecurityGroupRBACPolicies", () => {
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

expect(screen.getByPlaceholderText("Search...")).toBeInTheDocument()
expect(screen.getByPlaceholderText("Search policies...")).toBeInTheDocument()
})

it("filters policies by target tenant", async () => {
Expand All @@ -323,14 +309,17 @@ describe("SecurityGroupRBACPolicies", () => {
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

const searchInput = screen.getByPlaceholderText("Search...")
const searchInput = screen.getByPlaceholderText("Search policies...")
const user = userEvent.setup()
await user.type(searchInput, "abc")

// Wait for debounce (500ms)
await new Promise((resolve) => setTimeout(resolve, 600))

await waitFor(() => {
expect(screen.getByTestId("rbac-policy-row-policy-1")).toBeInTheDocument()
expect(screen.queryByTestId("rbac-policy-row-policy-2")).not.toBeInTheDocument()
Expand All @@ -345,14 +334,17 @@ describe("SecurityGroupRBACPolicies", () => {
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

const searchInput = screen.getByPlaceholderText("Search...")
const searchInput = screen.getByPlaceholderText("Search policies...")
const user = userEvent.setup()
await user.type(searchInput, "external")

// Wait for debounce (500ms)
await new Promise((resolve) => setTimeout(resolve, 600))

await waitFor(() => {
expect(screen.getByTestId("rbac-policy-row-policy-2")).toBeInTheDocument()
expect(screen.queryByTestId("rbac-policy-row-policy-1")).not.toBeInTheDocument()
Expand All @@ -367,14 +359,17 @@ describe("SecurityGroupRBACPolicies", () => {
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

const searchInput = screen.getByPlaceholderText("Search...")
const searchInput = screen.getByPlaceholderText("Search policies...")
const user = userEvent.setup()
await user.type(searchInput, "nonexistent")

// Wait for debounce (500ms)
await new Promise((resolve) => setTimeout(resolve, 600))

await waitFor(() => {
expect(screen.getByText("No policies match your search")).toBeInTheDocument()
})
Expand All @@ -387,36 +382,19 @@ describe("SecurityGroupRBACPolicies", () => {
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

const searchInput = screen.getByPlaceholderText("Search...")
const searchInput = screen.getByPlaceholderText("Search policies...")
const user = userEvent.setup()
await user.type(searchInput, "PROJECT-ABC")

await waitFor(() => {
expect(screen.getByTestId("rbac-policy-row-policy-1")).toBeInTheDocument()
})
})

it("updates filtered count in toolbar", async () => {
vi.mocked(trpcReact.network.rbacPolicy.list.useQuery).mockReturnValue(
createMockQueryResult<RBACPolicy[]>({
data: mockPolicies,
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
wrapper: createWrapper(),
})

const searchInput = screen.getByPlaceholderText("Search...")
const user = userEvent.setup()
await user.type(searchInput, "abc")
// Wait for debounce (500ms)
await new Promise((resolve) => setTimeout(resolve, 600))

await waitFor(() => {
expect(screen.getByText(/1.*of.*3.*projects/i)).toBeInTheDocument()
expect(screen.getByTestId("rbac-policy-row-policy-1")).toBeInTheDocument()
})
})

Expand All @@ -427,16 +405,22 @@ describe("SecurityGroupRBACPolicies", () => {
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

const searchInput = screen.getByPlaceholderText("Search...")
const searchInput = screen.getByPlaceholderText("Search policies...")
const user = userEvent.setup()

// Type and then clear
await user.type(searchInput, "abc")
await user.clear(searchInput)

// Wait for debounce
await new Promise((resolve) => setTimeout(resolve, 600))

// Click the clear button
const clearButton = screen.getByRole("button", { name: /clear/i })
await user.click(clearButton)

await waitFor(() => {
expect(screen.getByTestId("rbac-policy-row-policy-1")).toBeInTheDocument()
Expand All @@ -454,7 +438,7 @@ describe("SecurityGroupRBACPolicies", () => {
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

Expand All @@ -474,7 +458,7 @@ describe("SecurityGroupRBACPolicies", () => {
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-456" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-456" canManageAccess={true} />, {
wrapper: createWrapper(),
})

Expand All @@ -494,7 +478,7 @@ describe("SecurityGroupRBACPolicies", () => {
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

Expand Down Expand Up @@ -523,7 +507,7 @@ describe("SecurityGroupRBACPolicies", () => {
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

Expand All @@ -544,7 +528,7 @@ describe("SecurityGroupRBACPolicies", () => {
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

Expand Down Expand Up @@ -577,7 +561,7 @@ describe("SecurityGroupRBACPolicies", () => {
isPending: false,
} as unknown as ReturnType<typeof trpcReact.network.rbacPolicy.delete.useMutation>)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

Expand All @@ -601,7 +585,7 @@ describe("SecurityGroupRBACPolicies", () => {
const mockUseQuery = vi.mocked(trpcReact.network.rbacPolicy.list.useQuery)
mockUseQuery.mockReturnValue(createMockQueryResult<RBACPolicy[]>({ data: [] }))

render(<SecurityGroupRBACPolicies securityGroupId="sg-456" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-456" canManageAccess={true} />, {
wrapper: createWrapper(),
})

Expand All @@ -617,7 +601,7 @@ describe("SecurityGroupRBACPolicies", () => {
const mockUseQuery = vi.mocked(trpcReact.network.rbacPolicy.list.useQuery)
mockUseQuery.mockReturnValue(createMockQueryResult<RBACPolicy[]>({ data: [] }))

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

Expand All @@ -638,7 +622,7 @@ describe("SecurityGroupRBACPolicies", () => {
})
)

render(<SecurityGroupRBACPolicies securityGroupId="sg-123" />, {
render(<SecurityGroupRBACPolicies securityGroupId="sg-123" canManageAccess={true} />, {
wrapper: createWrapper(),
})

Expand Down
Loading