-
-
Notifications
You must be signed in to change notification settings - Fork 380
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feature: Allow reseting user password, change their roles and create …
…new users. Fixes #495 (#567) * How do I set the variable "user" or "system" for AI inference #262 changed from system to user * Make Myself an Admin #560 added user management functionality to the admin page * A bunch of UI fixes and simplifications --------- Co-authored-by: Mohamed Bassem <me@mbassem.com>
- Loading branch information
1 parent
0debc6b
commit 9a56e58
Showing
9 changed files
with
711 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,213 @@ | ||
import { useEffect, useState } from "react"; | ||
import { ActionButton } from "@/components/ui/action-button"; | ||
import { Button } from "@/components/ui/button"; | ||
import { | ||
Dialog, | ||
DialogClose, | ||
DialogContent, | ||
DialogFooter, | ||
DialogHeader, | ||
DialogTitle, | ||
DialogTrigger, | ||
} from "@/components/ui/dialog"; | ||
import { | ||
Form, | ||
FormControl, | ||
FormField, | ||
FormItem, | ||
FormLabel, | ||
FormMessage, | ||
} from "@/components/ui/form"; | ||
import { Input } from "@/components/ui/input"; | ||
import { | ||
Select, | ||
SelectContent, | ||
SelectItem, | ||
SelectTrigger, | ||
SelectValue, | ||
} from "@/components/ui/select"; | ||
import { toast } from "@/components/ui/use-toast"; | ||
import { api } from "@/lib/trpc"; | ||
import { zodResolver } from "@hookform/resolvers/zod"; | ||
import { TRPCClientError } from "@trpc/client"; | ||
import { useForm } from "react-hook-form"; | ||
import { z } from "zod"; | ||
|
||
import { zAdminCreateUserSchema } from "@hoarder/shared/types/admin"; | ||
|
||
type AdminCreateUserSchema = z.infer<typeof zAdminCreateUserSchema>; | ||
|
||
export default function AddUserDialog({ | ||
children, | ||
}: { | ||
children?: React.ReactNode; | ||
}) { | ||
const apiUtils = api.useUtils(); | ||
const [isOpen, onOpenChange] = useState(false); | ||
const form = useForm<AdminCreateUserSchema>({ | ||
resolver: zodResolver(zAdminCreateUserSchema), | ||
defaultValues: { | ||
name: "", | ||
email: "", | ||
password: "", | ||
confirmPassword: "", | ||
role: "user", | ||
}, | ||
}); | ||
const { mutate, isPending } = api.admin.createUser.useMutation({ | ||
onSuccess: () => { | ||
toast({ | ||
description: "User created successfully", | ||
}); | ||
onOpenChange(false); | ||
apiUtils.users.list.invalidate(); | ||
apiUtils.admin.userStats.invalidate(); | ||
}, | ||
onError: (error) => { | ||
if (error instanceof TRPCClientError) { | ||
toast({ | ||
variant: "destructive", | ||
description: error.message, | ||
}); | ||
} else { | ||
toast({ | ||
variant: "destructive", | ||
description: "Failed to create user", | ||
}); | ||
} | ||
}, | ||
}); | ||
|
||
useEffect(() => { | ||
if (!isOpen) { | ||
form.reset(); | ||
} | ||
}, [isOpen, form]); | ||
|
||
return ( | ||
<Dialog open={isOpen} onOpenChange={onOpenChange}> | ||
<DialogTrigger asChild>{children}</DialogTrigger> | ||
<DialogContent> | ||
<DialogHeader> | ||
<DialogTitle>Add User</DialogTitle> | ||
</DialogHeader> | ||
<Form {...form}> | ||
<form onSubmit={form.handleSubmit((val) => mutate(val))}> | ||
<div className="flex w-full flex-col space-y-2"> | ||
<FormField | ||
control={form.control} | ||
name="name" | ||
render={({ field }) => ( | ||
<FormItem> | ||
<FormLabel>Name</FormLabel> | ||
<FormControl> | ||
<Input | ||
type="text" | ||
placeholder="Name" | ||
{...field} | ||
className="w-full rounded border p-2" | ||
/> | ||
</FormControl> | ||
<FormMessage /> | ||
</FormItem> | ||
)} | ||
/> | ||
<FormField | ||
control={form.control} | ||
name="email" | ||
render={({ field }) => ( | ||
<FormItem> | ||
<FormLabel>Email</FormLabel> | ||
<FormControl> | ||
<Input | ||
type="email" | ||
placeholder="Email" | ||
{...field} | ||
className="w-full rounded border p-2" | ||
/> | ||
</FormControl> | ||
<FormMessage /> | ||
</FormItem> | ||
)} | ||
/> | ||
<FormField | ||
control={form.control} | ||
name="password" | ||
render={({ field }) => ( | ||
<FormItem> | ||
<FormLabel>Password</FormLabel> | ||
<FormControl> | ||
<Input | ||
type="password" | ||
placeholder="Password" | ||
{...field} | ||
className="w-full rounded border p-2" | ||
/> | ||
</FormControl> | ||
<FormMessage /> | ||
</FormItem> | ||
)} | ||
/> | ||
<FormField | ||
control={form.control} | ||
name="confirmPassword" | ||
render={({ field }) => ( | ||
<FormItem> | ||
<FormLabel>Confirm Password</FormLabel> | ||
<FormControl> | ||
<Input | ||
type="password" | ||
placeholder="Confirm Password" | ||
{...field} | ||
className="w-full rounded border p-2" | ||
/> | ||
</FormControl> | ||
<FormMessage /> | ||
</FormItem> | ||
)} | ||
/> | ||
<FormField | ||
control={form.control} | ||
name="role" | ||
render={({ field }) => ( | ||
<FormItem> | ||
<FormLabel>Role</FormLabel> | ||
<FormControl> | ||
<Select | ||
value={field.value} | ||
onValueChange={field.onChange} | ||
> | ||
<SelectTrigger className="w-full"> | ||
<SelectValue /> | ||
</SelectTrigger> | ||
<SelectContent> | ||
<SelectItem value="user">User</SelectItem> | ||
<SelectItem value="admin">Admin</SelectItem> | ||
</SelectContent> | ||
</Select> | ||
</FormControl> | ||
<FormMessage /> | ||
</FormItem> | ||
)} | ||
/> | ||
<DialogFooter className="sm:justify-end"> | ||
<DialogClose asChild> | ||
<Button type="button" variant="secondary"> | ||
Close | ||
</Button> | ||
</DialogClose> | ||
<ActionButton | ||
type="submit" | ||
loading={isPending} | ||
disabled={isPending} | ||
> | ||
Create | ||
</ActionButton> | ||
</DialogFooter> | ||
</div> | ||
</form> | ||
</Form> | ||
</DialogContent> | ||
</Dialog> | ||
); | ||
} |
154 changes: 154 additions & 0 deletions
154
apps/web/components/dashboard/admin/ChangeRoleDialog.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,154 @@ | ||
import { useEffect, useState } from "react"; | ||
import { ActionButton } from "@/components/ui/action-button"; | ||
import { Button } from "@/components/ui/button"; | ||
import { | ||
Dialog, | ||
DialogClose, | ||
DialogContent, | ||
DialogFooter, | ||
DialogHeader, | ||
DialogTitle, | ||
DialogTrigger, | ||
} from "@/components/ui/dialog"; | ||
import { | ||
Form, | ||
FormControl, | ||
FormField, | ||
FormItem, | ||
FormLabel, | ||
FormMessage, | ||
} from "@/components/ui/form"; | ||
import { | ||
Select, | ||
SelectContent, | ||
SelectItem, | ||
SelectTrigger, | ||
SelectValue, | ||
} from "@/components/ui/select"; | ||
import { toast } from "@/components/ui/use-toast"; | ||
import { api } from "@/lib/trpc"; | ||
import { zodResolver } from "@hookform/resolvers/zod"; | ||
import { TRPCClientError } from "@trpc/client"; | ||
import { useForm } from "react-hook-form"; | ||
import { z } from "zod"; | ||
|
||
import { changeRoleSchema } from "@hoarder/shared/types/admin"; | ||
|
||
type ChangeRoleSchema = z.infer<typeof changeRoleSchema>; | ||
|
||
interface ChangeRoleDialogProps { | ||
userId: string; | ||
currentRole: "user" | "admin"; | ||
children?: React.ReactNode; | ||
} | ||
|
||
export default function ChangeRoleDialog({ | ||
userId, | ||
currentRole, | ||
children, | ||
}: ChangeRoleDialogProps) { | ||
const apiUtils = api.useUtils(); | ||
const [isOpen, onOpenChange] = useState(false); | ||
const form = useForm<ChangeRoleSchema>({ | ||
resolver: zodResolver(changeRoleSchema), | ||
defaultValues: { | ||
userId, | ||
role: currentRole, | ||
}, | ||
}); | ||
const { mutate, isPending } = api.admin.changeRole.useMutation({ | ||
onSuccess: () => { | ||
toast({ | ||
description: "Role changed successfully", | ||
}); | ||
apiUtils.users.list.invalidate(); | ||
onOpenChange(false); | ||
}, | ||
onError: (error) => { | ||
if (error instanceof TRPCClientError) { | ||
toast({ | ||
variant: "destructive", | ||
description: error.message, | ||
}); | ||
} else { | ||
toast({ | ||
variant: "destructive", | ||
description: "Failed to change role", | ||
}); | ||
} | ||
}, | ||
}); | ||
|
||
useEffect(() => { | ||
if (isOpen) { | ||
form.reset(); | ||
} | ||
}, [isOpen, form]); | ||
|
||
return ( | ||
<Dialog open={isOpen} onOpenChange={onOpenChange}> | ||
<DialogTrigger asChild>{children}</DialogTrigger> | ||
<DialogContent> | ||
<DialogTrigger asChild></DialogTrigger> | ||
<DialogHeader> | ||
<DialogTitle>Change Role</DialogTitle> | ||
</DialogHeader> | ||
<Form {...form}> | ||
<form onSubmit={form.handleSubmit((val) => mutate(val))}> | ||
<div className="flex w-full flex-col space-y-2"> | ||
<FormField | ||
control={form.control} | ||
name="role" | ||
render={({ field }) => ( | ||
<FormItem> | ||
<FormLabel>Role</FormLabel> | ||
<FormControl> | ||
<Select | ||
onValueChange={field.onChange} | ||
defaultValue={field.value} | ||
> | ||
<SelectTrigger className="w-full"> | ||
<SelectValue /> | ||
</SelectTrigger> | ||
<SelectContent> | ||
<SelectItem value="user">User</SelectItem> | ||
<SelectItem value="admin">Admin</SelectItem> | ||
</SelectContent> | ||
</Select> | ||
</FormControl> | ||
<FormMessage /> | ||
</FormItem> | ||
)} | ||
/> | ||
<FormField | ||
control={form.control} | ||
name="userId" | ||
render={({ field }) => ( | ||
<FormItem> | ||
<FormControl> | ||
<input type="hidden" {...field} /> | ||
</FormControl> | ||
</FormItem> | ||
)} | ||
/> | ||
<DialogFooter className="sm:justify-end"> | ||
<DialogClose asChild> | ||
<Button type="button" variant="secondary"> | ||
Close | ||
</Button> | ||
</DialogClose> | ||
<ActionButton | ||
type="submit" | ||
loading={isPending} | ||
disabled={isPending} | ||
> | ||
Change | ||
</ActionButton> | ||
</DialogFooter> | ||
</div> | ||
</form> | ||
</Form> | ||
</DialogContent> | ||
</Dialog> | ||
); | ||
} |
Oops, something went wrong.