new features

This commit is contained in:
Ivan Rezchikov
2026-05-04 11:14:30 +03:00
parent 77d429c8ba
commit 5752d5b2b4
32 changed files with 1530 additions and 217 deletions
@@ -2,21 +2,22 @@
import { useState } from "react";
import { useForm, SubmitHandler } from "react-hook-form";
import { useTranslations } from "next-intl";
import { useLocale, useTranslations } from "next-intl";
import { Button } from "@/components/ui/button";
import { Dialog, DialogClose, DialogContent, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
import { Input } from "@/components/ui/input";
import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field";
import { Spinner } from "@/components/ui/spinner";
import { addPosition, editPosition } from "@/actions/positions";
import { addPosition, editPosition, syncPositionPermissions } from "@/actions/positions";
import { toast } from "sonner";
import { Check, X } from "lucide-react";
import type { Position } from "@/types";
import type { Permission, Position } from "@/types";
interface CreateProps {
mode: "create";
trigger: React.ReactNode;
onSuccess: (position: Position) => void;
allPermissions: Permission[] | null;
}
interface EditProps {
@@ -24,6 +25,7 @@ interface EditProps {
position: Position;
trigger: React.ReactNode;
onSuccess: (position: Position) => void;
allPermissions: Permission[] | null;
}
type Props = CreateProps | EditProps;
@@ -32,49 +34,100 @@ interface FormData {
code: string;
name: string;
description: string;
permissions: string[];
}
function addPermissionToForm(current: string[], value: string): string[] {
if (current.includes(value)) return current
return [...current, value]
}
function removePermissionFromForm(current: string[], value: string): string[] {
return current.filter(p => p !== value)
}
function togglePermissionInForm(current: string[], value: string): string[] {
return current.includes(value) ?
removePermissionFromForm(current, value) :
addPermissionToForm(current, value)
}
export function PositionDialog(props: Props) {
const t = useTranslations("MePage.items.admin.positions")
const locale = useLocale()
const isEdit = props.mode === "edit"
const [open, setOpen] = useState(false)
const { register, handleSubmit, reset, formState: { errors, isSubmitting } } = useForm<FormData>({
const { register, handleSubmit, reset, formState: { errors, isSubmitting }, watch, setValue } = useForm<FormData>({
defaultValues: isEdit
? { code: props.position.code, name: props.position.name, description: props.position.description ?? "" }
: { code: "", name: "", description: "" },
? { code: props.position.code, name: props.position.name, description: props.position.description ?? "", permissions: props.position.permissions.map(p => p.code) ?? [] }
: { code: "", name: "", description: "", permissions: [] },
})
function handleOpenChange(o: boolean) {
setOpen(o)
if (!o) {
reset(isEdit
? { code: props.position.code, name: props.position.name, description: props.position.description ?? "" }
: { code: "", name: "", description: "" }
? { code: props.position.code, name: props.position.name, description: props.position.description ?? "", permissions: props.position.permissions.map(p => p.code) ?? [] }
: { code: "", name: "", description: "", permissions: [] }
)
}
}
const onSubmit: SubmitHandler<FormData> = async (data) => {
const positionCode = isEdit
? (props as EditProps).position.code
: data.code
const oldPermissions = isEdit
? (props as EditProps).position.permissions.map(p => p.code)
: []
const result = isEdit
? await editPosition((props as EditProps).position.code, data.name, data.description || undefined)
: await addPosition(data.code, data.name, data.description || undefined)
? await editPosition(positionCode, data.name, data.description, locale)
: await addPosition(data.code, data.name, data.description, locale)
if (!result.success) {
toast(isEdit ? t("edit.error") : t("create.error"), { icon: <X size={16} /> })
toast(isEdit ? t("edit.error") : t("create.error"), {
icon: <X size={16} />,
})
return
}
const updated: Position = isEdit
? { ...(props as EditProps).position, name: data.name, description: data.description }
: { code: data.code, name: data.name, description: data.description, permissions: [] }
await syncPositionPermissions(
positionCode,
oldPermissions,
data.permissions
)
const nextPermissions = data.permissions.map((permissionCode) => {
const permission = props.allPermissions?.find((p) => p.code === permissionCode)
return permission ?? { id: permissionCode, code: permissionCode, name: permissionCode, description: permissionCode, created_at: new Date().toISOString() }
})
const updated: Position = {
...(isEdit ? (props as EditProps).position : { code: data.code }),
name: data.name,
description: data.description,
permissions: nextPermissions,
}
toast(isEdit ? t("edit.success") : t("create.success"), {
icon: <Check size={16} />,
})
toast(isEdit ? t("edit.success") : t("create.success"), { icon: <Check size={16} /> })
props.onSuccess(updated)
reset()
setOpen(false)
}
const selectedPermissions = watch("permissions");
const togglePermission = (value: string) => {
const updated = togglePermissionInForm(selectedPermissions, value)
setValue("permissions", updated, { shouldDirty: true, shouldValidate: true })
}
return (
<Dialog open={open} onOpenChange={handleOpenChange}>
<DialogTrigger asChild>{props.trigger}</DialogTrigger>
@@ -112,10 +165,29 @@ export function PositionDialog(props: Props) {
{...register("description")}
/>
</Field>
<Field>
<FieldLabel htmlFor="permissions">{t("permissions.label")}</FieldLabel>
<div className="flex flex-wrap gap-2">
{props.allPermissions?.length == 0 && <p className="text-sm text-muted-foreground">{t("permissions.empty")}</p>}
{props.allPermissions?.map((p) => {
const active = selectedPermissions.includes(p.code)
return (
<Button
key={p.id}
variant={active ? "default" : "ghost"}
onClick={(e) => {e.preventDefault(); togglePermission(p.code)}}
>
{p.description || p.name || p.code}
</Button>
)
})}
</div>
</Field>
</FieldGroup>
<DialogFooter className="mt-6">
<DialogClose asChild>
<Button variant="outline">{t("create.cancel") || t("edit.cancel")}</Button>
<Button variant="outline">{isEdit ? t("edit.cancel") : t("create.cancel")}</Button>
</DialogClose>
<Button type="submit" disabled={isSubmitting}>
{isSubmitting && <Spinner className="mr-2 size-4" />}