more user role stuff

src/app/[orgId]/settings/access/roles/components/CreateRoleForm.tsx

@@ -0,0 +1,179 @@
+"use client";
+
+import api from "@app/api";
+import { Button } from "@app/components/ui/button";
+import {
+    Form,
+    FormControl,
+    FormField,
+    FormItem,
+    FormLabel,
+    FormMessage,
+} from "@app/components/ui/form";
+import { Input } from "@app/components/ui/input";
+import { useToast } from "@app/hooks/useToast";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { AxiosResponse } from "axios";
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+import { z } from "zod";
+import {
+    Credenza,
+    CredenzaBody,
+    CredenzaClose,
+    CredenzaContent,
+    CredenzaDescription,
+    CredenzaFooter,
+    CredenzaHeader,
+    CredenzaTitle,
+} from "@app/components/Credenza";
+import { useOrgContext } from "@app/hooks/useOrgContext";
+import { CreateRoleBody, CreateRoleResponse } from "@server/routers/role";
+
+type CreateRoleFormProps = {
+    open: boolean;
+    setOpen: (open: boolean) => void;
+    afterCreate?: (res: CreateRoleResponse) => Promise<void>;
+};
+
+const formSchema = z.object({
+    name: z.string({ message: "Name is required" }).max(32),
+    description: z.string().max(255).optional(),
+});
+
+export default function CreateRoleForm({
+    open,
+    setOpen,
+    afterCreate,
+}: CreateRoleFormProps) {
+    const { toast } = useToast();
+    const { org } = useOrgContext();
+
+    const [loading, setLoading] = useState(false);
+
+    const form = useForm<z.infer<typeof formSchema>>({
+        resolver: zodResolver(formSchema),
+        defaultValues: {
+            name: "",
+            description: "",
+        },
+    });
+
+    async function onSubmit(values: z.infer<typeof formSchema>) {
+        setLoading(true);
+
+        const res = await api
+            .put<AxiosResponse<CreateRoleResponse>>(
+                `/org/${org?.org.orgId}/role`,
+                {
+                    name: values.name,
+                    description: values.description,
+                } as CreateRoleBody
+            )
+            .catch((e) => {
+                toast({
+                    variant: "destructive",
+                    title: "Failed to create role",
+                    description:
+                        e.response?.data?.message ||
+                        "An error occurred while creating the role.",
+                });
+            });
+
+        if (res && res.status === 201) {
+            toast({
+                variant: "default",
+                title: "Role created",
+                description: "The role has been successfully created.",
+            });
+
+            if (open) {
+                setOpen(false);
+            }
+
+            if (afterCreate) {
+                afterCreate(res.data.data);
+            }
+        }
+
+        setLoading(false);
+    }
+
+    return (
+        <>
+            <Credenza
+                open={open}
+                onOpenChange={(val) => {
+                    setOpen(val);
+                    setLoading(false);
+                    form.reset();
+                }}
+            >
+                <CredenzaContent>
+                    <CredenzaHeader>
+                        <CredenzaTitle>Create Role</CredenzaTitle>
+                        <CredenzaDescription>
+                            Create a new role to group users and manage their
+                            permissions.
+                        </CredenzaDescription>
+                    </CredenzaHeader>
+                    <CredenzaBody>
+                        <Form {...form}>
+                            <form
+                                onSubmit={form.handleSubmit(onSubmit)}
+                                className="space-y-4"
+                                id="create-role-form"
+                            >
+                                <FormField
+                                    control={form.control}
+                                    name="name"
+                                    render={({ field }) => (
+                                        <FormItem>
+                                            <FormLabel>Role Name</FormLabel>
+                                            <FormControl>
+                                                <Input
+                                                    placeholder="Enter name for the role"
+                                                    {...field}
+                                                />
+                                            </FormControl>
+                                            <FormMessage />
+                                        </FormItem>
+                                    )}
+                                />
+                                <FormField
+                                    control={form.control}
+                                    name="description"
+                                    render={({ field }) => (
+                                        <FormItem>
+                                            <FormLabel>Description</FormLabel>
+                                            <FormControl>
+                                                <Input
+                                                    placeholder="Describe the role"
+                                                    {...field}
+                                                />
+                                            </FormControl>
+                                            <FormMessage />
+                                        </FormItem>
+                                    )}
+                                />
+                            </form>
+                        </Form>
+                    </CredenzaBody>
+                    <CredenzaFooter>
+                        <Button
+                            type="submit"
+                            form="create-role-form"
+                            loading={loading}
+                            disabled={loading}
+                        >
+                            Create Role
+                        </Button>
+                        <CredenzaClose asChild>
+                            <Button variant="outline">Close</Button>
+                        </CredenzaClose>
+                    </CredenzaFooter>
+                </CredenzaContent>
+            </Credenza>
+        </>
+    );
+}

