Skip to content
Merged
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
8 changes: 7 additions & 1 deletion app/(dashboard)/access-keys/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,13 @@ export default function AccessKeysPage() {
onSuccess={listUserAccounts}
/>

<UserNotice open={noticeOpen} onOpenChange={setNoticeOpen} data={noticeData} onClose={handleNoticeClose} />
<UserNotice
open={noticeOpen}
onOpenChange={setNoticeOpen}
data={noticeData}
onClose={handleNoticeClose}
title={t("New access key has been created")}
/>
</Page>
)
}
26 changes: 19 additions & 7 deletions components/user/edit-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ import { usePermissions } from "@/hooks/use-permissions"
import { usePolicies } from "@/hooks/use-policies"
import { useGroups } from "@/hooks/use-groups"
import { useMessage } from "@/lib/feedback/message"
import { getAvailableUserEditTabs } from "@/lib/user-edit-tabs"
import { UserEditSecretKey } from "./edit/secret-key"
import { UserEditGroups } from "./edit/groups"
import { UserEditPolicies } from "./edit/policies"
import { UserEditAccessKeys } from "./edit/access-keys"

interface UserRow {
accessKey: string
Expand Down Expand Up @@ -49,6 +51,8 @@ export function UserEditForm({ open, onOpenChange, row, onSuccess }: UserEditFor
const canEditAccount = canCapability("users.edit")
const canAssignGroups = canCapability("users.assignGroups")
const canEditPolicies = canCapability("users.policy.edit")
const canManageAccessKeys =
canCapability("accessKeys.create") || canCapability("accessKeys.edit") || canCapability("accessKeys.delete")

const [user, setUser] = React.useState<{
accessKey: string
Expand All @@ -72,12 +76,13 @@ export function UserEditForm({ open, onOpenChange, row, onSuccess }: UserEditFor

const statusBoolean = user.status === "enabled"
const availableTabs = React.useMemo(() => {
const tabs: string[] = []
if (canEditAccount) tabs.push("account")
if (canAssignGroups) tabs.push("groups")
if (canEditPolicies) tabs.push("policy")
return tabs
}, [canAssignGroups, canEditAccount, canEditPolicies])
return getAvailableUserEditTabs({
canEditAccount,
canAssignGroups,
canEditPolicies,
canManageAccessKeys,
})
}, [canAssignGroups, canEditAccount, canEditPolicies, canManageAccessKeys])

React.useEffect(() => {
if (!open || !row?.accessKey) return
Expand Down Expand Up @@ -223,7 +228,7 @@ export function UserEditForm({ open, onOpenChange, row, onSuccess }: UserEditFor
return (
<Dialog open={open} onOpenChange={closeModal}>
<DialogContent
className="sm:max-w-lg"
className="sm:max-w-5xl"
onPointerDownOutside={(e) => e.preventDefault()}
onInteractOutside={(e) => e.preventDefault()}
>
Expand All @@ -237,6 +242,7 @@ export function UserEditForm({ open, onOpenChange, row, onSuccess }: UserEditFor
{canEditAccount ? <TabsTrigger value="account">{t("Account")}</TabsTrigger> : null}
{canAssignGroups ? <TabsTrigger value="groups">{t("Groups")}</TabsTrigger> : null}
{canEditPolicies ? <TabsTrigger value="policy">{t("Policies")}</TabsTrigger> : null}
{canManageAccessKeys ? <TabsTrigger value="access-keys">{t("Access Keys")}</TabsTrigger> : null}
</TabsList>

{canEditAccount ? (
Expand Down Expand Up @@ -279,6 +285,12 @@ export function UserEditForm({ open, onOpenChange, row, onSuccess }: UserEditFor
/>
</TabsContent>
) : null}

{canManageAccessKeys ? (
<TabsContent value="access-keys" className="mt-0">
<UserEditAccessKeys userName={user.accessKey} />
</TabsContent>
) : null}
</Tabs>
</div>

Expand Down
Loading
Loading