Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

improvement(admin): align server console surfaces with v3 (#8158)

Andrew Huang8a402f02def7
diff --git a/frontend/src/pages/admin/AccessManagementPage/components/ServerAdminsTable.tsx b/frontend/src/pages/admin/AccessManagementPage/components/ServerAdminsTable.tsx
index ab9588a5ff..ff48a37e4c 100644
--- a/frontend/src/pages/admin/AccessManagementPage/components/ServerAdminsTable.tsx
+++ b/frontend/src/pages/admin/AccessManagementPage/components/ServerAdminsTable.tsx
@@ -1,20 +1,43 @@
import { Dispatch, SetStateAction, useState } from "react";
import {
- faEllipsisV,
- faMagnifyingGlass,
- faPlus,
- faShieldHalved,
- faTrash,
- faUsers,
- faUserXmark,
- faXmark
-} from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { AlertTriangleIcon } from "lucide-react";
+ AlertTriangleIcon,
+ EllipsisVerticalIcon,
+ PlusIcon,
+ SearchIcon,
+ ShieldOffIcon,
+ Trash2Icon,
+ UserRoundXIcon,
+ UsersIcon
+} from "lucide-react";
import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
import { createNotification } from "@app/components/notifications";
-import { Badge, Pagination, SelectedActionBar } from "@app/components/v3";
+import {
+ Badge,
+ Button,
+ Card,
+ CardContent,
+ Checkbox,
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+ IconButton,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupInput,
+ Pagination,
+ SelectedActionBar,
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger
+} from "@app/components/v3";
import { useSubscription, useUser } from "@app/context";
import {
getUserTablePreference,
@@ -31,29 +54,8 @@ import {
import { User } from "@app/hooks/api/users/types";
import { UsePopUpState } from "@app/hooks/usePopUp";
import { AddServerAdminModal } from "@app/pages/admin/AccessManagementPage/components/AddServerAdminModal";
-import {
- EmptyState,
- Table,
- TableContainer,
- TableSkeleton,
- TBody,
- Td,
- Th,
- THead,
- Tr
-} from "@app/pages/admin/components/AdminTable";
-import {
- Button,
- Checkbox,
- DeleteActionModal,
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
- IconButton,
- Input,
- Tooltip
-} from "@app/pages/admin/components/AdminV3Adapters";
+import { ConfirmActionDialog } from "@app/pages/admin/components/ConfirmActionDialog";
+import { V3TableEmptyState, V3TableSkeleton } from "@app/pages/admin/components/V3TableHelpers";
const removeServerAdminUpgradePlanMessage = "Removing Server Admin permissions from user";
@@ -113,28 +115,28 @@ const ServerAdminsPanelTable = ({
return (
<>
<div className="flex items-center gap-x-2">
- <Input
- aria-label="Search server admins"
- value={searchUserFilter}
- onChange={(e) => setSearchUserFilter(e.target.value)}
- leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
- placeholder="Search admins..."
- className="flex-1"
- />
- <Button
- colorSchema="secondary"
- leftIcon={<FontAwesomeIcon icon={faPlus} />}
- onClick={() => handlePopUpOpen("addServerAdmin")}
- >
+ <InputGroup className="flex-1">
+ <InputGroupAddon>
+ <SearchIcon />
+ </InputGroupAddon>
+ <InputGroupInput
+ aria-label="Search server admins"
+ value={searchUserFilter}
+ onChange={(e) => setSearchUserFilter(e.target.value)}
+ placeholder="Search admins..."
+ />
+ </InputGroup>
+ <Button variant="neutral" onClick={() => handlePopUpOpen("addServerAdmin")}>
+ <PlusIcon />
Add Admin
</Button>
</div>
<div className="mt-4">
- <TableContainer>
+ {!isEmpty && (
<Table>
- <THead>
- <Tr>
- <Th className="w-5">
+ <TableHeader>
+ <TableRow>
+ <TableHead className="w-5">
<Checkbox
aria-label="Select all server admins on this page"
id="member-page-select"
@@ -153,14 +155,14 @@ const ServerAdminsPanelTable = ({
}
}}
/>
- </Th>
- <Th className="w-5/12">Name</Th>
- <Th className="w-1/2">Username</Th>
- <Th className="w-2/12" />
- </Tr>
- </THead>
- <TBody>
- {isPending && <TableSkeleton columns={4} innerKey="users" />}
+ </TableHead>
+ <TableHead className="w-5/12">Name</TableHead>
+ <TableHead className="w-1/2">Username</TableHead>
+ <TableHead variant="action" />
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {isPending && <V3TableSkeleton columns={4} name="users" />}
{!isPending &&
users?.map((user) => {
const { username, email, firstName, lastName, id } = user;
@@ -169,8 +171,8 @@ const ServerAdminsPanelTable = ({
const isSelected = selectedUserIds.includes(id);
return (
- <Tr key={`user-${id}`} className="w-full">
- <Td>
+ <TableRow key={`user-${id}`} className="w-full">
+ <TableCell>
<Checkbox
aria-label={`Select user ${username || email}`}
id={`select-user-${id}`}
@@ -182,21 +184,21 @@ const ServerAdminsPanelTable = ({
);
}}
/>
- </Td>
- <Td className="w-5/12 max-w-0">
+ </TableCell>
+ <TableCell className="w-5/12 max-w-0">
<p className="truncate">
{name ?? <span className="text-muted">Not Set</span>}
</p>
- </Td>
- <Td className="w-5/12 max-w-0">
+ </TableCell>
+ <TableCell className="w-5/12 max-w-0">
<p className="truncate">{username || email}</p>
- </Td>
- <Td>
+ </TableCell>
+ <TableCell variant="action">
<div className="flex justify-end">
<DropdownMenu>
<DropdownMenuTrigger asChild>
- <IconButton ariaLabel="Options" size="xs" variant="plain">
- <FontAwesomeIcon icon={faEllipsisV} />
+ <IconButton aria-label="Options" size="xs" variant="ghost">
+ <EllipsisVerticalIcon />
</IconButton>
</DropdownMenuTrigger>
<DropdownMenuContent sideOffset={2} align="end">
@@ -208,21 +210,11 @@ const ServerAdminsPanelTable = ({
id
});
}}
- icon={<FontAwesomeIcon icon={faUserXmark} />}
>
+ <UserRoundXIcon />
Remove User
</DropdownMenuItem>
<DropdownMenuItem
- icon={
- <div className="relative">
- <FontAwesomeIcon icon={faShieldHalved} />
- <FontAwesomeIcon
- className="absolute -right-1 -bottom-[0.01rem]"
- size="2xs"
- icon={faXmark}
- />
- </div>
- }
onClick={(e) => {
e.stopPropagation();
if (!subscription?.instanceUserManagement) {
@@ -239,19 +231,20 @@ const ServerAdminsPanelTable = ({
});
}}
>
+ <ShieldOffIcon />
Remove Server Admin
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div>
- </Td>
- </Tr>
+ </TableCell>
+ </TableRow>
);
})}
- </TBody>
+ </TableBody>
</Table>
- {!isPending && isEmpty && <EmptyState title="No users found" icon={faUsers} />}
- </TableContainer>
+ )}
+ {!isPending && isEmpty && <V3TableEmptyState title="No users found" icon={UsersIcon} />}
{!isEmpty && (
<Pagination
count={totalCount}
@@ -351,9 +344,7 @@ export const ServerAdminsTable = () => {
onClearSelection={() => setSelectedUsers([])}
>
<Button
- variant="outline_bg"
- colorSchema="danger"
- leftIcon={<FontAwesomeIcon icon={faTrash} />}
+ variant="danger"
onClick={() => {
if (!selectedUsers?.length) return;
@@ -361,43 +352,46 @@ export const ServerAdminsTable = () => {
}}
size="xs"
>
+ <Trash2Icon />
Delete
</Button>
</SelectedActionBar>
- <div className="mb-6 rounded-lg border border-border bg-card p-5 text-foreground">
- <ServerAdminsPanelTable
- handlePopUpOpen={handlePopUpOpen}
- users={users}
- selectedUsers={selectedUsers}
- setSelectedUsers={setSelectedUsers}
- searchUserFilter={searchUserFilter}
- setSearchUserFilter={setSearchUserFilter}
- isPending={isPending}
- page={page}
- perPage={perPage}
- setPage={setPage}
- handlePerPageChange={handlePerPageChange}
- totalCount={totalCount}
- />
- <DeleteActionModal
+ <Card className="mb-6">
+ <CardContent>
+ <ServerAdminsPanelTable
+ handlePopUpOpen={handlePopUpOpen}
+ users={users}
+ selectedUsers={selectedUsers}
+ setSelectedUsers={setSelectedUsers}
+ searchUserFilter={searchUserFilter}
+ setSearchUserFilter={setSearchUserFilter}
+ isPending={isPending}
+ page={page}
+ perPage={perPage}
+ setPage={setPage}
+ handlePerPageChange={handlePerPageChange}
+ totalCount={totalCount}
+ />
+ </CardContent>
+ <ConfirmActionDialog
isOpen={popUp.removeUser.isOpen}
- deleteKey="remove"
+ confirmationKey="remove"
title={`Are you sure you want to delete User with username ${
(popUp?.removeUser?.data as { id: string; username: string })?.username || ""
}?`}
- onChange={(isOpen) => handlePopUpToggle("removeUser", isOpen)}
- onDeleteApproved={handleRemoveUser}
+ onOpenChange={(isOpen) => handlePopUpToggle("removeUser", isOpen)}
+ onConfirm={handleRemoveUser}
/>
- <DeleteActionModal
+ <ConfirmActionDialog
isOpen={popUp.removeServerAdmin.isOpen}
title={`Are you sure you want to remove Server Admin permissions from ${
(popUp?.removeServerAdmin?.data as { id: string; username: string })?.username || ""
}?`}
- subTitle=""
- onChange={(isOpen) => handlePopUpToggle("removeServerAdmin", isOpen)}
- deleteKey="confirm"
- onDeleteApproved={handleRemoveServerAdminAccess}
- buttonText="Remove Access"
+ onOpenChange={(isOpen) => handlePopUpToggle("removeServerAdmin", isOpen)}
+ confirmationKey="confirm"
+ description="You can grant Server Admin access again later."
+ onConfirm={handleRemoveServerAdminAccess}
+ confirmLabel="Remove Access"
/>
<AddServerAdminModal
isOpen={popUp.addServerAdmin.isOpen}
@@ -409,13 +403,13 @@ export const ServerAdminsTable = () => {
onOpenChange={(isOpen) => handlePopUpToggle("upgradePlan", isOpen)}
text="Your current plan does not allow removing server admins. To unlock this feature, please upgrade to Infisical Pro plan."
/>
- <DeleteActionModal
+ <ConfirmActionDialog
isOpen={popUp.removeUsers.isOpen}
title="Are you sure you want to delete the following users?"
- onChange={(isOpen) => handlePopUpToggle("removeUsers", isOpen)}
- deleteKey="confirm"
- onDeleteApproved={() => handleRemoveUsers()}
- buttonText="Remove"
+ onOpenChange={(isOpen) => handlePopUpToggle("removeUsers", isOpen)}
+ confirmationKey="confirm"
+ onConfirm={handleRemoveUsers}
+ confirmLabel="Remove"
>
<div className="mt-4 text-sm text-muted">The following users will be deleted:</div>
<div className="mt-2 max-h-80 overflow-y-auto rounded-sm border border-border-control bg-danger/10 p-4 pl-8 text-sm text-danger">
@@ -436,11 +430,16 @@ export const ServerAdminsTable = () => {
)}{" "}
</p>
{userId === user.id && (
- <Tooltip content="Are you sure you want to remove yourself from this instance?">
- <Badge variant="danger">
- <AlertTriangleIcon />
- Deleting Yourself
- </Badge>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Badge variant="danger">
+ <AlertTriangleIcon />
+ Deleting Yourself
+ </Badge>
+ </TooltipTrigger>
+ <TooltipContent>
+ Are you sure you want to remove yourself from this instance?
+ </TooltipContent>
</Tooltip>
)}
</div>
@@ -449,8 +448,8 @@ export const ServerAdminsTable = () => {
})}
</ul>
</div>
- </DeleteActionModal>
- </div>
+ </ConfirmActionDialog>
+ </Card>
</>
);
};
diff --git a/frontend/src/pages/admin/GeneralPage/components/GeneralPageForm.tsx b/frontend/src/pages/admin/GeneralPage/components/GeneralPageForm.tsx
index c5c1c59864..6465a18b51 100644
--- a/frontend/src/pages/admin/GeneralPage/components/GeneralPageForm.tsx
+++ b/frontend/src/pages/admin/GeneralPage/components/GeneralPageForm.tsx
@@ -1,3 +1,4 @@
+import { type ReactNode, useEffect } from "react";
import { Controller, useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { AtSign } from "lucide-react";
@@ -8,14 +9,16 @@ import {
Button,
Card,
CardContent,
+ CardDescription,
+ CardFooter,
+ CardHeader,
+ CardTitle,
Field,
- FieldContent,
FieldDescription,
FieldError,
FieldFeedback,
FieldGroup,
FieldLabel,
- FieldTitle,
InputGroup,
InputGroupAddon,
InputGroupInput,
@@ -24,7 +27,6 @@ import {
SelectItem,
SelectTrigger,
SelectValue,
- Separator,
TextArea,
Toggle
} from "@app/components/v3";
@@ -46,230 +48,404 @@ const formSchema = z.object({
pageFrameContent: z.string().optional().default("")
});
-type TDashboardForm = z.infer<typeof formSchema>;
+const signUpFormSchema = formSchema.pick({
+ signUpMode: true,
+ allowedSignUpDomain: true
+});
+const defaultOrganizationFormSchema = formSchema.pick({ defaultAuthOrgId: true });
+const trustLdapEmailsFormSchema = formSchema.pick({ trustLdapEmails: true });
+const noticesFormSchema = formSchema.pick({ authConsentContent: true, pageFrameContent: true });
-export const GeneralPageForm = () => {
- const data = useServerConfig();
- const { config } = data;
+type TSignUpForm = z.infer<typeof signUpFormSchema>;
+type TDefaultOrganizationForm = z.infer<typeof defaultOrganizationFormSchema>;
+type TTrustLdapEmailsForm = z.infer<typeof trustLdapEmailsFormSchema>;
+type TNoticesForm = z.infer<typeof noticesFormSchema>;
+
+type GeneralSettingsCardProps = {
+ title: string;
+ description: string;
+ children?: ReactNode;
+ isSubmitting: boolean;
+ isDirty: boolean;
+};
+const GeneralSettingsCard = ({
+ title,
+ description,
+ children,
+ isSubmitting,
+ isDirty
+}: GeneralSettingsCardProps) => (
+ <Card className="gap-0 overflow-hidden p-0">
+ <CardHeader className="p-6">
+ <CardTitle className="font-alliance">{title}</CardTitle>
+ <CardDescription>{description}</CardDescription>
+ </CardHeader>
+ {children && <CardContent className="px-6 pb-6">{children}</CardContent>}
+ <CardFooter className="min-h-8 justify-end border-t border-neutral/15 bg-neutral/5 p-4">
+ <Button
+ variant="neutral"
+ size="sm"
+ type="submit"
+ isPending={isSubmitting}
+ isDisabled={!isDirty}
+ >
+ Save
+ </Button>
+ </CardFooter>
+ </Card>
+);
+
+type SignUpSettingsCardProps = {
+ allowSignUp: boolean;
+ allowedSignUpDomain: string;
+};
+
+const SignUpSettingsCard = ({ allowSignUp, allowedSignUpDomain }: SignUpSettingsCardProps) => {
+ const { mutateAsync: updateServerConfig } = useUpdateServerConfig();
const {
control,
handleSubmit,
+ reset,
watch,
formState: { isSubmitting, isDirty }
- } = useForm<TDashboardForm>({
- resolver: zodResolver(formSchema),
- values: {
+ } = useForm<TSignUpForm>({
+ resolver: zodResolver(signUpFormSchema),
+ defaultValues: {
// eslint-disable-next-line
- signUpMode: config.allowSignUp ? SignUpModes.Anyone : SignUpModes.Disabled,
- allowedSignUpDomain: config.allowedSignUpDomain,
- trustLdapEmails: config.trustLdapEmails ?? false,
- defaultAuthOrgId: config.defaultAuthOrgId ?? "",
- authConsentContent: config.authConsentContent ?? "",
- pageFrameContent: config.pageFrameContent ?? ""
+ signUpMode: allowSignUp ? SignUpModes.Anyone : SignUpModes.Disabled,
+ allowedSignUpDomain
}
});
- const signUpMode = watch("signUpMode");
- const { mutateAsync: updateServerConfig } = useUpdateServerConfig();
-
- const organizations = useGetOrganizations();
-
- const onFormSubmit = async (formData: TDashboardForm) => {
- const { allowedSignUpDomain, trustLdapEmails, authConsentContent, pageFrameContent } = formData;
+ useEffect(() => {
+ reset({
+ // eslint-disable-next-line
+ signUpMode: allowSignUp ? SignUpModes.Anyone : SignUpModes.Disabled,
+ allowedSignUpDomain
+ });
+ }, [allowSignUp, allowedSignUpDomain, reset]);
+ const signUpMode = watch("signUpMode");
+ const onFormSubmit = async (formData: TSignUpForm) => {
await updateServerConfig({
- defaultAuthOrgId: formData.defaultAuthOrgId || null,
- allowSignUp: signUpMode !== SignUpModes.Disabled,
- allowedSignUpDomain: signUpMode === SignUpModes.Anyone ? allowedSignUpDomain : null,
- trustLdapEmails,
- authConsentContent,
- pageFrameContent
+ allowSignUp: formData.signUpMode !== SignUpModes.Disabled,
+ allowedSignUpDomain:
+ formData.signUpMode === SignUpModes.Anyone ? formData.allowedSignUpDomain : null
});
+ reset(formData);
createNotification({
- text: "Successfully changed sign up setting.",
+ text: "Signup settings updated.",
type: "success"
});
};
return (
- <Card>
- <CardContent>
- <form onSubmit={handleSubmit(onFormSubmit)}>
- <FieldGroup>
- <div>
- <FieldTitle>Allow User Signups</FieldTitle>
- <FieldDescription>
- Choose whether users can sign up for this Infisical instance.
- </FieldDescription>
- </div>
- <Controller
- control={control}
- name="signUpMode"
- render={({ field: { onChange, value }, fieldState: { error } }) => (
- <Field className="max-w-sm">
- <FieldLabel htmlFor="signup-mode">Signup mode</FieldLabel>
- <Select value={value} onValueChange={onChange}>
- <SelectTrigger id="signup-mode" className="w-full" isError={Boolean(error)}>
- <SelectValue />
- </SelectTrigger>
- <SelectContent>
- <SelectItem value={SignUpModes.Disabled}>Disabled</SelectItem>
- <SelectItem value={SignUpModes.Anyone}>Anyone</SelectItem>
- </SelectContent>
- </Select>
- <FieldError>{error?.message}</FieldError>
- </Field>
- )}
- />
- {signUpMode === "anyone" && (
- <Controller
- control={control}
- defaultValue=""
- name="allowedSignUpDomain"
- render={({ field, fieldState: { error } }) => (
- <Field className="max-w-sm" data-invalid={Boolean(error)}>
- <FieldLabel htmlFor="allowed-signup-domains">Allowed email domains</FieldLabel>
- <InputGroup>
- <InputGroupAddon>
- <AtSign />
- </InputGroupAddon>
- <InputGroupInput
- id="allowed-signup-domains"
- {...field}
- aria-describedby="allowed-signup-domains-feedback"
- isError={Boolean(error)}
- value={field.value || ""}
- placeholder="gmail.com, aws.com, redhat.com"
- />
- </InputGroup>
- <FieldFeedback
- id="allowed-signup-domains-feedback"
- description="Leave blank to allow any email domain."
- error={error?.message}
- />
- </Field>
- )}
- />
+ <form onSubmit={handleSubmit(onFormSubmit)}>
+ <GeneralSettingsCard
+ title="Allow User Signups"
+ description="Choose whether users can sign up for this Infisical instance."
+ isSubmitting={isSubmitting}
+ isDirty={isDirty}
+ >
+ <FieldGroup>
+ <Controller
+ control={control}
+ name="signUpMode"
+ render={({ field: { onChange, value }, fieldState: { error } }) => (
+ <Field className="max-w-sm">
+ <FieldLabel htmlFor="signup-mode">Signup mode</FieldLabel>
+ <Select value={value} onValueChange={onChange}>
+ <SelectTrigger id="signup-mode" className="w-full" isError={Boolean(error)}>
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value={SignUpModes.Disabled}>Disabled</SelectItem>
+ <SelectItem value={SignUpModes.Anyone}>Anyone</SelectItem>
+ </SelectContent>
+ </Select>
+ <FieldError>{error?.message}</FieldError>
+ </Field>
)}
-
- <Separator />
- <div>
- <FieldTitle>Default Organization</FieldTitle>
- <FieldDescription>
- Select the default organization you want to set for SAML/LDAP/OIDC/Github logins.
- When selected, user logins will be automatically scoped to the selected
- organization.
- </FieldDescription>
- </div>
- <Controller
- control={control}
- name="defaultAuthOrgId"
- render={({ field: { onChange, value }, fieldState: { error } }) => (
- <Field className="max-w-sm">
- <FieldLabel htmlFor="default-auth-org">Organization</FieldLabel>
- <Select
- value={value || "all"}
- onValueChange={(next) => onChange(next === "all" ? "" : next)}
- >
- <SelectTrigger
- id="default-auth-org"
- className="w-full"
- isError={Boolean(error)}
- >
- <SelectValue placeholder="Allow all organizations" />
- </SelectTrigger>
- <SelectContent>
- <SelectItem value="all">Allow all organizations</SelectItem>
- {organizations.data?.map((org) => (
- <SelectItem key={org.id} value={org.id}>
- {org.name}
- </SelectItem>
- ))}
- </SelectContent>
- </Select>
- <FieldError>{error?.message}</FieldError>
- </Field>
- )}
- />
-
- <Separator />
+ />
+ {signUpMode === SignUpModes.Anyone && (
<Controller
control={control}
- name="trustLdapEmails"
+ defaultValue=""
+ name="allowedSignUpDomain"
render={({ field, fieldState: { error } }) => (
- <Field orientation="horizontal">
- <FieldContent>
- <FieldTitle>Trust LDAP emails</FieldTitle>
- <FieldDescription>
- Trust email addresses provisioned by LDAP identity providers. When disabled,
- LDAP users must verify their email address on first login. SAML and OIDC users
- skip verification when their organization enforces SSO.
- </FieldDescription>
- <FieldError>{error?.message}</FieldError>
- </FieldContent>
- <Toggle
- id="trust-ldap-emails"
- aria-label="Trust LDAP emails"
- variant="neutral"
- checked={field.value}
- onCheckedChange={field.onChange}
+ <Field className="max-w-sm" data-invalid={Boolean(error)}>
+ <FieldLabel htmlFor="allowed-signup-domains">Allowed email domains</FieldLabel>
+ <InputGroup>
+ <InputGroupAddon>
+ <AtSign />
+ </InputGroupAddon>
+ <InputGroupInput
+ id="allowed-signup-domains"
+ {...field}
+ aria-describedby="allowed-signup-domains-feedback"
+ isError={Boolean(error)}
+ value={field.value || ""}
+ placeholder="gmail.com, aws.com, redhat.com"
+ />
+ </InputGroup>
+ <FieldFeedback
+ id="allowed-signup-domains-feedback"
+ description="Leave blank to allow any email domain."
+ error={error?.message}
/>
</Field>
)}
/>
+ )}
+ </FieldGroup>
+ </GeneralSettingsCard>
+ </form>
+ );
+};
+
+type DefaultOrganizationSettingsCardProps = {
+ defaultAuthOrgId: string;
+};
+
+const DefaultOrganizationSettingsCard = ({
+ defaultAuthOrgId
+}: DefaultOrganizationSettingsCardProps) => {
+ const organizations = useGetOrganizations();
+ const { mutateAsync: updateServerConfig } = useUpdateServerConfig();
+ const {
+ control,
+ handleSubmit,
+ reset,
+ formState: { isSubmitting, isDirty }
+ } = useForm<TDefaultOrganizationForm>({
+ resolver: zodResolver(defaultOrganizationFormSchema),
+ defaultValues: {
+ defaultAuthOrgId
+ }
+ });
+
+ useEffect(() => {
+ reset({ defaultAuthOrgId });
+ }, [defaultAuthOrgId, reset]);
+
+ const onFormSubmit = async (formData: TDefaultOrganizationForm) => {
+ await updateServerConfig({
+ defaultAuthOrgId: formData.defaultAuthOrgId || null
+ });
+ reset(formData);
+ createNotification({
+ text: "Default organization updated.",
+ type: "success"
+ });
+ };
+
+ return (
+ <form onSubmit={handleSubmit(onFormSubmit)}>
+ <GeneralSettingsCard
+ title="Default Organization"
+ description="Select the default organization you want to set for SAML, LDAP, OIDC, and GitHub logins. When selected, user logins will be automatically scoped to the selected organization."
+ isSubmitting={isSubmitting}
+ isDirty={isDirty}
+ >
+ <Controller
+ control={control}
+ name="defaultAuthOrgId"
+ render={({ field: { onChange, value }, fieldState: { error } }) => (
+ <Field className="max-w-sm">
+ <FieldLabel htmlFor="default-auth-org">Organization</FieldLabel>
+ <Select
+ value={value || "all"}
+ onValueChange={(next) => onChange(next === "all" ? "" : next)}
+ >
+ <SelectTrigger id="default-auth-org" className="w-full" isError={Boolean(error)}>
+ <SelectValue placeholder="Allow all organizations" />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value="all">Allow all organizations</SelectItem>
+ {organizations.data?.map((org) => (
+ <SelectItem key={org.id} value={org.id}>
+ {org.name}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ <FieldError>{error?.message}</FieldError>
+ </Field>
+ )}
+ />
+ </GeneralSettingsCard>
+ </form>
+ );
+};
- <Separator />
- <div>
- <FieldTitle>Notices</FieldTitle>
- <FieldDescription>
- Configure system-wide notification banners and security messages. These settings
- control the text displayed during authentication and throughout a user&apos;s
- session.
- </FieldDescription>
+type TrustLdapEmailsSettingsCardProps = {
+ trustLdapEmails: boolean;
+};
+
+const TrustLdapEmailsSettingsCard = ({ trustLdapEmails }: TrustLdapEmailsSettingsCardProps) => {
+ const { mutateAsync: updateServerConfig } = useUpdateServerConfig();
+ const {
+ control,
+ handleSubmit,
+ reset,
+ formState: { isSubmitting, isDirty }
+ } = useForm<TTrustLdapEmailsForm>({
+ resolver: zodResolver(trustLdapEmailsFormSchema),
+ defaultValues: {
+ trustLdapEmails
+ }
+ });
+
+ useEffect(() => {
+ reset({ trustLdapEmails });
+ }, [trustLdapEmails, reset]);
+
+ const onFormSubmit = async (formData: TTrustLdapEmailsForm) => {
+ await updateServerConfig(formData);
+ reset(formData);
+ createNotification({
+ text: "LDAP email verification setting updated.",
+ type: "success"
+ });
+ };
+
+ return (
+ <form onSubmit={handleSubmit(onFormSubmit)}>
+ <Controller
+ control={control}
+ name="trustLdapEmails"
+ render={({ field }) => (
+ <GeneralSettingsCard
+ title="LDAP Email Verification"
+ description="Choose whether users provisioned through LDAP must verify their email address on first login. SAML and OIDC users remain unaffected."
+ isSubmitting={isSubmitting}
+ isDirty={isDirty}
+ >
+ <div className="flex items-center gap-3">
+ <Toggle
+ id="trust-ldap-emails"
+ aria-label="Trust LDAP emails"
+ variant="neutral"
+ checked={field.value}
+ onCheckedChange={field.onChange}
+ />
+ <FieldLabel
+ htmlFor="trust-ldap-emails"
+ className="cursor-pointer text-sm font-medium text-foreground"
+ >
+ Trust LDAP emails
+ </FieldLabel>
</div>
- <Controller
- render={({ field, fieldState: { error } }) => (
- <Field>
- <FieldLabel htmlFor="auth-consent-content">Auth consent content</FieldLabel>
- <TextArea
- id="auth-consent-content"
- placeholder="**Auth Consent Message**"
- {...field}
- rows={3}
- className="h-48 max-w-lg resize-none"
- />
- <FieldDescription>Supports HTML, Markdown, and plain text.</FieldDescription>
- <FieldError>{error?.message}</FieldError>
- </Field>
- )}
- control={control}
- name="authConsentContent"
- />
- <Controller
- render={({ field, fieldState: { error } }) => (
- <Field>
- <FieldLabel htmlFor="page-frame-content">Page frame content</FieldLabel>
- <TextArea
- id="page-frame-content"
- placeholder='<div style="background-color: red">TOP SECRET</div>'
- {...field}
- rows={3}
- className="h-48 max-w-lg resize-none"
- />
- <FieldDescription>Supports HTML, Markdown, and plain text.</FieldDescription>
- <FieldError>{error?.message}</FieldError>
- </Field>
- )}
- control={control}
- name="pageFrameContent"
- />
- <Button variant="neutral" type="submit" isPending={isSubmitting} isDisabled={!isDirty}>
- Save
- </Button>
- </FieldGroup>
- </form>
- </CardContent>
- </Card>
+ </GeneralSettingsCard>
+ )}
+ />
+ </form>
+ );
+};
+
+type NoticesSettingsCardProps = {
+ authConsentContent: string;
+ pageFrameContent: string;
+};
+
+const NoticesSettingsCard = ({
+ authConsentContent,
+ pageFrameContent
+}: NoticesSettingsCardProps) => {
+ const { mutateAsync: updateServerConfig } = useUpdateServerConfig();
+ const {
+ control,
+ handleSubmit,
+ reset,
+ formState: { isSubmitting, isDirty }
+ } = useForm<TNoticesForm>({
+ resolver: zodResolver(noticesFormSchema),
+ defaultValues: {
+ authConsentContent,
+ pageFrameContent
+ }
+ });
+
+ useEffect(() => {
+ reset({ authConsentContent, pageFrameContent });
+ }, [authConsentContent, pageFrameContent, reset]);
+
+ const onFormSubmit = async (formData: TNoticesForm) => {
+ await updateServerConfig(formData);
+ reset(formData);
+ createNotification({
+ text: "Notices updated.",
+ type: "success"
+ });
+ };
+
+ return (
+ <form onSubmit={handleSubmit(onFormSubmit)}>
+ <GeneralSettingsCard
+ title="Notices"
+ description="Configure system-wide notification banners and security messages. These settings control the text displayed during authentication and throughout a user's session."
+ isSubmitting={isSubmitting}
+ isDirty={isDirty}
+ >
+ <FieldGroup>
+ <Controller
+ render={({ field, fieldState: { error } }) => (
+ <Field>
+ <FieldLabel htmlFor="auth-consent-content">Auth consent content</FieldLabel>
+ <TextArea
+ id="auth-consent-content"
+ placeholder="**Auth Consent Message**"
+ {...field}
+ rows={3}
+ className="h-48 max-w-lg resize-none"
+ />
+ <FieldDescription>Supports HTML, Markdown, and plain text.</FieldDescription>
+ <FieldError>{error?.message}</FieldError>
+ </Field>
+ )}
+ control={control}
+ name="authConsentContent"
+ />
+ <Controller
+ render={({ field, fieldState: { error } }) => (
+ <Field>
+ <FieldLabel htmlFor="page-frame-content">Page frame content</FieldLabel>
+ <TextArea
+ id="page-frame-content"
+ placeholder='<div style="background-color: red">TOP SECRET</div>'
+ {...field}
+ rows={3}
+ className="h-48 max-w-lg resize-none"
+ />
+ <FieldDescription>Supports HTML, Markdown, and plain text.</FieldDescription>
+ <FieldError>{error?.message}</FieldError>
+ </Field>
+ )}
+ control={control}
+ name="pageFrameContent"
+ />
+ </FieldGroup>
+ </GeneralSettingsCard>
+ </form>
+ );
+};
+
+export const GeneralPageForm = () => {
+ const { config } = useServerConfig();
+
+ return (
+ <div className="space-y-6">
+ <SignUpSettingsCard
+ allowSignUp={config.allowSignUp}
+ allowedSignUpDomain={config.allowedSignUpDomain ?? ""}
+ />
+ <DefaultOrganizationSettingsCard defaultAuthOrgId={config.defaultAuthOrgId ?? ""} />
+ <TrustLdapEmailsSettingsCard trustLdapEmails={config.trustLdapEmails ?? false} />
+ <NoticesSettingsCard
+ authConsentContent={config.authConsentContent ?? ""}
+ pageFrameContent={config.pageFrameContent ?? ""}
+ />
+ </div>
);
};
diff --git a/frontend/src/pages/admin/ResourceOverviewPage/components/AddOrganizationModal.tsx b/frontend/src/pages/admin/ResourceOverviewPage/components/AddOrganizationModal.tsx
index 5f8167cf8a..e69c5fee50 100644
--- a/frontend/src/pages/admin/ResourceOverviewPage/components/AddOrganizationModal.tsx
+++ b/frontend/src/pages/admin/ResourceOverviewPage/components/AddOrganizationModal.tsx
@@ -1,12 +1,12 @@
import { useId, useState } from "react";
-import { Controller, useFieldArray, useForm } from "react-hook-form";
+import { Controller, useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { z } from "zod";
import { createNotification } from "@app/components/notifications";
import {
Button,
- CreatableSelect,
+ Combobox,
Dialog,
DialogContent,
DialogDescription,
@@ -20,7 +20,6 @@ import {
} from "@app/components/v3";
import { useDebounce } from "@app/hooks";
import { useAdminGetUsers, useServerAdminCreateOrganization } from "@app/hooks/api";
-import { User } from "@app/hooks/api/users/types";
import { GenericResourceNameSchema } from "@app/lib/schemas";
type Props = {
@@ -32,20 +31,19 @@ type ContentProps = {
onClose: () => void;
};
-type Invitee = Pick<User, "email" | "firstName" | "lastName" | "username" | "id">;
-type NewOption = { label: string; value: string };
-
-const getUserLabel = (user: Invitee | NewOption) => {
- if (Object.prototype.hasOwnProperty.call(user, "value")) {
- return (user as NewOption).label;
- }
-
- const { firstName, lastName, username, email } = user as Invitee;
+type Invitee = {
+ id: string;
+ email?: string | null;
+ firstName?: string | null;
+ lastName?: string | null;
+ username?: string | null;
+};
+const getUserLabel = ({ firstName, lastName, username, email }: Invitee) => {
const name = `${firstName ?? ""} ${lastName ?? ""}`.trim();
const userEmail = email || username;
- if (!name) return userEmail;
+ if (!name) return userEmail ?? "Unnamed user";
return `${name}${userEmail ? ` (${userEmail})` : ""}`;
};
@@ -74,7 +72,7 @@ const Content = ({ onClose }: ContentProps) => {
handleSubmit,
control,
formState: { isSubmitting }
- } = useForm({
+ } = useForm<FormData>({
defaultValues: {
name: "",
invitees: []
@@ -108,8 +106,6 @@ const Content = ({ onClose }: ContentProps) => {
onClose();
};
- const { append } = useFieldArray<FormData>({ control, name: "invitees" });
-
return (
<form className="flex flex-col gap-4" onSubmit={handleSubmit(onSubmit)}>
<Controller
@@ -133,59 +129,50 @@ const Content = ({ onClose }: ContentProps) => {
name="name"
/>
<Controller
- render={({ field, fieldState: { error } }) => (
- <Field>
- <FieldLabel htmlFor={adminSelectId}>Assign organization admins</FieldLabel>
- <CreatableSelect
- inputId={adminSelectId}
- /* eslint-disable-next-line react/no-unstable-nested-components */
- noOptionsMessage={() => (
- <p>Invite new users to this organization by typing out their email address.</p>
- )}
- onCreateOption={(inputValue) =>
- append({
- id: `${inputValue}_${Math.random()}`,
- email: inputValue
- })
- }
- formatCreateLabel={(inputValue) => `Invite "${inputValue}"`}
- isValidNewOption={(input) =>
- Boolean(input) &&
- z.string().email().safeParse(input).success &&
- !users
- ?.flatMap((user) => {
- const emails: string[] = [];
-
- if (user.email) {
- emails.push(user.email);
- }
-
- if (user.username) {
- emails.push(user.username);
- }
-
- return emails;
- })
- .includes(input)
- }
- isLoading={searchUserFilter !== debouncedSearchTerm || isPending}
- className="w-full"
- placeholder="Search users or invite new ones..."
- isMulti
- name="members"
- options={users}
- getOptionLabel={(user) => getUserLabel(user)}
- getOptionValue={(user) => user.id}
- value={field.value}
- onChange={field.onChange}
- onInputChange={(value) => {
- setSearchUserFilter(value);
- if (!value) setDebouncedSearchTerm("");
- }}
- />
- <FieldError>{error?.message}</FieldError>
- </Field>
- )}
+ render={({ field, fieldState: { error } }) => {
+ const email = searchUserFilter.trim();
+ const isNewEmail =
+ z.string().email().safeParse(email).success &&
+ ![...users, ...field.value].some(
+ (user) => (user.email || user.username)?.toLowerCase() === email.toLowerCase()
+ );
+ const inviteOption: Invitee | null = isNewEmail
+ ? { id: `invite:${email.toLowerCase()}`, email }
+ : null;
+
+ return (
+ <Field>
+ <FieldLabel htmlFor={adminSelectId}>Assign Organization Admins</FieldLabel>
+ <Combobox<Invitee>
+ id={adminSelectId}
+ multiple
+ options={inviteOption ? [inviteOption, ...users] : users}
+ value={field.value}
+ onValueChange={field.onChange}
+ onClear={() => field.onChange([])}
+ getOptionLabel={getUserLabel}
+ getOptionValue={(user) => user.id}
+ renderOption={(user) =>
+ user.id.startsWith("invite:") ? `Invite "${user.email}"` : getUserLabel(user)
+ }
+ placeholder="Search users or invite by email..."
+ searchPlaceholder="Search users or enter an email..."
+ searchAriaLabel="Search users or enter an email to invite"
+ emptyMessage="No users found. Enter a valid email address to invite a new user."
+ isLoading={searchUserFilter !== debouncedSearchTerm || isPending}
+ isError={Boolean(error)}
+ shouldFilter={false}
+ includeMissingSelectedOptions
+ modal
+ onInputValueChange={(value) => {
+ setSearchUserFilter(value);
+ if (!value) setDebouncedSearchTerm("");
+ }}
+ />
+ <FieldError>{error?.message}</FieldError>
+ </Field>
+ );
+ }}
control={control}
name="invitees"
/>
diff --git a/frontend/src/pages/admin/ResourceOverviewPage/components/EmailDomainsTable.tsx b/frontend/src/pages/admin/ResourceOverviewPage/components/EmailDomainsTable.tsx
index 8bff53ef92..426f0b8003 100644
--- a/frontend/src/pages/admin/ResourceOverviewPage/components/EmailDomainsTable.tsx
+++ b/frontend/src/pages/admin/ResourceOverviewPage/components/EmailDomainsTable.tsx
@@ -1,31 +1,44 @@
import { useId, useState } from "react";
import { Controller, useForm } from "react-hook-form";
-import {
- faEllipsisV,
- faGlobe,
- faMagnifyingGlass,
- faPlus,
- faTrash
-} from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { zodResolver } from "@hookform/resolvers/zod";
+import { EllipsisVerticalIcon, GlobeIcon, PlusIcon, SearchIcon, Trash2Icon } from "lucide-react";
import { z } from "zod";
import { createNotification } from "@app/components/notifications";
import {
Badge,
- Button as DialogButton,
+ Button,
+ Card,
+ CardAction,
+ CardContent,
+ CardDescription,
+ CardHeader,
+ CardTitle,
+ Combobox,
Dialog,
DialogContent,
DialogFooter,
DialogHeader,
DialogTitle,
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
Field,
FieldError,
FieldLabel,
- FilterableSelect,
- Input as DialogInput,
- Pagination
+ IconButton,
+ Input,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupInput,
+ Pagination,
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow
} from "@app/components/v3";
import {
getUserTablePreference,
@@ -39,28 +52,8 @@ import {
useAdminGetEmailDomains,
useAdminGetOrganizations
} from "@app/hooks/api";
-import { OrganizationWithProjects } from "@app/hooks/api/admin/types";
-import {
- EmptyState,
- Table,
- TableContainer,
- TableSkeleton,
- TBody,
- Td,
- Th,
- THead,
- Tr
-} from "@app/pages/admin/components/AdminTable";
-import {
- Button,
- DeleteActionModal,
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
- IconButton,
- Input
-} from "@app/pages/admin/components/AdminV3Adapters";
+import { ConfirmActionDialog } from "@app/pages/admin/components/ConfirmActionDialog";
+import { V3TableEmptyState, V3TableSkeleton } from "@app/pages/admin/components/V3TableHelpers";
const AddEmailDomainSchema = z.object({
organization: z.object({ id: z.string(), name: z.string() }),
@@ -68,6 +61,7 @@ const AddEmailDomainSchema = z.object({
});
type AddEmailDomainFormData = z.infer<typeof AddEmailDomainSchema>;
+type OrganizationOption = AddEmailDomainFormData["organization"];
const AddEmailDomainContent = ({ onClose }: { onClose: () => void }) => {
const createEmailDomain = useAdminCreateEmailDomain();
@@ -118,16 +112,23 @@ const AddEmailDomainContent = ({ onClose }: { onClose: () => void }) => {
render={({ field, fieldState: { error } }) => (
<Field>
<FieldLabel htmlFor={organizationSelectId}>Organization</FieldLabel>
- <FilterableSelect<OrganizationWithProjects>
- inputId={organizationSelectId}
+ <Combobox<OrganizationOption>
+ id={organizationSelectId}
isLoading={searchOrgFilter !== debouncedSearchTerm || isPending}
- placeholder="Search organizations..."
- options={organizations}
+ isError={Boolean(error)}
+ options={organizations.map(({ id, name }) => ({ id, name }))}
getOptionLabel={(org) => org.name}
getOptionValue={(org) => org.id}
- value={field.value as unknown as OrganizationWithProjects}
- onChange={field.onChange}
- onInputChange={(value) => {
+ value={field.value ?? null}
+ onValueChange={field.onChange}
+ onClear={() => field.onChange(undefined)}
+ placeholder="Select organization..."
+ searchPlaceholder="Search organizations..."
+ searchAriaLabel="Search organizations"
+ shouldFilter={false}
+ includeMissingSelectedOptions
+ modal
+ onInputValueChange={(value) => {
setSearchOrgFilter(value);
if (!value) setDebouncedSearchTerm("");
}}
@@ -142,7 +143,7 @@ const AddEmailDomainContent = ({ onClose }: { onClose: () => void }) => {
render={({ field }) => (
<Field>
<FieldLabel htmlFor="verified-email-domain">Domain</FieldLabel>
- <DialogInput
+ <Input
id="verified-email-domain"
placeholder="company.com"
isError={Boolean(errors.domain)}
@@ -153,12 +154,12 @@ const AddEmailDomainContent = ({ onClose }: { onClose: () => void }) => {
)}
/>
<DialogFooter>
- <DialogButton variant="ghost" type="button" onClick={onClose}>
+ <Button variant="ghost" type="button" onClick={onClose}>
Cancel
- </DialogButton>
- <DialogButton variant="neutral" type="submit" isPending={isSubmitting}>
+ </Button>
+ <Button variant="neutral" type="submit" isPending={isSubmitting}>
Add domain
- </DialogButton>
+ </Button>
</DialogFooter>
</form>
);
@@ -228,110 +229,112 @@ export const EmailDomainsTable = () => {
};
return (
- <div className="mb-6 rounded-lg border border-border bg-card p-5 text-foreground">
- <div className="mb-4 flex items-center justify-between">
- <div>
- <p className="text-xl font-medium text-foreground">Email Domains</p>
- <p className="text-sm text-label-secondary">
- Manage verified email domains across your instance.
- </p>
- </div>
- <Button
- colorSchema="secondary"
- onClick={() => handlePopUpOpen("addEmailDomain")}
- leftIcon={<FontAwesomeIcon icon={faPlus} />}
- >
- Add Domain
- </Button>
- </div>
- <Input
- aria-label="Search email domains"
- value={searchFilter}
- onChange={(e) => setSearchFilter(e.target.value)}
- leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
- placeholder="Search by domain or organization name..."
- className="flex-1"
- />
- <div className="mt-4">
- <TableContainer>
- <Table>
- <THead>
- <Tr>
- <Th className="w-1/3">Domain</Th>
- <Th className="w-1/3">Organization</Th>
- <Th className="w-1/6">Status</Th>
- <Th className="w-5" />
- </Tr>
- </THead>
- <TBody>
- {isPending && <TableSkeleton columns={4} innerKey="email-domains" />}
- {!isPending &&
- emailDomains?.map((ed) => (
- <Tr key={ed.id} className="w-full">
- <Td className="max-w-0">
- <p className="truncate">{ed.domain}</p>
- </Td>
- <Td className="max-w-0">
- <p className="truncate">{ed.orgName ?? ed.orgId}</p>
- </Td>
- <Td>
- <Badge variant={ed.status === "verified" ? "success" : "warning"}>
- {ed.status}
- </Badge>
- </Td>
- <Td>
- <div className="flex justify-end">
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <IconButton ariaLabel="Options" size="xs" variant="plain">
- <FontAwesomeIcon icon={faEllipsisV} />
- </IconButton>
- </DropdownMenuTrigger>
- <DropdownMenuContent sideOffset={2} align="end">
- <DropdownMenuItem
- icon={<FontAwesomeIcon icon={faTrash} />}
- onClick={() =>
- handlePopUpOpen("deleteEmailDomain", {
- emailDomainId: ed.id,
- domain: ed.domain
- })
- }
- >
- Delete Domain
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
- </div>
- </Td>
- </Tr>
- ))}
- </TBody>
- </Table>
- {!isPending && isEmpty && <EmptyState title="No email domains found" icon={faGlobe} />}
- </TableContainer>
- {!isPending && totalCount > 0 && (
- <Pagination
- count={totalCount}
- page={page}
- perPage={perPage}
- onChangePage={setPage}
- onChangePerPage={handlePerPageChange}
+ <Card className="mb-6">
+ <CardHeader>
+ <CardTitle>Email Domains</CardTitle>
+ <CardDescription>Manage verified email domains across your instance.</CardDescription>
+ <CardAction>
+ <Button variant="neutral" onClick={() => handlePopUpOpen("addEmailDomain")}>
+ <PlusIcon />
+ Add Domain
+ </Button>
+ </CardAction>
+ </CardHeader>
+ <CardContent>
+ <InputGroup>
+ <InputGroupAddon>
+ <SearchIcon />
+ </InputGroupAddon>
+ <InputGroupInput
+ aria-label="Search email domains"
+ value={searchFilter}
+ onChange={(e) => setSearchFilter(e.target.value)}
+ placeholder="Search by domain or organization name..."
/>
- )}
- </div>
- <DeleteActionModal
+ </InputGroup>
+ <div className="mt-4">
+ {!isEmpty && (
+ <Table>
+ <TableHeader>
+ <TableRow>
+ <TableHead className="w-1/3">Domain</TableHead>
+ <TableHead className="w-1/3">Organization</TableHead>
+ <TableHead className="w-1/6">Status</TableHead>
+ <TableHead variant="action" />
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {isPending && <V3TableSkeleton columns={4} name="email-domains" />}
+ {!isPending &&
+ emailDomains?.map((ed) => (
+ <TableRow key={ed.id} className="w-full">
+ <TableCell className="max-w-0">
+ <p className="truncate">{ed.domain}</p>
+ </TableCell>
+ <TableCell className="max-w-0">
+ <p className="truncate">{ed.orgName ?? ed.orgId}</p>
+ </TableCell>
+ <TableCell>
+ <Badge variant={ed.status === "verified" ? "success" : "warning"}>
+ {ed.status}
+ </Badge>
+ </TableCell>
+ <TableCell variant="action">
+ <div className="flex justify-end">
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <IconButton aria-label="Options" size="xs" variant="ghost">
+ <EllipsisVerticalIcon />
+ </IconButton>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent sideOffset={2} align="end">
+ <DropdownMenuItem
+ onClick={() =>
+ handlePopUpOpen("deleteEmailDomain", {
+ emailDomainId: ed.id,
+ domain: ed.domain
+ })
+ }
+ >
+ <Trash2Icon />
+ Delete Domain
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </div>
+ </TableCell>
+ </TableRow>
+ ))}
+ </TableBody>
+ </Table>
+ )}
+ {!isPending && isEmpty && (
+ <V3TableEmptyState title="No email domains found" icon={GlobeIcon} />
+ )}
+ {!isPending && totalCount > 0 && (
+ <Pagination
+ count={totalCount}
+ page={page}
+ perPage={perPage}
+ onChangePage={setPage}
+ onChangePerPage={handlePerPageChange}
+ />
+ )}
+ </div>
+ </CardContent>
+ <ConfirmActionDialog
isOpen={popUp.deleteEmailDomain.isOpen}
- deleteKey="delete"
+ confirmationKey="delete"
title={`Are you sure you want to delete domain ${
(popUp?.deleteEmailDomain?.data as { domain: string })?.domain || ""
}?`}
- onChange={(isOpen) => handlePopUpToggle("deleteEmailDomain", isOpen)}
- onDeleteApproved={handleDelete}
+ onOpenChange={(isOpen) => handlePopUpToggle("deleteEmailDomain", isOpen)}
+ onConfirm={handleDelete}
/>
<AddEmailDomainModal
isOpen={popUp.addEmailDomain.isOpen}
onOpenChange={(isOpen) => handlePopUpToggle("addEmailDomain", isOpen)}
/>
- </div>
+ </Card>
);
};
diff --git a/frontend/src/pages/admin/ResourceOverviewPage/components/MachineIdentitiesTable.tsx b/frontend/src/pages/admin/ResourceOverviewPage/components/MachineIdentitiesTable.tsx
index 4b45794a3a..97ae06aebf 100644
--- a/frontend/src/pages/admin/ResourceOverviewPage/components/MachineIdentitiesTable.tsx
+++ b/frontend/src/pages/admin/ResourceOverviewPage/components/MachineIdentitiesTable.tsx
@@ -1,16 +1,36 @@
import { useState } from "react";
import {
- faEllipsisV,
- faMagnifyingGlass,
- faShieldHalved,
- faWrench,
- faXmark
-} from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { ServerCogIcon } from "lucide-react";
+ EllipsisVerticalIcon,
+ SearchIcon,
+ ServerCogIcon,
+ ShieldXIcon,
+ WrenchIcon
+} from "lucide-react";
import { createNotification } from "@app/components/notifications";
-import { Badge, Pagination } from "@app/components/v3";
+import {
+ Badge,
+ Card,
+ CardContent,
+ CardDescription,
+ CardHeader,
+ CardTitle,
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+ IconButton,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupInput,
+ Pagination,
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow
+} from "@app/components/v3";
import {
getUserTablePreference,
PreferenceKey,
@@ -20,26 +40,8 @@ import { useDebounce, usePagination, usePopUp, useResetPageHelper } from "@app/h
import { useAdminRemoveIdentitySuperAdminAccess } from "@app/hooks/api/admin";
import { useAdminGetIdentities } from "@app/hooks/api/admin/queries";
import { UsePopUpState } from "@app/hooks/usePopUp";
-import {
- EmptyState,
- Table,
- TableContainer,
- TableSkeleton,
- TBody,
- Td,
- Th,
- THead,
- Tr
-} from "@app/pages/admin/components/AdminTable";
-import {
- DeleteActionModal,
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
- IconButton,
- Input
-} from "@app/pages/admin/components/AdminV3Adapters";
+import { ConfirmActionDialog } from "@app/pages/admin/components/ConfirmActionDialog";
+import { V3TableEmptyState, V3TableSkeleton } from "@app/pages/admin/components/V3TableHelpers";
const IdentityPanelTable = ({
handlePopUpOpen
@@ -87,30 +89,33 @@ const IdentityPanelTable = ({
return (
<>
<div className="flex gap-2">
- <Input
- aria-label="Search machine identities"
- value={searchIdentityFilter}
- onChange={(e) => setSearchIdentityFilter(e.target.value)}
- leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
- placeholder="Search machine identities by name..."
- className="flex-1"
- />
+ <InputGroup>
+ <InputGroupAddon>
+ <SearchIcon />
+ </InputGroupAddon>
+ <InputGroupInput
+ aria-label="Search machine identities"
+ value={searchIdentityFilter}
+ onChange={(e) => setSearchIdentityFilter(e.target.value)}
+ placeholder="Search machine identities by name..."
+ />
+ </InputGroup>
</div>
<div className="mt-4">
- <TableContainer>
+ {!isEmpty && (
<Table>
- <THead>
- <Tr>
- <Th>Name</Th>
- <Th className="w-5" />
- </Tr>
- </THead>
- <TBody>
- {isPending && <TableSkeleton columns={2} innerKey="identities" />}
+ <TableHeader>
+ <TableRow>
+ <TableHead>Name</TableHead>
+ <TableHead variant="action" />
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {isPending && <V3TableSkeleton columns={2} name="identities" />}
{!isPending &&
identities?.map(({ name, id, isInstanceAdmin }) => (
- <Tr key={`identity-${id}`} className="w-full">
- <Td>
+ <TableRow key={`identity-${id}`} className="w-full">
+ <TableCell>
{name}
{isInstanceAdmin && (
<Badge variant="info" className="ml-2">
@@ -118,14 +123,14 @@ const IdentityPanelTable = ({
Server Admin
</Badge>
)}
- </Td>
- <Td>
+ </TableCell>
+ <TableCell variant="action">
{isInstanceAdmin && (
<div className="flex justify-end">
<DropdownMenu>
<DropdownMenuTrigger asChild>
- <IconButton ariaLabel="Options" size="xs" variant="plain">
- <FontAwesomeIcon icon={faEllipsisV} />
+ <IconButton aria-label="Options" size="xs" variant="ghost">
+ <EllipsisVerticalIcon />
</IconButton>
</DropdownMenuTrigger>
<DropdownMenuContent sideOffset={2} align="end">
@@ -137,30 +142,23 @@ const IdentityPanelTable = ({
id
});
}}
- icon={
- <div className="relative">
- <FontAwesomeIcon icon={faShieldHalved} />
- <FontAwesomeIcon
- className="absolute -right-1 -bottom-[0.01rem]"
- size="2xs"
- icon={faXmark}
- />
- </div>
- }
>
+ <ShieldXIcon />
Remove Server Admin
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div>
)}
- </Td>
- </Tr>
+ </TableCell>
+ </TableRow>
))}
- </TBody>
+ </TableBody>
</Table>
- {!isPending && isEmpty && <EmptyState title="No identities found" icon={faWrench} />}
- </TableContainer>
+ )}
+ {!isPending && isEmpty && (
+ <V3TableEmptyState title="No identities found" icon={WrenchIcon} />
+ )}
{!isPending && totalCount > 0 && (
<Pagination
count={totalCount}
@@ -198,27 +196,25 @@ export const MachineIdentitiesTable = () => {
};
return (
- <div className="mb-6 rounded-lg border border-border bg-card p-5 text-foreground">
- <div className="mb-4 flex items-center justify-between">
- <div>
- <p className="text-xl font-medium text-foreground">Machine Identities</p>
- <p className="text-sm text-label-secondary">
- Manage machine identities across your instance.
- </p>
- </div>
- </div>
- <IdentityPanelTable handlePopUpOpen={handlePopUpOpen} />
- <DeleteActionModal
+ <Card className="mb-6">
+ <CardHeader>
+ <CardTitle>Machine Identities</CardTitle>
+ <CardDescription>Manage machine identities across your instance.</CardDescription>
+ </CardHeader>
+ <CardContent>
+ <IdentityPanelTable handlePopUpOpen={handlePopUpOpen} />
+ </CardContent>
+ <ConfirmActionDialog
isOpen={popUp.removeServerAdmin.isOpen}
title={`Are you sure you want to remove Server Admin permissions from ${
(popUp?.removeServerAdmin?.data as { name: string })?.name || ""
}?`}
- subTitle=""
- onChange={(isOpen) => handlePopUpToggle("removeServerAdmin", isOpen)}
- deleteKey="confirm"
- onDeleteApproved={handleRemoveServerAdmin}
- buttonText="Remove Access"
+ onOpenChange={(isOpen) => handlePopUpToggle("removeServerAdmin", isOpen)}
+ confirmationKey="confirm"
+ description="You can grant Server Admin access again later."
+ onConfirm={handleRemoveServerAdmin}
+ confirmLabel="Remove Access"
/>
- </div>
+ </Card>
);
};
diff --git a/frontend/src/pages/admin/ResourceOverviewPage/components/OrganizationsTable.tsx b/frontend/src/pages/admin/ResourceOverviewPage/components/OrganizationsTable.tsx
index b9816e1243..a59c74a46f 100644
--- a/frontend/src/pages/admin/ResourceOverviewPage/components/OrganizationsTable.tsx
+++ b/frontend/src/pages/admin/ResourceOverviewPage/components/OrganizationsTable.tsx
@@ -1,28 +1,59 @@
import { useMemo, useState } from "react";
-import {
- faArrowDown,
- faArrowUp,
- faBuilding,
- faEllipsisV,
- faEnvelope,
- faEye,
- faMagnifyingGlass,
- faPlus,
- faTrash,
- faUserCheck,
- faUserMinus,
- faUserPlus,
- faUsers,
- faUserXmark,
- faWarning
-} from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { useNavigate } from "@tanstack/react-router";
-import { CircleQuestionMarkIcon } from "lucide-react";
+import {
+ ArrowDownIcon,
+ ArrowUpIcon,
+ Building2Icon,
+ CircleQuestionMarkIcon,
+ EllipsisVerticalIcon,
+ EyeIcon,
+ MailIcon,
+ PlusIcon,
+ SearchIcon,
+ Trash2Icon,
+ TriangleAlertIcon,
+ UserCheckIcon,
+ UserMinusIcon,
+ UserPlusIcon,
+ UsersIcon,
+ UserXIcon
+} from "lucide-react";
import { twMerge } from "tailwind-merge";
import { createNotification } from "@app/components/notifications";
-import { Badge, Pagination } from "@app/components/v3";
+import {
+ Badge,
+ Button,
+ Card,
+ CardAction,
+ CardContent,
+ CardDescription,
+ CardHeader,
+ CardTitle,
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogHeader,
+ DialogTitle,
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+ IconButton,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupInput,
+ Pagination,
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger
+} from "@app/components/v3";
import { useUser } from "@app/context";
import { OrgMembershipRole } from "@app/helpers/roles";
import {
@@ -43,30 +74,8 @@ import { OrganizationWithProjects } from "@app/hooks/api/admin/types";
import { OrderByDirection } from "@app/hooks/api/generic/types";
import { OrgMembershipStatus } from "@app/hooks/api/organization/types";
import { UsePopUpState } from "@app/hooks/usePopUp";
-import {
- EmptyState,
- Table,
- TableContainer,
- TableSkeleton,
- TBody,
- Td,
- Th,
- THead,
- Tr
-} from "@app/pages/admin/components/AdminTable";
-import {
- Button,
- DeleteActionModal,
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
- IconButton,
- Input,
- Modal,
- ModalContent,
- Tooltip
-} from "@app/pages/admin/components/AdminV3Adapters";
+import { ConfirmActionDialog } from "@app/pages/admin/components/ConfirmActionDialog";
+import { V3TableEmptyState, V3TableSkeleton } from "@app/pages/admin/components/V3TableHelpers";
import { AddOrganizationModal } from "@app/pages/admin/ResourceOverviewPage/components/AddOrganizationModal";
enum MembersOrderBy {
@@ -187,86 +196,88 @@ const ViewMembersModalContent = ({
return (
<>
- <Input
- aria-label="Search organization members"
- value={search}
- onChange={(e) => setSearch(e.target.value)}
- leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
- placeholder="Search members..."
- />
- <TableContainer
- className={twMerge(
- "mt-4 flex flex-1 flex-col bg-container",
- Boolean(filteredMembers.length) && "rounded-b-none"
- )}
- >
- <Table className="overflow-y-auto bg-container">
- <THead className="sticky top-0 z-50">
- <Tr>
- <Th className="w-1/3 border-none bg-container p-0">
+ <InputGroup>
+ <InputGroupAddon>
+ <SearchIcon />
+ </InputGroupAddon>
+ <InputGroupInput
+ aria-label="Search organization members"
+ value={search}
+ onChange={(e) => setSearch(e.target.value)}
+ placeholder="Search members..."
+ />
+ </InputGroup>
+ {Boolean(filteredMembers.length) && (
+ <Table
+ className="overflow-y-auto bg-container"
+ containerClassName={twMerge(
+ "mt-4 flex flex-1 flex-col bg-container",
+ Boolean(filteredMembers.length) && "rounded-b-none"
+ )}
+ >
+ <TableHeader className="sticky top-0 z-50">
+ <TableRow>
+ <TableHead className="w-1/3 border-none bg-container p-0">
<div className="flex h-12 w-full items-center border-b border-border px-3 py-2.5">
Name
<IconButton
- variant="plain"
+ variant="ghost"
className={`ml-2 ${orderBy === MembersOrderBy.Name ? "" : "opacity-30"}`}
- ariaLabel="sort"
+ aria-label="sort"
onClick={() => handleSort(MembersOrderBy.Name)}
>
- <FontAwesomeIcon
- icon={
- orderDirection === OrderByDirection.DESC && orderBy === MembersOrderBy.Name
- ? faArrowUp
- : faArrowDown
- }
- />
+ {orderDirection === OrderByDirection.DESC && orderBy === MembersOrderBy.Name ? (
+ <ArrowUpIcon />
+ ) : (
+ <ArrowDownIcon />
+ )}
</IconButton>
</div>
- </Th>
- <Th className="w-1/3 border-none bg-container p-0">
+ </TableHead>
+ <TableHead className="w-1/3 border-none bg-container p-0">
<div className="flex h-12 w-full items-center border-b border-border px-3 py-2.5">
Email
<IconButton
- variant="plain"
+ variant="ghost"
className={`ml-2 ${orderBy === MembersOrderBy.Email ? "" : "opacity-30"}`}
- ariaLabel="sort"
+ aria-label="sort"
onClick={() => handleSort(MembersOrderBy.Email)}
>
- <FontAwesomeIcon
- icon={
- orderDirection === OrderByDirection.DESC && orderBy === MembersOrderBy.Email
- ? faArrowUp
- : faArrowDown
- }
- />
+ {orderDirection === OrderByDirection.DESC &&
+ orderBy === MembersOrderBy.Email ? (
+ <ArrowUpIcon />
+ ) : (
+ <ArrowDownIcon />
+ )}
</IconButton>
</div>
- </Th>
- <Th className="w-1/4 border-none bg-container p-0">
+ </TableHead>
+ <TableHead className="w-1/4 border-none bg-container p-0">
<div className="flex h-12 w-full items-center border-b border-border px-3 py-2.5">
Role
</div>
- </Th>
- <Th className="w-5 border-none bg-container p-0">
+ </TableHead>
+ <TableHead className="w-5 border-none bg-container p-0">
<div className="flex h-12 w-full items-center border-b border-border px-3 py-2.5" />
- </Th>
- </Tr>
- </THead>
- <TBody>
+ </TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
{filteredMembers.slice(offset, perPage * page).map((member) => {
const { username, email, firstName, lastName, id } = member.user;
const { role, status } = member;
const name = firstName || lastName ? `${firstName} ${lastName}` : null;
return (
- <Tr key={`user-${id}`} className="w-full">
- <Td className="max-w-0">
+ <TableRow key={`user-${id}`} className="w-full">
+ <TableCell className="max-w-0">
<div className="flex items-center">
<p className="truncate">
{name ?? <span className="text-muted">Not Set</span>}
</p>
</div>
- </Td>
- <Td className="max-w-0">
+ </TableCell>
+ <TableCell className="max-w-0">
<div className="flex items-center">
<p className="truncate">{username || email}</p>
{role === OrgMembershipRole.Admin &&
@@ -274,46 +285,51 @@ const ViewMembersModalContent = ({
<Button
isDisabled={resendOrgInvite.isPending}
className="ml-2 font-normal"
- colorSchema="primary"
- variant="outline_bg"
+ variant="outline"
size="xs"
- isLoading={
+ isPending={
resendOrgInvite.isPending && resendInviteId === member.membershipId
}
- leftIcon={<FontAwesomeIcon icon={faEnvelope} />}
onClick={(e) => {
onResendInvite(member.membershipId);
e.stopPropagation();
}}
>
+ <MailIcon />
Resend Invite
</Button>
)}
</div>
- </Td>
- <Td>
+ </TableCell>
+ <TableCell>
<div className="flex max-w-32">
- <Tooltip
- content={member.roleId ? "This member has a custom role assigned." : ""}
- >
+ {member.roleId ? (
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Badge isTruncatable variant="neutral">
+ <span className="capitalize">{member.role.replace("-", " ")}</span>
+ <CircleQuestionMarkIcon />
+ </Badge>
+ </TooltipTrigger>
+ <TooltipContent>This member has a custom role assigned.</TooltipContent>
+ </Tooltip>
+ ) : (
<Badge isTruncatable variant="neutral">
<span className="capitalize">{member.role.replace("-", " ")}</span>
- {Boolean(member.roleId) && <CircleQuestionMarkIcon />}
</Badge>
- </Tooltip>
+ )}
</div>
- </Td>
- <Td>
+ </TableCell>
+ <TableCell>
<div className="flex justify-end">
<DropdownMenu>
<DropdownMenuTrigger asChild>
- <IconButton ariaLabel="Options" size="xs" variant="plain">
- <FontAwesomeIcon icon={faEllipsisV} />
+ <IconButton aria-label="Options" size="xs" variant="ghost">
+ <EllipsisVerticalIcon />
</IconButton>
</DropdownMenuTrigger>
<DropdownMenuContent sideOffset={2} align="end">
<DropdownMenuItem
- icon={<FontAwesomeIcon icon={faUserMinus} />}
onClick={() =>
handlePopUpOpen("deleteOrganizationMembership", {
membershipId: member.membershipId,
@@ -323,39 +339,37 @@ const ViewMembersModalContent = ({
})
}
>
+ <UserMinusIcon />
Remove From Organization
</DropdownMenuItem>
<DropdownMenuItem
- icon={<FontAwesomeIcon icon={faUserXmark} />}
onClick={() =>
handlePopUpOpen("deleteUser", {
userId: member.user.id
})
}
>
+ <UserXIcon />
Delete User
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div>
- </Td>
- </Tr>
+ </TableCell>
+ </TableRow>
);
})}
- </TBody>
+ </TableBody>
</Table>
- {!filteredMembers.length && (
- <EmptyState
- className="my-auto bg-container"
- title={
- members.length
- ? "No organization users match search..."
- : "No organization users found"
- }
- icon={faUsers}
- />
- )}
- </TableContainer>
+ )}
+ {!filteredMembers.length && (
+ <V3TableEmptyState
+ title={
+ members.length ? "No organization users match search..." : "No organization users found"
+ }
+ icon={UsersIcon}
+ />
+ )}
{Boolean(filteredMembers.length) && (
<Pagination
className="rounded-b-md border border-t-0 border-border bg-container"
@@ -385,19 +399,20 @@ const ViewMembersModal = ({
) => void;
}) => {
return (
- <Modal isOpen={isOpen} onOpenChange={onOpenChange}>
- <ModalContent
+ <Dialog open={isOpen} onOpenChange={onOpenChange}>
+ <DialogContent
onOpenAutoFocus={(event) => {
event.preventDefault();
}}
- title="Organization Members"
- subTitle="View the members of the organization."
- className="max-h-[calc(100vh-2rem)] sm:max-w-4xl"
- bodyClassName="flex flex-col overflow-hidden"
+ className="flex max-h-[calc(100vh-2rem)] flex-col overflow-hidden sm:max-w-4xl"
>
+ <DialogHeader>
+ <DialogTitle>Organization Members</DialogTitle>
+ <DialogDescription>View the members of the organization.</DialogDescription>
+ </DialogHeader>
<ViewMembersModalContent popUp={popUp} handlePopUpOpen={handlePopUpOpen} />
- </ModalContent>
- </Modal>
+ </DialogContent>
+ </Dialog>
);
};
@@ -489,34 +504,37 @@ const OrganizationsPanelTable = ({
return (
<>
- <Input
- aria-label="Search organizations"
- value={searchOrganizationsFilter}
- onChange={(e) => setSearchOrganizationsFilter(e.target.value)}
- leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
- placeholder="Search organizations..."
- className="flex-1"
- />
+ <InputGroup>
+ <InputGroupAddon>
+ <SearchIcon />
+ </InputGroupAddon>
+ <InputGroupInput
+ aria-label="Search organizations"
+ value={searchOrganizationsFilter}
+ onChange={(e) => setSearchOrganizationsFilter(e.target.value)}
+ placeholder="Search organizations..."
+ />
+ </InputGroup>
<div className="mt-4">
- <TableContainer>
+ {!isEmpty && (
<Table>
- <THead>
- <Tr>
- <Th className="w-1/2">Name</Th>
- <Th className="w-1/3">Members</Th>
- <Th className="w-1/3">Projects</Th>
- <Th className="w-5" />
- </Tr>
- </THead>
- <TBody>
- {isPending && <TableSkeleton columns={4} innerKey="organizations" />}
+ <TableHeader>
+ <TableRow>
+ <TableHead className="w-1/2">Name</TableHead>
+ <TableHead className="w-1/3">Members</TableHead>
+ <TableHead className="w-1/3">Projects</TableHead>
+ <TableHead variant="action" />
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {isPending && <V3TableSkeleton columns={4} name="organizations" />}
{!isPending &&
organizations?.map((org) => {
const isMember = org.members.find((member) => member.user.id === user.id);
return (
- <Tr key={`org-${org.id}`} className="w-full">
- <Td className="w-1/2 max-w-0">
+ <TableRow key={`org-${org.id}`} className="w-full">
+ <TableCell className="w-1/2 max-w-0">
<div className="flex items-center gap-x-1.5">
{org.name ? (
<p className="truncate">{org.name}</p>
@@ -524,8 +542,8 @@ const OrganizationsPanelTable = ({
<span className="text-muted">Not Set</span>
)}
</div>
- </Td>
- <Td className="w-1/3">
+ </TableCell>
+ <TableCell className="w-1/3">
<button
type="button"
onClick={() =>
@@ -535,8 +553,11 @@ const OrganizationsPanelTable = ({
}
className="flex items-center hover:underline"
>
- <Tooltip className="text-center" content="View Members">
- <FontAwesomeIcon icon={faEye} className="mr-1.5 text-label" size="sm" />
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <EyeIcon className="mr-1.5 size-4 text-accent" />
+ </TooltipTrigger>
+ <TooltipContent>View Members</TooltipContent>
</Tooltip>
{org.members.length} {org.members.length === 1 ? "Member" : "Members"}
{!org.members.some(
@@ -544,37 +565,36 @@ const OrganizationsPanelTable = ({
member.role === OrgMembershipRole.Admin &&
member.status === OrgMembershipStatus.Accepted
) && (
- <Tooltip content="No admins have accepted their invitations.">
- <div className="ml-1.5">
- <FontAwesomeIcon className="text-warning" icon={faWarning} />
- </div>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <TriangleAlertIcon className="ml-1.5 size-4 text-warning" />
+ </TooltipTrigger>
+ <TooltipContent>
+ No admins have accepted their invitations.
+ </TooltipContent>
</Tooltip>
)}
</button>
- </Td>
- <Td className="w-1/3">
+ </TableCell>
+ <TableCell className="w-1/3">
{org.projects.length} {org.projects.length === 1 ? "Project" : "Projects"}
- </Td>
- <Td>
+ </TableCell>
+ <TableCell variant="action">
<div className="flex items-center justify-end gap-1">
{isMember && (
- <Tooltip
- className="text-center"
- content="You are a member of this organization"
- >
- <div className="flex size-7 items-center justify-center">
- <FontAwesomeIcon
- className="text-muted"
- icon={faUserCheck}
- size="sm"
- />
- </div>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <div className="flex size-7 items-center justify-center">
+ <UserCheckIcon className="size-4 text-muted" />
+ </div>
+ </TooltipTrigger>
+ <TooltipContent>You are a member of this organization</TooltipContent>
</Tooltip>
)}
<DropdownMenu>
<DropdownMenuTrigger asChild>
- <IconButton ariaLabel="Options" size="xs" variant="plain">
- <FontAwesomeIcon icon={faEllipsisV} />
+ <IconButton aria-label="Options" size="xs" variant="ghost">
+ <EllipsisVerticalIcon />
</IconButton>
</DropdownMenuTrigger>
<DropdownMenuContent sideOffset={2} align="end">
@@ -584,8 +604,8 @@ const OrganizationsPanelTable = ({
e.stopPropagation();
handleAccessOrg(org.id);
}}
- icon={<FontAwesomeIcon icon={faUserPlus} />}
>
+ <UserPlusIcon />
Join Organization
</DropdownMenuItem>
)}
@@ -597,21 +617,24 @@ const OrganizationsPanelTable = ({
orgName: org.name
});
}}
- icon={<FontAwesomeIcon icon={faTrash} />}
+ variant="danger"
>
+ <Trash2Icon />
Delete Organization
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div>
- </Td>
- </Tr>
+ </TableCell>
+ </TableRow>
);
})}
- </TBody>
+ </TableBody>
</Table>
- {!isPending && isEmpty && <EmptyState title="No organizations found" icon={faBuilding} />}
- </TableContainer>
+ )}
+ {!isPending && isEmpty && (
+ <V3TableEmptyState title="No organizations found" icon={Building2Icon} />
+ )}
{!isPending && totalCount > 0 && (
<Pagination
count={totalCount}
@@ -695,60 +718,58 @@ export const OrganizationsTable = () => {
};
return (
- <div className="mb-6 rounded-lg border border-border bg-card p-5 text-foreground">
- <div className="mb-4 flex items-center justify-between">
- <div>
- <p className="text-xl font-medium text-foreground">Organizations</p>
- <p className="text-sm text-label-secondary">
- Manage, join and view organizations across your instance.
- </p>
- </div>
- <Button
- colorSchema="secondary"
- onClick={() => handlePopUpOpen("createOrganization")}
- leftIcon={<FontAwesomeIcon icon={faPlus} />}
- >
- Add Organization
- </Button>
- </div>
- <OrganizationsPanelTable
- popUp={popUp}
- handlePopUpOpen={handlePopUpOpen}
- handlePopUpToggle={handlePopUpToggle}
- />
- <DeleteActionModal
+ <Card className="mb-6">
+ <CardHeader>
+ <CardTitle>Organizations</CardTitle>
+ <CardDescription>Manage, join and view organizations across your instance.</CardDescription>
+ <CardAction>
+ <Button variant="neutral" onClick={() => handlePopUpOpen("createOrganization")}>
+ <PlusIcon />
+ Add Organization
+ </Button>
+ </CardAction>
+ </CardHeader>
+ <CardContent>
+ <OrganizationsPanelTable
+ popUp={popUp}
+ handlePopUpOpen={handlePopUpOpen}
+ handlePopUpToggle={handlePopUpToggle}
+ />
+ </CardContent>
+ <ConfirmActionDialog
isOpen={popUp.deleteOrganization.isOpen}
- deleteKey="delete"
+ confirmationKey="delete"
title={`Are you sure you want to delete organization ${
(popUp?.deleteOrganization?.data as { orgName: string })?.orgName || ""
}?`}
- onChange={(isOpen) => handlePopUpToggle("deleteOrganization", isOpen)}
- onDeleteApproved={handleDeleteOrganization}
+ onOpenChange={(isOpen) => handlePopUpToggle("deleteOrganization", isOpen)}
+ onConfirm={handleDeleteOrganization}
/>
- <DeleteActionModal
+ <ConfirmActionDialog
isOpen={popUp.deleteOrganizationMembership.isOpen}
- deleteKey="delete"
+ confirmationKey="delete"
title={`Are you sure you want to remove ${
(popUp?.deleteOrganizationMembership?.data as { username: string })?.username || ""
} from organization ${
(popUp?.deleteOrganizationMembership?.data as { orgName: string })?.orgName || ""
}?`}
- onChange={(isOpen) => handlePopUpToggle("deleteOrganizationMembership", isOpen)}
- onDeleteApproved={handleDeleteOrganizationMembership}
+ onOpenChange={(isOpen) => handlePopUpToggle("deleteOrganizationMembership", isOpen)}
+ description="The user will lose access to this organization. You can add them again later."
+ onConfirm={handleDeleteOrganizationMembership}
/>
- <DeleteActionModal
+ <ConfirmActionDialog
isOpen={popUp.deleteUser.isOpen}
- deleteKey="delete"
+ confirmationKey="delete"
title={`Are you sure you want to delete user ${
(popUp?.deleteUser?.data as { username: string })?.username || ""
}?`}
- onChange={(isOpen) => handlePopUpToggle("deleteUser", isOpen)}
- onDeleteApproved={handleDeleteUser}
+ onOpenChange={(isOpen) => handlePopUpToggle("deleteUser", isOpen)}
+ onConfirm={handleDeleteUser}
/>
<AddOrganizationModal
isOpen={popUp.createOrganization.isOpen}
onOpenChange={(isOpen) => handlePopUpToggle("createOrganization", isOpen)}
/>
- </div>
+ </Card>
);
};
diff --git a/frontend/src/pages/admin/ResourceOverviewPage/components/UserIdentitiesTable.tsx b/frontend/src/pages/admin/ResourceOverviewPage/components/UserIdentitiesTable.tsx
index d34028ff65..dce902b750 100644
--- a/frontend/src/pages/admin/ResourceOverviewPage/components/UserIdentitiesTable.tsx
+++ b/frontend/src/pages/admin/ResourceOverviewPage/components/UserIdentitiesTable.tsx
@@ -1,23 +1,50 @@
import { Dispatch, SetStateAction, useState } from "react";
import {
- faCheckCircle,
- faEllipsisV,
- faFilter,
- faMagnifyingGlass,
- faShieldHalved,
- faTrash,
- faUsers,
- faUserShield,
- faUserXmark,
- faXmark
-} from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { AlertTriangleIcon, UserCogIcon } from "lucide-react";
-import { twMerge } from "tailwind-merge";
+ AlertTriangleIcon,
+ EllipsisVerticalIcon,
+ FilterIcon,
+ SearchIcon,
+ ShieldCheckIcon,
+ ShieldOffIcon,
+ Trash2Icon,
+ UserCogIcon,
+ UserRoundXIcon,
+ UsersIcon
+} from "lucide-react";
import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
import { createNotification } from "@app/components/notifications";
-import { Badge, Button as V3Button, Pagination, SelectedActionBar } from "@app/components/v3";
+import {
+ Badge,
+ Button,
+ Card,
+ CardContent,
+ CardDescription,
+ CardHeader,
+ CardTitle,
+ Checkbox,
+ DropdownMenu,
+ DropdownMenuCheckboxItem,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuLabel,
+ DropdownMenuTrigger,
+ IconButton,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupInput,
+ Pagination,
+ SelectedActionBar,
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger
+} from "@app/components/v3";
import { useSubscription, useUser } from "@app/context";
import {
getUserTablePreference,
@@ -34,30 +61,8 @@ import {
} from "@app/hooks/api";
import { User } from "@app/hooks/api/users/types";
import { UsePopUpState } from "@app/hooks/usePopUp";
-import {
- EmptyState,
- Table,
- TableContainer,
- TableSkeleton,
- TBody,
- Td,
- Th,
- THead,
- Tr
-} from "@app/pages/admin/components/AdminTable";
-import {
- Button,
- Checkbox,
- DeleteActionModal,
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuLabel,
- DropdownMenuTrigger,
- IconButton,
- Input,
- Tooltip
-} from "@app/pages/admin/components/AdminV3Adapters";
+import { ConfirmActionDialog } from "@app/pages/admin/components/ConfirmActionDialog";
+import { V3TableEmptyState, V3TableSkeleton } from "@app/pages/admin/components/V3TableHelpers";
const UserPanelTable = ({
handlePopUpOpen,
@@ -120,48 +125,47 @@ const UserPanelTable = ({
return (
<>
<div className="flex gap-2">
- <Input
- aria-label="Search users"
- value={searchUserFilter}
- onChange={(e) => setSearchUserFilter(e.target.value)}
- leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
- placeholder="Search users..."
- className="flex-1"
- />
+ <InputGroup className="flex-1">
+ <InputGroupAddon>
+ <SearchIcon />
+ </InputGroupAddon>
+ <InputGroupInput
+ aria-label="Search users"
+ value={searchUserFilter}
+ onChange={(e) => setSearchUserFilter(e.target.value)}
+ placeholder="Search users..."
+ />
+ </InputGroup>
<DropdownMenu>
<DropdownMenuTrigger asChild>
- <V3Button
- aria-label="Filter Users"
- variant="outline"
- className={twMerge("px-3", isTableFiltered && "border-project/50 text-project")}
+ <IconButton
+ aria-label="Filter users by access level"
+ variant={isTableFiltered ? "neutral" : "outline"}
>
- <FontAwesomeIcon icon={faFilter} />
- </V3Button>
+ <FilterIcon />
+ </IconButton>
</DropdownMenuTrigger>
- <DropdownMenuContent align="end" className="p-0">
- <DropdownMenuLabel>Filter By</DropdownMenuLabel>
- <DropdownMenuItem
+ <DropdownMenuContent align="end">
+ <DropdownMenuLabel>Filter by Access Level</DropdownMenuLabel>
+ <DropdownMenuCheckboxItem
+ checked={adminsOnly}
onClick={(e) => {
e.preventDefault();
setAdminsOnly(!adminsOnly);
}}
- icon={adminsOnly && <FontAwesomeIcon icon={faCheckCircle} />}
- iconPos="right"
>
- <div className="flex items-center gap-x-2">
- <FontAwesomeIcon icon={faUserShield} className="text-warning" />
- <span>Server Admins</span>
- </div>
- </DropdownMenuItem>
+ <ShieldCheckIcon />
+ Server Admins
+ </DropdownMenuCheckboxItem>
</DropdownMenuContent>
</DropdownMenu>
</div>
<div className="mt-4">
- <TableContainer>
+ {!isEmpty && (
<Table>
- <THead>
- <Tr>
- <Th className="w-5">
+ <TableHeader>
+ <TableRow>
+ <TableHead className="w-5">
<Checkbox
aria-label="Select all users on this page"
id="member-page-select"
@@ -180,14 +184,14 @@ const UserPanelTable = ({
}
}}
/>
- </Th>
- <Th className="w-5/12">Name</Th>
- <Th className="w-1/2">Username</Th>
- <Th className="w-2/12" />
- </Tr>
- </THead>
- <TBody>
- {isPending && <TableSkeleton columns={4} innerKey="users" />}
+ </TableHead>
+ <TableHead className="w-5/12">Name</TableHead>
+ <TableHead className="w-1/2">Username</TableHead>
+ <TableHead variant="action" />
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {isPending && <V3TableSkeleton columns={4} name="users" />}
{!isPending &&
users?.map((user) => {
const { username, email, firstName, lastName, id, superAdmin } = user;
@@ -196,8 +200,8 @@ const UserPanelTable = ({
const isSelected = selectedUserIds.includes(id);
return (
- <Tr key={`user-${id}`} className="w-full">
- <Td>
+ <TableRow key={`user-${id}`} className="w-full">
+ <TableCell>
<Checkbox
aria-label={`Select user ${username || email}`}
id={`select-user-${id}`}
@@ -209,8 +213,8 @@ const UserPanelTable = ({
);
}}
/>
- </Td>
- <Td className="w-5/12 max-w-0">
+ </TableCell>
+ <TableCell className="w-5/12 max-w-0">
<div className="flex items-center">
<p className="truncate">
{name ?? <span className="text-muted">Not Set</span>}
@@ -222,16 +226,16 @@ const UserPanelTable = ({
</Badge>
)}
</div>
- </Td>
- <Td className="w-5/12 max-w-0">
+ </TableCell>
+ <TableCell className="w-5/12 max-w-0">
<p className="truncate">{username || email}</p>
- </Td>
- <Td>
+ </TableCell>
+ <TableCell variant="action">
<div className="flex justify-end">
<DropdownMenu>
<DropdownMenuTrigger asChild>
- <IconButton ariaLabel="Options" size="xs" variant="plain">
- <FontAwesomeIcon icon={faEllipsisV} />
+ <IconButton aria-label="Options" size="xs" variant="ghost">
+ <EllipsisVerticalIcon />
</IconButton>
</DropdownMenuTrigger>
<DropdownMenuContent sideOffset={2} align="end">
@@ -243,13 +247,12 @@ const UserPanelTable = ({
id
});
}}
- icon={<FontAwesomeIcon icon={faUserXmark} />}
>
+ <UserRoundXIcon />
Remove User
</DropdownMenuItem>
{!superAdmin && (
<DropdownMenuItem
- icon={<FontAwesomeIcon icon={faUserShield} />}
onClick={(e) => {
e.stopPropagation();
if (!subscription?.instanceUserManagement) {
@@ -266,21 +269,12 @@ const UserPanelTable = ({
});
}}
>
+ <ShieldCheckIcon />
Make User Server Admin
</DropdownMenuItem>
)}
{superAdmin && (
<DropdownMenuItem
- icon={
- <div className="relative">
- <FontAwesomeIcon icon={faShieldHalved} />
- <FontAwesomeIcon
- className="absolute -right-1 -bottom-[0.01rem]"
- size="2xs"
- icon={faXmark}
- />
- </div>
- }
onClick={(e) => {
e.stopPropagation();
if (!subscription?.instanceUserManagement) {
@@ -297,20 +291,21 @@ const UserPanelTable = ({
});
}}
>
+ <ShieldOffIcon />
Remove Server Admin
</DropdownMenuItem>
)}
</DropdownMenuContent>
</DropdownMenu>
</div>
- </Td>
- </Tr>
+ </TableCell>
+ </TableRow>
);
})}
- </TBody>
+ </TableBody>
</Table>
- {!isPending && isEmpty && <EmptyState title="No users found" icon={faUsers} />}
- </TableContainer>
+ )}
+ {!isPending && isEmpty && <V3TableEmptyState title="No users found" icon={UsersIcon} />}
{!isEmpty && (
<Pagination
count={totalCount}
@@ -427,9 +422,7 @@ export const UserIdentitiesTable = () => {
onClearSelection={() => setSelectedUsers([])}
>
<Button
- variant="outline_bg"
- colorSchema="danger"
- leftIcon={<FontAwesomeIcon icon={faTrash} />}
+ variant="danger"
onClick={() => {
if (!selectedUsers?.length) return;
@@ -437,44 +430,43 @@ export const UserIdentitiesTable = () => {
}}
size="xs"
>
+ <Trash2Icon />
Delete
</Button>
</SelectedActionBar>
- <div className="mb-6 rounded-lg border border-border bg-card p-5 text-foreground">
- <div className="mb-4 flex items-center justify-between">
- <div>
- <p className="text-xl font-medium text-foreground">User Identities</p>
- <p className="text-sm text-label-secondary">
- Manage user identities across your instance.
- </p>
- </div>
- </div>
- <UserPanelTable
- handlePopUpOpen={handlePopUpOpen}
- users={users}
- selectedUsers={selectedUsers}
- setSelectedUsers={setSelectedUsers}
- searchUserFilter={searchUserFilter}
- setSearchUserFilter={setSearchUserFilter}
- isPending={isPending}
- adminsOnly={adminsOnly}
- setAdminsOnly={setAdminsOnly}
- page={page}
- perPage={perPage}
- setPage={setPage}
- handlePerPageChange={handlePerPageChange}
- totalCount={totalCount}
- />
- <DeleteActionModal
+ <Card className="mb-6">
+ <CardHeader>
+ <CardTitle>User Identities</CardTitle>
+ <CardDescription>Manage user identities across your instance.</CardDescription>
+ </CardHeader>
+ <CardContent>
+ <UserPanelTable
+ handlePopUpOpen={handlePopUpOpen}
+ users={users}
+ selectedUsers={selectedUsers}
+ setSelectedUsers={setSelectedUsers}
+ searchUserFilter={searchUserFilter}
+ setSearchUserFilter={setSearchUserFilter}
+ isPending={isPending}
+ adminsOnly={adminsOnly}
+ setAdminsOnly={setAdminsOnly}
+ page={page}
+ perPage={perPage}
+ setPage={setPage}
+ handlePerPageChange={handlePerPageChange}
+ totalCount={totalCount}
+ />
+ </CardContent>
+ <ConfirmActionDialog
isOpen={popUp.removeUser.isOpen}
- deleteKey="remove"
+ confirmationKey="remove"
title={`Are you sure you want to delete User with username ${
(popUp?.removeUser?.data as { id: string; username: string })?.username || ""
}?`}
- onChange={(isOpen) => handlePopUpToggle("removeUser", isOpen)}
- onDeleteApproved={handleRemoveUser}
+ onOpenChange={(isOpen) => handlePopUpToggle("removeUser", isOpen)}
+ onConfirm={handleRemoveUser}
/>
- <DeleteActionModal
+ <ConfirmActionDialog
isOpen={popUp.upgradeToServerAdmin.isOpen}
title={`Are you sure you want to grant Server Admin permissions to ${
(
@@ -484,22 +476,22 @@ export const UserIdentitiesTable = () => {
}
)?.username || ""
}?`}
- subTitle=""
- onChange={(isOpen) => handlePopUpToggle("upgradeToServerAdmin", isOpen)}
- deleteKey="confirm"
- onDeleteApproved={handleGrantServerAdminAccess}
- buttonText="Grant Access"
+ onOpenChange={(isOpen) => handlePopUpToggle("upgradeToServerAdmin", isOpen)}
+ confirmationKey="confirm"
+ description="This grants instance-wide administrative access. You can remove it later."
+ onConfirm={handleGrantServerAdminAccess}
+ confirmLabel="Grant Access"
/>
- <DeleteActionModal
+ <ConfirmActionDialog
isOpen={popUp.removeServerAdmin.isOpen}
title={`Are you sure you want to remove Server Admin permissions from ${
(popUp?.removeServerAdmin?.data as { id: string; username: string })?.username || ""
}?`}
- subTitle=""
- onChange={(isOpen) => handlePopUpToggle("removeServerAdmin", isOpen)}
- deleteKey="confirm"
- onDeleteApproved={handleRemoveServerAdminAccess}
- buttonText="Remove Access"
+ onOpenChange={(isOpen) => handlePopUpToggle("removeServerAdmin", isOpen)}
+ confirmationKey="confirm"
+ description="You can grant Server Admin access again later."
+ onConfirm={handleRemoveServerAdminAccess}
+ confirmLabel="Remove Access"
/>
<UpgradePlanModal
paywallKey="admin.user-identities"
@@ -507,13 +499,13 @@ export const UserIdentitiesTable = () => {
onOpenChange={(isOpen) => handlePopUpToggle("upgradePlan", isOpen)}
text={popUp.upgradePlan.data?.text}
/>
- <DeleteActionModal
+ <ConfirmActionDialog
isOpen={popUp.removeUsers.isOpen}
title="Are you sure you want to delete the following users?"
- onChange={(isOpen) => handlePopUpToggle("removeUsers", isOpen)}
- deleteKey="confirm"
- onDeleteApproved={() => handleRemoveUsers()}
- buttonText="Delete"
+ onOpenChange={(isOpen) => handlePopUpToggle("removeUsers", isOpen)}
+ confirmationKey="confirm"
+ onConfirm={() => handleRemoveUsers()}
+ confirmLabel="Delete"
>
<div className="mt-4 text-sm text-muted">The following users will be deleted:</div>
<div className="mt-2 max-h-80 overflow-y-auto rounded-sm border border-border-control bg-danger/10 p-4 pl-8 text-sm text-danger">
@@ -534,11 +526,16 @@ export const UserIdentitiesTable = () => {
)}{" "}
</p>
{userId === user.id && (
- <Tooltip content="Are you sure you want to remove yourself from this instance?">
- <Badge variant="danger">
- <AlertTriangleIcon />
- Deleting Yourself
- </Badge>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Badge variant="danger">
+ <AlertTriangleIcon />
+ Deleting Yourself
+ </Badge>
+ </TooltipTrigger>
+ <TooltipContent>
+ Are you sure you want to remove yourself from this instance?
+ </TooltipContent>
</Tooltip>
)}
</div>
@@ -547,8 +544,8 @@ export const UserIdentitiesTable = () => {
})}
</ul>
</div>
- </DeleteActionModal>
- </div>
+ </ConfirmActionDialog>
+ </Card>
</>
);
};
diff --git a/frontend/src/pages/admin/components/ConfirmActionDialog.tsx b/frontend/src/pages/admin/components/ConfirmActionDialog.tsx
new file mode 100644
index 0000000000..e338d58364
--- /dev/null
+++ b/frontend/src/pages/admin/components/ConfirmActionDialog.tsx
@@ -0,0 +1,92 @@
+import { type ReactNode, useState } from "react";
+
+import {
+ Alert,
+ AlertDescription,
+ AlertDialog,
+ AlertDialogAction,
+ AlertDialogCancel,
+ AlertDialogConfirmationField,
+ AlertDialogContent,
+ AlertDialogDescription,
+ AlertDialogFooter,
+ AlertDialogHeader,
+ AlertDialogTitle
+} from "@app/components/v3";
+
+type Props = {
+ isOpen?: boolean;
+ onOpenChange: (isOpen: boolean) => void;
+ confirmationKey: string;
+ title: string;
+ description?: string;
+ onConfirm: () => Promise<void>;
+ confirmLabel?: string;
+ children?: ReactNode;
+};
+
+export const ConfirmActionDialog = ({
+ isOpen,
+ onOpenChange,
+ confirmationKey,
+ title,
+ description = "This action is irreversible.",
+ onConfirm,
+ confirmLabel = "Delete",
+ children
+}: Props) => {
+ const [isPending, setIsPending] = useState(false);
+
+ const handleConfirm = async () => {
+ setIsPending(true);
+ try {
+ await onConfirm();
+ onOpenChange(false);
+ } catch {
+ // The mutation cache reports request errors globally.
+ } finally {
+ setIsPending(false);
+ }
+ };
+
+ return (
+ <AlertDialog
+ open={isOpen}
+ confirmationValue={confirmationKey}
+ onOpenChange={(open) => {
+ if (isPending && !open) return;
+ onOpenChange(open);
+ }}
+ >
+ <AlertDialogContent>
+ <AlertDialogHeader>
+ <AlertDialogTitle>{title}</AlertDialogTitle>
+ <AlertDialogDescription asChild>
+ <Alert variant="danger" appearance="borderless">
+ <AlertDescription>{description}</AlertDescription>
+ </Alert>
+ </AlertDialogDescription>
+ </AlertDialogHeader>
+ <AlertDialogConfirmationField
+ onConfirm={() => {
+ handleConfirm().catch(() => undefined);
+ }}
+ />
+ {children}
+ <AlertDialogFooter>
+ <AlertDialogCancel isDisabled={isPending}>Cancel</AlertDialogCancel>
+ <AlertDialogAction
+ variant="danger"
+ isPending={isPending}
+ onClick={(event) => {
+ event.preventDefault();
+ handleConfirm().catch(() => undefined);
+ }}
+ >
+ {confirmLabel}
+ </AlertDialogAction>
+ </AlertDialogFooter>
+ </AlertDialogContent>
+ </AlertDialog>
+ );
+};
diff --git a/frontend/src/pages/admin/components/V3TableHelpers.tsx b/frontend/src/pages/admin/components/V3TableHelpers.tsx
new file mode 100644
index 0000000000..3752ebc6c3
--- /dev/null
+++ b/frontend/src/pages/admin/components/V3TableHelpers.tsx
@@ -0,0 +1,47 @@
+import type { LucideIcon } from "lucide-react";
+
+import {
+ Empty,
+ EmptyHeader,
+ EmptyMedia,
+ EmptyTitle,
+ Skeleton,
+ TableCell,
+ TableRow
+} from "@app/components/v3";
+
+const SKELETON_ROWS = ["one", "two", "three", "four", "five"];
+const SKELETON_COLUMNS = ["one", "two", "three", "four", "five", "six", "seven", "eight"];
+
+export const V3TableSkeleton = ({
+ columns,
+ name,
+ rows = 5
+}: {
+ columns: number;
+ name: string;
+ rows?: number;
+}) => (
+ <>
+ {SKELETON_ROWS.slice(0, rows).map((row) => (
+ <TableRow key={`${name}-skeleton-${row}`}>
+ {SKELETON_COLUMNS.slice(0, columns).map((column) => (
+ <TableCell key={`${name}-skeleton-${row}-${column}`}>
+ <Skeleton className="h-5 w-full" />
+ </TableCell>
+ ))}
+ </TableRow>
+ ))}
+ </>
+);
+
+export const V3TableEmptyState = ({ title, icon: Icon }: { title: string; icon: LucideIcon }) => (
+ <Empty className="border">
+ <EmptyHeader>
+ <EmptyMedia variant="icon">
+ <Icon />
+ </EmptyMedia>
+ <EmptyTitle>{title}</EmptyTitle>
+ </EmptyHeader>
+ </Empty>
+);