src/app/[orgId]/settings/access/roles/components/RolesDataTable.tsx

@@ -51,6 +51,10 @@ export function RolesDataTable<TData, TValue>({
         state: {
             sorting,
             columnFilters,
+            pagination: {
+                pageSize: 100,
+                pageIndex: 0,
+            },
         },
     });
 

src/app/[orgId]/settings/access/roles/components/RolesTable.tsx

@@ -16,6 +16,7 @@ import { useOrgContext } from "@app/hooks/useOrgContext";
 import { useToast } from "@app/hooks/useToast";
 import { RolesDataTable } from "./RolesDataTable";
 import { Role } from "@server/db/schema";
+import CreateRoleForm from "./CreateRoleForm";
 
 export type RoleRow = Role;
 
@@ -23,8 +24,12 @@ type RolesTableProps = {
     roles: RoleRow[];
 };
 
-export default function UsersTable({ roles }: RolesTableProps) {
+export default function UsersTable({ roles: r }: RolesTableProps) {
+    const [isCreateModalOpen, setIsCreateModalOpen] = useState(false);
     const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
+
+    const [roles, setRoles] = useState<RoleRow[]>(r);
+
     const [roleToRemove, setUserToRemove] = useState<RoleRow | null>(null);
 
     const { org } = useOrgContext();
@@ -80,7 +85,7 @@ export default function UsersTable({ roles }: RolesTableProps) {
                                                 setUserToRemove(roleRow);
                                             }}
                                         >
-                                            Remove User
+                                            Delete Role
                                         </button>
                                     </DropdownMenuItem>
                                 </DropdownMenuContent>
@@ -95,7 +100,7 @@ export default function UsersTable({ roles }: RolesTableProps) {
     async function removeRole() {
         if (roleToRemove) {
             const res = await api
-                .delete(`/org/${org!.org.orgId}/role/${roleToRemove.roleId}`)
+                .delete(`/role/${roleToRemove.roleId}`)
                 .catch((e) => {
                     toast({
                         variant: "destructive",
@@ -112,6 +117,10 @@ export default function UsersTable({ roles }: RolesTableProps) {
                     title: "Role removed",
                     description: `The role ${roleToRemove.name} has been removed from the organization.`,
                 });
+
+                setRoles((prev) =>
+                    prev.filter((role) => role.roleId !== roleToRemove.roleId)
+                );
             }
         }
         setIsDeleteModalOpen(false);
@@ -119,6 +128,14 @@ export default function UsersTable({ roles }: RolesTableProps) {
 
     return (
         <>
+            <CreateRoleForm
+                open={isCreateModalOpen}
+                setOpen={setIsCreateModalOpen}
+                afterCreate={async (role) => {
+                    setRoles((prev) => [...prev, role]);
+                }}
+            />
+
             <ConfirmDeleteDialog
                 open={isDeleteModalOpen}
                 setOpen={(val) => {
@@ -148,7 +165,13 @@ export default function UsersTable({ roles }: RolesTableProps) {
                 title="Remove role from organization"
             />
 
-            <RolesDataTable columns={columns} data={roles} />
+            <RolesDataTable
+                columns={columns}
+                data={roles}
+                addRole={() => {
+                    setIsCreateModalOpen(true);
+                }}
+            />
         </>
     );
 }