Skip to content

Two coloumn view for generic-editor.tsx to support datetime fields in right panel #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 7, 2025
Merged

Two coloumn view for generic-editor.tsx to support datetime fields in right panel #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46a49d7
Update generic-editor.tsx ui to show two coloumn view when datetime f…
aahnik May 7, 2025
1fdb68e
Add UI fixes to generic editor
aahnik May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/ui/dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const DialogContent = React.forwardRef<
<DialogPrimitive.Content
ref={ref}
className={cn(
"fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
"fixed left-[50%] top-[50%] z-50 grid translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
className,
)}
{...props}
Expand Down
264 changes: 184 additions & 80 deletions mint/generic-editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,97 +118,201 @@ export function GenericEditor<T>({

return (
<Dialog open={isOpen} onOpenChange={onClose}>
<DialogContent className="sm:max-w-[425px]">
<DialogContent
className={`p-8 ${fields.some((f) => f.type === "datetime") ? "w-[1000px]" : "w-[700px]"} rounded-lg`}
>
<DialogHeader>
<DialogTitle>
{data ? `Edit ${title}` : `Add New ${title}`}
</DialogTitle>
</DialogHeader>
<form onSubmit={handleSubmit(onSubmit)}>
<div className="grid gap-4 py-4">
{fields.map((field) => (
<div key={field.name} className="space-y-2">
<Label htmlFor={field.name}>{field.label}</Label>
{field.type === "select" && field.options ? (
<Select
onValueChange={(value) => {
const event = {
target: { name: field.name, value },
};
register(field.name as any).onChange(event);
}}
defaultValue={
data?.[field.name as keyof typeof data] as string
}
>
<SelectTrigger
{fields.some((f) => f.type === "datetime") ? (
<div className="flex gap-0 items-start">
{/* Left panel: non-datetime fields */}
<div className="flex-1 grid gap-4 py-4 pr-6">
{fields
.filter((field) => field.type !== "datetime")
.map((field) => (
<div key={field.name} className="space-y-2">
<Label htmlFor={field.name}>{field.label}</Label>
{field.type === "select" && field.options ? (
<Select
onValueChange={(value) => {
const event = {
target: { name: field.name, value },
};
register(field.name as any).onChange(event);
}}
defaultValue={
data?.[field.name as keyof typeof data] as string
}
>
<SelectTrigger
className={
errors[field.name as keyof typeof errors]
? "border-red-500"
: ""
}
>
<SelectValue
placeholder={
field.placeholder || "Select an option"
}
/>
</SelectTrigger>
<SelectContent>
{field.options.map((option) => (
<SelectItem
key={option.value}
value={option.value}
>
{option.label}
</SelectItem>
))}
</SelectContent>
</Select>
) : field.type === "textarea" ? (
<Textarea
id={field.name}
placeholder={field.placeholder || ""}
{...register(field.name as any)}
className={
errors[field.name as keyof typeof errors]
? "border-red-500"
: ""
}
/>
) : (
<Input
id={field.name}
type={field.type}
placeholder={field.placeholder || ""}
{...register(field.name as any, {
valueAsNumber: field.type === "number",
})}
className={
errors[field.name as keyof typeof errors]
? "border-red-500"
: ""
}
/>
)}
{errors[field.name as keyof typeof errors] && (
<p className="text-red-500 text-sm">
{
errors[field.name as keyof typeof errors]
?.message as string
}
</p>
)}
</div>
))}
</div>
{/* Right panel: datetime fields */}
<div className="w-72 grid gap-4 py-4 pl-6">
{fields
.filter((field) => field.type === "datetime")
.map((field) => (
<div key={field.name} className="space-y-2">
<Label htmlFor={field.name}>{field.label}</Label>
<Input
id={field.name}
type="datetime-local"
placeholder={field.placeholder || ""}
{...register(field.name as any)}
className={
errors[field.name as keyof typeof errors]
? "border-red-500"
: ""
}
/>
{errors[field.name as keyof typeof errors] && (
<p className="text-red-500 text-sm">
{
errors[field.name as keyof typeof errors]
?.message as string
}
</p>
)}
</div>
))}
</div>
</div>
) : (
<div className="grid gap-4 py-4">
{fields.map((field) => (
<div key={field.name} className="space-y-2">
<Label htmlFor={field.name}>{field.label}</Label>
{field.type === "select" && field.options ? (
<Select
onValueChange={(value) => {
const event = {
target: { name: field.name, value },
};
register(field.name as any).onChange(event);
}}
defaultValue={
data?.[field.name as keyof typeof data] as string
}
>
<SelectTrigger
className={
errors[field.name as keyof typeof errors]
? "border-red-500"
: ""
}
>
<SelectValue
placeholder={field.placeholder || "Select an option"}
/>
</SelectTrigger>
<SelectContent>
{field.options.map((option) => (
<SelectItem key={option.value} value={option.value}>
{option.label}
</SelectItem>
))}
</SelectContent>
</Select>
) : field.type === "textarea" ? (
<Textarea
id={field.name}
placeholder={field.placeholder || ""}
{...register(field.name as any)}
className={
errors[field.name as keyof typeof errors]
? "border-red-500"
: ""
}
>
<SelectValue
placeholder={field.placeholder || "Select an option"}
/>
</SelectTrigger>
<SelectContent>
{field.options.map((option) => (
<SelectItem key={option.value} value={option.value}>
{option.label}
</SelectItem>
))}
</SelectContent>
</Select>
) : field.type === "textarea" ? (
<Textarea
id={field.name}
placeholder={field.placeholder || ""}
{...register(field.name as any)}
className={
errors[field.name as keyof typeof errors]
? "border-red-500"
: ""
}
/>
) : field.type === "datetime" ? (
<Input
id={field.name}
type="datetime-local"
placeholder={field.placeholder || ""}
{...register(field.name as any)}
className={
errors[field.name as keyof typeof errors]
? "border-red-500"
: ""
}
/>
) : (
<Input
id={field.name}
type={field.type}
placeholder={field.placeholder || ""}
{...register(field.name as any, {
valueAsNumber: field.type === "number",
})}
className={
errors[field.name as keyof typeof errors]
? "border-red-500"
: ""
}
/>
)}
{errors[field.name as keyof typeof errors] && (
<p className="text-red-500 text-sm">
{
errors[field.name as keyof typeof errors]
?.message as string
}
</p>
)}
</div>
))}
</div>
/>
) : (
<Input
id={field.name}
type={field.type}
placeholder={field.placeholder || ""}
{...register(field.name as any, {
valueAsNumber: field.type === "number",
})}
className={
errors[field.name as keyof typeof errors]
? "border-red-500"
: ""
}
/>
)}
{errors[field.name as keyof typeof errors] && (
<p className="text-red-500 text-sm">
{
errors[field.name as keyof typeof errors]
?.message as string
}
</p>
)}
</div>
))}
</div>
)}
<DialogFooter>
<Button type="submit" disabled={isSaving}>
{isSaving ? (
Expand Down
Loading