fixes
This commit is contained in:
@@ -5,7 +5,7 @@ import { Spinner } from "@/components/ui/spinner";
|
||||
import { useTranslations } from "next-intl";
|
||||
import { useEffect, useState } from "react";
|
||||
import { useSearchParams } from "next/navigation";
|
||||
import { getSession, Approve } from "@/actions/oauth";
|
||||
import { fetchSession, Approve } from "@/actions/oauth";
|
||||
import { Check } from "lucide-react";
|
||||
import { Skeleton } from "@/components/ui/skeleton";
|
||||
import Link from "next/link";
|
||||
@@ -26,7 +26,7 @@ export default function ConsentPage() {
|
||||
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
getSession(sessionToken)
|
||||
fetchSession(sessionToken)
|
||||
.then(data => {
|
||||
if (!data) throw new Error();
|
||||
setSession(data);
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
import Header from "@/components/header";
|
||||
import { Skeleton } from "@/components/ui/skeleton";
|
||||
import { useTranslations } from "next-intl";
|
||||
import type { Consent, User } from "@/types";
|
||||
import type { Consent, Permission, Position, User } from "@/types";
|
||||
import { AppWindowMacIcon, BriefcaseBusinessIcon, LogOutIcon, ShieldIcon, UserIcon } from "lucide-react";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { useState } from "react";
|
||||
@@ -16,25 +16,30 @@ import Admin from "./items/admin";
|
||||
interface Props {
|
||||
userData: User | null;
|
||||
consentsData: Consent[] | null;
|
||||
permissionsData: Permission[] | null;
|
||||
positionsData: Position[] | null;
|
||||
}
|
||||
|
||||
export default function MeClient({ userData, consentsData }: Props) {
|
||||
export default function MeClient({ userData, consentsData, permissionsData, positionsData }: Props) {
|
||||
const t = useTranslations("MePage");
|
||||
|
||||
const [user, setUser] = useState(userData);
|
||||
const [consents, setConsents] = useState(consentsData)
|
||||
const [consents, setConsents] = useState(consentsData);
|
||||
const [permissions, setPermissions] = useState(permissionsData);
|
||||
const [positions, setPositions] = useState(positionsData);
|
||||
const [selectedItem, setSelectedItem] = useState(0);
|
||||
|
||||
|
||||
const baseItems = [
|
||||
{ name: t("items.profile.title"), icon: <UserIcon />, component: <Profile user={user} setUser={setUser} /> },
|
||||
{ name: t("items.applications.title"), icon: <AppWindowMacIcon />, component: <Applications consents={consents} setConsents={setConsents} /> },
|
||||
{ name: t("items.positions.title"), icon: <BriefcaseBusinessIcon />, component: <Positions /> },
|
||||
// { name: t("items.positions.title"), icon: <BriefcaseBusinessIcon />, component: <Positions /> },
|
||||
]
|
||||
|
||||
const adminItem = user?.is_admin
|
||||
? [{ name: t("items.admin.title"), icon: <ShieldIcon />, component: <Admin /> }]
|
||||
: []
|
||||
? [{ name: t("items.admin.title"), icon: <ShieldIcon />, component: <Admin permissions={permissions} setPermissions={setPermissions} positions={positions} setPositions={setPositions} /> }]
|
||||
: [];
|
||||
|
||||
|
||||
const items = [...baseItems, ...adminItem]
|
||||
|
||||
|
||||
@@ -1,43 +1,28 @@
|
||||
"use client"
|
||||
|
||||
import { useEffect, useState } from "react"
|
||||
import { useLocale, useTranslations } from "next-intl"
|
||||
import type { Position } from "@/types"
|
||||
import { Spinner } from "@/components/ui/spinner"
|
||||
import { getMyPositions } from "@/actions/positions"
|
||||
import { useTranslations } from "next-intl"
|
||||
import type { Permission, Position } from "@/types"
|
||||
import Permissions from "./admin/permissions"
|
||||
// import Positions from "./admin/positions"
|
||||
import Positions from "./admin/positions";
|
||||
|
||||
export default function Admin() {
|
||||
interface Props {
|
||||
permissions: Permission[] | null;
|
||||
setPermissions: React.Dispatch<React.SetStateAction<Permission[] | null>>;
|
||||
|
||||
positions: Position[] | null;
|
||||
setPositions: React.Dispatch<React.SetStateAction<Position[] | null>>;
|
||||
}
|
||||
|
||||
export default function Admin({ permissions, setPermissions, positions, setPositions }: Props) {
|
||||
const t = useTranslations("MePage.items.admin")
|
||||
const locale = useLocale()
|
||||
|
||||
const [positions, setPositions] = useState<Position[] | null>(null)
|
||||
const [loading, setLoading] = useState(true)
|
||||
|
||||
useEffect(() => {
|
||||
getMyPositions(locale)
|
||||
.then(setPositions)
|
||||
.finally(() => setLoading(false))
|
||||
}, [locale])
|
||||
|
||||
return (
|
||||
<div className="w-full lg:max-w-xl flex flex-col gap-6">
|
||||
<h1 className="text-xl">{t("title")}</h1>
|
||||
|
||||
{loading && (
|
||||
<div className="flex items-center gap-2 text-sm text-muted-foreground">
|
||||
<Spinner />
|
||||
<span>{t("loading")}</span>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{!loading && (
|
||||
<div className="space-y-8">
|
||||
<Permissions />
|
||||
{/* <Positions /> */}
|
||||
</div>
|
||||
)}
|
||||
<div className="space-y-8">
|
||||
<Permissions permissions={permissions} setPermissions={setPermissions} />
|
||||
<Positions positions={positions} setPositions={setPositions} />
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -1,88 +0,0 @@
|
||||
"use client"
|
||||
|
||||
import { useState } from "react";
|
||||
import { useForm, SubmitHandler } from "react-hook-form";
|
||||
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 { createPermission } from "@/actions/positions";
|
||||
import { toast } from "sonner";
|
||||
import { X } from "lucide-react";
|
||||
|
||||
interface FormData {
|
||||
code: string
|
||||
description: string
|
||||
}
|
||||
|
||||
export default function CreatePermissionDialog() {
|
||||
const { register, handleSubmit, formState: { errors, isSubmitting }, reset } = useForm<FormData>()
|
||||
|
||||
const onSubmit: SubmitHandler<FormData> = async (data) => {
|
||||
const result = await createPermission(data.code, data.description)
|
||||
|
||||
if (!result.success) {
|
||||
toast("Failed to create permission", { icon: <X size={16} /> })
|
||||
return
|
||||
}
|
||||
|
||||
reset()
|
||||
window.location.reload()
|
||||
}
|
||||
|
||||
return (
|
||||
<Dialog>
|
||||
<DialogTrigger asChild>
|
||||
<Button variant="outline" size="sm" className="w-full">
|
||||
Add permission
|
||||
</Button>
|
||||
</DialogTrigger>
|
||||
<DialogContent>
|
||||
<DialogHeader>
|
||||
<DialogTitle>Create permission</DialogTitle>
|
||||
</DialogHeader>
|
||||
<form onSubmit={handleSubmit(onSubmit)}>
|
||||
<FieldGroup>
|
||||
<Field data-invalid={!!errors.code}>
|
||||
<FieldLabel htmlFor="code">Code</FieldLabel>
|
||||
<Input
|
||||
id="code"
|
||||
disabled={isSubmitting}
|
||||
aria-invalid={!!errors.code}
|
||||
{...register("code", {
|
||||
required: "Code is required"
|
||||
})}
|
||||
/>
|
||||
{errors.code && (
|
||||
<FieldError>{errors.code.message}</FieldError>
|
||||
)}
|
||||
</Field>
|
||||
<Field data-invalid={!!errors.description}>
|
||||
<FieldLabel htmlFor="description">
|
||||
Description
|
||||
</FieldLabel>
|
||||
<Input
|
||||
id="description"
|
||||
disabled={isSubmitting}
|
||||
aria-invalid={!!errors.description}
|
||||
{...register("description")}
|
||||
/>
|
||||
</Field>
|
||||
</FieldGroup>
|
||||
<DialogFooter className="mt-4">
|
||||
<DialogClose asChild>
|
||||
<Button variant="outline">
|
||||
Cancel
|
||||
</Button>
|
||||
</DialogClose>
|
||||
<Button type="submit" disabled={isSubmitting}>
|
||||
{isSubmitting && <Spinner />}
|
||||
Save
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</form>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
)
|
||||
}
|
||||
@@ -1,85 +0,0 @@
|
||||
"use client"
|
||||
|
||||
import { useState } from "react";
|
||||
import { useForm, SubmitHandler } from "react-hook-form";
|
||||
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 { createPermission, updatePermission } from "@/actions/positions";
|
||||
import { Permission } from "@/types";
|
||||
import { X } from "lucide-react";
|
||||
import { toast } from "sonner";
|
||||
|
||||
interface Props {
|
||||
permission: Permission
|
||||
}
|
||||
|
||||
interface FormData {
|
||||
code: string
|
||||
description: string
|
||||
}
|
||||
|
||||
export default function EditPermissionDialog({ permission }: Props) {
|
||||
const { register, handleSubmit, formState: { errors, isSubmitting }, reset } = useForm<FormData>()
|
||||
|
||||
const onSubmit: SubmitHandler<FormData> = async (data) => {
|
||||
const result = await updatePermission(data.code, data.description)
|
||||
|
||||
if (!result.success) {
|
||||
toast("Failed to update permission", { icon: <X size={16} /> })
|
||||
return
|
||||
}
|
||||
|
||||
reset()
|
||||
}
|
||||
|
||||
return (
|
||||
<Dialog>
|
||||
<DialogTrigger asChild>
|
||||
<Button variant="ghost" size="sm" className="w-full px-2 justify-start">Edit</Button>
|
||||
</DialogTrigger>
|
||||
<DialogContent>
|
||||
<DialogHeader>
|
||||
<DialogTitle>Edit permission</DialogTitle>
|
||||
</DialogHeader>
|
||||
<form onSubmit={handleSubmit(onSubmit)}>
|
||||
<FieldGroup>
|
||||
<Field data-invalid={!!errors.code}>
|
||||
<FieldLabel htmlFor="code">Code</FieldLabel>
|
||||
<Input
|
||||
id="code"
|
||||
value={permission.code}
|
||||
disabled
|
||||
/>
|
||||
</Field>
|
||||
<Field data-invalid={!!errors.description}>
|
||||
<FieldLabel htmlFor="description">
|
||||
Description
|
||||
</FieldLabel>
|
||||
<Input
|
||||
id="description"
|
||||
disabled={isSubmitting}
|
||||
aria-invalid={!!errors.description}
|
||||
{...register("description")}
|
||||
value={permission.description}
|
||||
/>
|
||||
</Field>
|
||||
</FieldGroup>
|
||||
<DialogFooter className="mt-4">
|
||||
<DialogClose asChild>
|
||||
<Button variant="outline">
|
||||
Cancel
|
||||
</Button>
|
||||
</DialogClose>
|
||||
<Button type="submit" disabled={isSubmitting}>
|
||||
{isSubmitting && <Spinner />}
|
||||
Update
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</form>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,107 @@
|
||||
"use client"
|
||||
|
||||
import { useState } from "react";
|
||||
import { useForm, SubmitHandler } from "react-hook-form";
|
||||
import { 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 { addPermission, editPermission } from "@/actions/positions";
|
||||
import { toast } from "sonner";
|
||||
import { Check, X } from "lucide-react";
|
||||
import type { Permission } from "@/types";
|
||||
|
||||
interface CreateProps {
|
||||
mode: "create";
|
||||
trigger: React.ReactNode;
|
||||
onSuccess: (permission: Permission) => void;
|
||||
}
|
||||
|
||||
interface EditProps {
|
||||
mode: "edit";
|
||||
permission: Permission;
|
||||
trigger: React.ReactNode;
|
||||
onSuccess: (permission: Permission) => void;
|
||||
}
|
||||
|
||||
type Props = CreateProps | EditProps;
|
||||
|
||||
interface FormData {
|
||||
code: string;
|
||||
description: string;
|
||||
}
|
||||
|
||||
export function PermissionDialog(props: Props) {
|
||||
const t = useTranslations("MePage.items.admin.permissions")
|
||||
const isEdit = props.mode === "edit"
|
||||
|
||||
const [open, setOpen] = useState(false)
|
||||
const { register, handleSubmit, reset, formState: { errors, isSubmitting } } = useForm<FormData>({
|
||||
defaultValues: isEdit ? { code: props.permission.code, description: props.permission.description ?? "" } : { code: "", description: "" },
|
||||
})
|
||||
|
||||
function handleOpenChange(o: boolean) {
|
||||
setOpen(o)
|
||||
if (!o) reset(isEdit ? { code: props.permission.code, description: props.permission.description ?? "" } : { code: "", description: "" })
|
||||
}
|
||||
|
||||
const onSubmit: SubmitHandler<FormData> = async (data) => {
|
||||
const result = isEdit
|
||||
? await editPermission((props as EditProps).permission.code, data.description || undefined)
|
||||
: await addPermission(data.code, data.description || undefined)
|
||||
|
||||
if (!result.success) {
|
||||
toast(isEdit ? t("edit.error") : t("create.error"), { icon: <X size={16} /> })
|
||||
return
|
||||
}
|
||||
|
||||
const updated: Permission = isEdit
|
||||
? { ...(props as EditProps).permission, description: data.description }
|
||||
: { id: crypto.randomUUID(), code: data.code, description: data.description, created_at: new Date().toISOString() }
|
||||
|
||||
toast(isEdit ? t("edit.success") : t("create.success"), { icon: <Check size={16} /> })
|
||||
props.onSuccess(updated)
|
||||
reset()
|
||||
setOpen(false)
|
||||
}
|
||||
|
||||
return (
|
||||
<Dialog open={open} onOpenChange={handleOpenChange}>
|
||||
<DialogTrigger asChild>{props.trigger}</DialogTrigger>
|
||||
<DialogContent>
|
||||
<DialogHeader>
|
||||
<DialogTitle>{isEdit ? t("edit.title") : t("create.title")}</DialogTitle>
|
||||
</DialogHeader>
|
||||
<form onSubmit={handleSubmit(onSubmit)}>
|
||||
<FieldGroup>
|
||||
<Field data-invalid={!!errors.code}>
|
||||
<FieldLabel htmlFor="code">{isEdit ? t("edit.code") : t("create.code")}</FieldLabel>
|
||||
<Input
|
||||
id="code"
|
||||
disabled={isEdit || isSubmitting}
|
||||
aria-invalid={!!errors.code}
|
||||
{...register("code", { validate: (v) => isEdit || v.trim().length > 0 || t("create.codeRequired") })}
|
||||
/>
|
||||
{errors.code && <FieldError>{errors.code.message}</FieldError>}
|
||||
</Field>
|
||||
<Field>
|
||||
<FieldLabel htmlFor="description">{isEdit ? t("edit.description") : t("create.description")}</FieldLabel>
|
||||
<Input id="description" disabled={isSubmitting} {...register("description")} />
|
||||
</Field>
|
||||
</FieldGroup>
|
||||
<DialogFooter className="mt-4">
|
||||
<DialogClose asChild>
|
||||
<Button variant="outline" type="button">{isEdit ? t("edit.cancel") : t("create.cancel")}</Button>
|
||||
</DialogClose>
|
||||
<Button type="submit" disabled={isSubmitting}>
|
||||
{isSubmitting && <Spinner />}
|
||||
{isEdit ? t("edit.save") : t("create.save")}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</form>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,129 @@
|
||||
"use client"
|
||||
|
||||
import { useState } from "react";
|
||||
import { useForm, SubmitHandler } from "react-hook-form";
|
||||
import { 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 { toast } from "sonner";
|
||||
import { Check, X } from "lucide-react";
|
||||
import type { Position } from "@/types";
|
||||
|
||||
interface CreateProps {
|
||||
mode: "create";
|
||||
trigger: React.ReactNode;
|
||||
onSuccess: (position: Position) => void;
|
||||
}
|
||||
|
||||
interface EditProps {
|
||||
mode: "edit";
|
||||
position: Position;
|
||||
trigger: React.ReactNode;
|
||||
onSuccess: (position: Position) => void;
|
||||
}
|
||||
|
||||
type Props = CreateProps | EditProps;
|
||||
|
||||
interface FormData {
|
||||
code: string;
|
||||
name: string;
|
||||
description: string;
|
||||
}
|
||||
|
||||
export function PositionDialog(props: Props) {
|
||||
const t = useTranslations("MePage.items.admin.positions")
|
||||
const isEdit = props.mode === "edit"
|
||||
|
||||
const [open, setOpen] = useState(false)
|
||||
const { register, handleSubmit, reset, formState: { errors, isSubmitting } } = useForm<FormData>({
|
||||
defaultValues: isEdit
|
||||
? { code: props.position.code, name: props.position.name, description: props.position.description ?? "" }
|
||||
: { code: "", name: "", description: "" },
|
||||
})
|
||||
|
||||
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: "" }
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
const onSubmit: SubmitHandler<FormData> = async (data) => {
|
||||
const result = isEdit
|
||||
? await editPosition((props as EditProps).position.code, data.name, data.description || undefined)
|
||||
: await addPosition(data.code, data.name, data.description || undefined)
|
||||
|
||||
if (!result.success) {
|
||||
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: [] }
|
||||
|
||||
toast(isEdit ? t("edit.success") : t("create.success"), { icon: <Check size={16} /> })
|
||||
props.onSuccess(updated)
|
||||
reset()
|
||||
setOpen(false)
|
||||
}
|
||||
|
||||
return (
|
||||
<Dialog open={open} onOpenChange={handleOpenChange}>
|
||||
<DialogTrigger asChild>{props.trigger}</DialogTrigger>
|
||||
<DialogContent>
|
||||
<DialogHeader>
|
||||
<DialogTitle>{isEdit ? t("edit.title") : t("create.title")}</DialogTitle>
|
||||
</DialogHeader>
|
||||
<form onSubmit={handleSubmit(onSubmit)}>
|
||||
<FieldGroup>
|
||||
<Field data-invalid={!!errors.code}>
|
||||
<FieldLabel htmlFor="code">{isEdit ? t("edit.code") : t("create.code")}</FieldLabel>
|
||||
<Input
|
||||
id="code"
|
||||
disabled={isEdit || isSubmitting}
|
||||
aria-invalid={!!errors.code}
|
||||
{...register("code", { validate: (v) => isEdit || v.trim().length > 0 || t("create.codeRequired") })}
|
||||
/>
|
||||
{errors.code && <FieldError>{errors.code.message}</FieldError>}
|
||||
</Field>
|
||||
<Field data-invalid={!!errors.name}>
|
||||
<FieldLabel htmlFor="name">{isEdit ? t("edit.name") : t("create.name")}</FieldLabel>
|
||||
<Input
|
||||
id="name"
|
||||
disabled={isSubmitting}
|
||||
aria-invalid={!!errors.name}
|
||||
{...register("name", { validate: (v) => v.trim().length > 0 || t("create.nameRequired") })}
|
||||
/>
|
||||
{errors.name && <FieldError>{errors.name.message}</FieldError>}
|
||||
</Field>
|
||||
<Field>
|
||||
<FieldLabel htmlFor="description">{isEdit ? t("edit.description") : t("create.description")}</FieldLabel>
|
||||
<Input
|
||||
id="description"
|
||||
disabled={isSubmitting}
|
||||
{...register("description")}
|
||||
/>
|
||||
</Field>
|
||||
</FieldGroup>
|
||||
<DialogFooter className="mt-6">
|
||||
<DialogClose asChild>
|
||||
<Button variant="outline">{t("create.cancel") || t("edit.cancel")}</Button>
|
||||
</DialogClose>
|
||||
<Button type="submit" disabled={isSubmitting}>
|
||||
{isSubmitting && <Spinner className="mr-2 size-4" />}
|
||||
{isEdit ? t("edit.save") : t("create.save")}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</form>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
)
|
||||
}
|
||||
@@ -1,87 +1,96 @@
|
||||
"use client"
|
||||
|
||||
import { useState, useEffect, useMemo } from "react";
|
||||
import { Button } from "@/components/ui/button"
|
||||
import { Card, CardFooter } from "@/components/ui/card";
|
||||
import { useTranslations } from "next-intl";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator, DropdownMenuTrigger } from "@/components/ui/dropdown-menu";
|
||||
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
|
||||
import { MoreHorizontalIcon } from "lucide-react"
|
||||
import CreatePermissionDialog from "./dialogs/createPermissionDialog";
|
||||
import { Permission } from "@/types";
|
||||
import { deletePermission, listAllPermissions } from "@/actions/positions";
|
||||
import { Spinner } from "@/components/ui/spinner";
|
||||
import EditPermissionDialog from "./dialogs/editPermissionDialog";
|
||||
import { MoreHorizontalIcon } from "lucide-react";
|
||||
import { Check, X } from "lucide-react";
|
||||
import { toast } from "sonner";
|
||||
import { PermissionDialog } from "./dialogs/permissionDialog";
|
||||
import { removePermission } from "@/actions/positions";
|
||||
import type { Permission } from "@/types";
|
||||
|
||||
export default function Permissions() {
|
||||
const [permissions, setPermissions] = useState<Permission[]>([]);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
interface Props {
|
||||
permissions: Permission[] | null;
|
||||
setPermissions: React.Dispatch<React.SetStateAction<Permission[] | null>>;
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
async function load() {
|
||||
const data = await listAllPermissions();
|
||||
setPermissions(data);
|
||||
setIsLoading(false);
|
||||
}
|
||||
export default function Permissions({ permissions, setPermissions }: Props) {
|
||||
const t = useTranslations("MePage.items.admin.permissions")
|
||||
const pt = useTranslations("permissions")
|
||||
|
||||
load()
|
||||
}, [])
|
||||
function handleCreated(permission: Permission) {
|
||||
setPermissions((prev) => [...(prev || []), permission])
|
||||
}
|
||||
|
||||
const permissionsMemo = useMemo(() => permissions, [permissions]);
|
||||
function handleUpdated(code: string, permission: Permission) {
|
||||
setPermissions((prev) => (prev || []).map((p) => (p.code === code ? permission : p)))
|
||||
}
|
||||
|
||||
async function handleDelete(code: string) {
|
||||
const result = await deletePermission(code)
|
||||
|
||||
const result = await removePermission(code)
|
||||
if (result.success) {
|
||||
setPermissions((prev) =>
|
||||
prev.filter((p) => p.code !== code)
|
||||
)
|
||||
setPermissions((prev) => (prev || []).filter((p) => p.code !== code))
|
||||
toast(t("delete.success"), { icon: <Check size={16} /> })
|
||||
} else {
|
||||
toast(t("delete.error"), { icon: <X size={16} /> })
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="space-y-4">
|
||||
<div className="space-y-1">
|
||||
<h2 className="text-lg">Permissions</h2>
|
||||
<h4 className="text-sm text-muted-foreground">Here You can create permissions which later You can assign them to positions</h4>
|
||||
<h2 className="text-lg">{t("title")}</h2>
|
||||
<p className="text-sm text-muted-foreground">{t("subtitle")}</p>
|
||||
</div>
|
||||
<Card size="sm" className="w-full">
|
||||
<Table>
|
||||
<TableHeader>
|
||||
<Table>
|
||||
<TableHeader className="rounded-lg">
|
||||
<TableRow>
|
||||
<TableHead>{t("columns.code")}</TableHead>
|
||||
<TableHead>{t("columns.description")}</TableHead>
|
||||
<TableHead className="text-right">{t("columns.actions")}</TableHead>
|
||||
</TableRow>
|
||||
</TableHeader>
|
||||
<TableBody>
|
||||
{permissions?.length === 0 && (
|
||||
<TableRow>
|
||||
<TableHead>Code</TableHead>
|
||||
<TableHead>Description</TableHead>
|
||||
<TableHead className="text-right">Actions</TableHead>
|
||||
<TableCell colSpan={3} className="text-center text-sm text-muted-foreground py-6">{t("empty")}</TableCell>
|
||||
</TableRow>
|
||||
</TableHeader>
|
||||
<TableBody>
|
||||
{permissionsMemo.map((permission) => (
|
||||
)}
|
||||
{permissions?.map((permission) => (
|
||||
<TableRow key={permission.code}>
|
||||
<TableCell>{permission.code}</TableCell>
|
||||
<TableCell>{permission.description}</TableCell>
|
||||
<TableCell className="font-mono">{permission.code}</TableCell>
|
||||
<TableCell className="text-muted-foreground">{pt(`${permission.code}`)}</TableCell>
|
||||
<TableCell className="text-right">
|
||||
<DropdownMenu>
|
||||
<DropdownMenuTrigger asChild>
|
||||
<Button variant="ghost" size="icon" className="size-8">
|
||||
<MoreHorizontalIcon />
|
||||
<span className="sr-only">Open menu</span>
|
||||
<span className="sr-only">{t("columns.actions")}</span>
|
||||
</Button>
|
||||
</DropdownMenuTrigger>
|
||||
<DropdownMenuContent align="end">
|
||||
<EditPermissionDialog permission={permission} />
|
||||
<PermissionDialog
|
||||
mode="edit"
|
||||
permission={permission}
|
||||
onSuccess={(updated) => handleUpdated(permission.code, updated)}
|
||||
trigger={<Button variant="ghost" size="sm" className="w-full px-2 justify-start">{t("actions.edit")}</Button>}
|
||||
/>
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuItem variant="destructive" onClick={() => handleDelete(permission.code)}>Delete</DropdownMenuItem>
|
||||
<DropdownMenuItem variant="destructive" onClick={() => handleDelete(permission.code)}>{t("actions.delete")}</DropdownMenuItem>
|
||||
</DropdownMenuContent>
|
||||
</DropdownMenu>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
))}
|
||||
</TableBody>
|
||||
{isLoading && <p className="mx-2 my-1 text-muted-foreground animate-pulse">Permissions are loading...</p>}
|
||||
</Table>
|
||||
<CardFooter>
|
||||
<CreatePermissionDialog />
|
||||
</CardFooter>
|
||||
</Card>
|
||||
</TableBody>
|
||||
</Table>
|
||||
<PermissionDialog
|
||||
mode="create"
|
||||
onSuccess={handleCreated}
|
||||
trigger={<Button variant="outline" size="sm" className="w-full">{t("actions.create")}</Button>}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,97 @@
|
||||
"use client"
|
||||
|
||||
import { useTranslations } from "next-intl";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator, DropdownMenuTrigger } from "@/components/ui/dropdown-menu";
|
||||
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
|
||||
import { MoreHorizontalIcon } from "lucide-react";
|
||||
import { Check, X } from "lucide-react";
|
||||
import { toast } from "sonner";
|
||||
import { PositionDialog } from "./dialogs/positionDialog";
|
||||
import { deletePosition } from "@/actions/positions";
|
||||
import type { Position } from "@/types";
|
||||
|
||||
interface Props {
|
||||
positions: Position[] | null;
|
||||
setPositions: React.Dispatch<React.SetStateAction<Position[] | null>>;
|
||||
}
|
||||
|
||||
export default function Positions({ positions, setPositions }: Props) {
|
||||
const t = useTranslations("MePage.items.admin.positions")
|
||||
|
||||
function handleCreated(position: Position) {
|
||||
setPositions((prev) => [...(prev || []), position])
|
||||
}
|
||||
|
||||
function handleUpdated(code: string, position: Position) {
|
||||
setPositions((prev) => (prev || []).map((p) => (p.code === code ? position : p)))
|
||||
}
|
||||
|
||||
async function handleDelete(code: string) {
|
||||
const result = await deletePosition(code)
|
||||
if (result.success) {
|
||||
setPositions((prev) => (prev || []).filter((p) => p.code !== code))
|
||||
toast(t("delete.success"), { icon: <Check size={16} /> })
|
||||
} else {
|
||||
toast(t("delete.error"), { icon: <X size={16} /> })
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="space-y-4">
|
||||
<div className="space-y-1">
|
||||
<h2 className="text-lg">{t("title")}</h2>
|
||||
<p className="text-sm text-muted-foreground">{t("subtitle")}</p>
|
||||
</div>
|
||||
<Table>
|
||||
<TableHeader className="rounded-lg">
|
||||
<TableRow>
|
||||
<TableHead>{t("columns.code")}</TableHead>
|
||||
<TableHead>{t("columns.name")}</TableHead>
|
||||
<TableHead>{t("columns.description")}</TableHead>
|
||||
<TableHead className="text-right">{t("columns.actions")}</TableHead>
|
||||
</TableRow>
|
||||
</TableHeader>
|
||||
<TableBody>
|
||||
{positions?.length === 0 && (
|
||||
<TableRow>
|
||||
<TableCell colSpan={4} className="text-center text-sm text-muted-foreground py-6">{t("empty")}</TableCell>
|
||||
</TableRow>
|
||||
)}
|
||||
{positions?.map((position) => (
|
||||
<TableRow key={position.code}>
|
||||
<TableCell className="font-mono">{position.code}</TableCell>
|
||||
<TableCell>{position.name}</TableCell>
|
||||
<TableCell className="text-muted-foreground">{position.description || t("noDescription")}</TableCell>
|
||||
<TableCell className="text-right">
|
||||
<DropdownMenu>
|
||||
<DropdownMenuTrigger asChild>
|
||||
<Button variant="ghost" size="icon" className="size-8">
|
||||
<MoreHorizontalIcon />
|
||||
<span className="sr-only">{t("columns.actions")}</span>
|
||||
</Button>
|
||||
</DropdownMenuTrigger>
|
||||
<DropdownMenuContent align="end">
|
||||
<PositionDialog
|
||||
mode="edit"
|
||||
position={position}
|
||||
onSuccess={(updated) => handleUpdated(position.code, updated)}
|
||||
trigger={<Button variant="ghost" size="sm" className="w-full px-2 justify-start">{t("actions.edit")}</Button>}
|
||||
/>
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuItem variant="destructive" onClick={() => handleDelete(position.code)}>{t("actions.delete")}</DropdownMenuItem>
|
||||
</DropdownMenuContent>
|
||||
</DropdownMenu>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
))}
|
||||
</TableBody>
|
||||
</Table>
|
||||
<PositionDialog
|
||||
mode="create"
|
||||
onSuccess={handleCreated}
|
||||
trigger={<Button variant="outline" size="sm" className="w-full">{t("actions.create")}</Button>}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -49,8 +49,10 @@ export default function Applications({ consents, setConsents }: Props) {
|
||||
|
||||
return (
|
||||
<div className="w-full lg:max-w-sm flex flex-col gap-4">
|
||||
<h1 className="text-xl">{t("title")}</h1>
|
||||
|
||||
<div className="space-y-2">
|
||||
<h1 className="text-xl">{t("title")}</h1>
|
||||
<p className="text-sm text-muted-foreground">{t("subtitle")}</p>
|
||||
</div>
|
||||
<div className="space-y-4">
|
||||
{list?.map((consent) => (
|
||||
<Item key={consent.client_id}>
|
||||
|
||||
@@ -6,7 +6,7 @@ import type { Position } from "@/types"
|
||||
import { Item, ItemContent, ItemDescription, ItemTitle } from "@/components/ui/item"
|
||||
import { Badge } from "@/components/ui/badge"
|
||||
import { Spinner } from "@/components/ui/spinner"
|
||||
import { getMyPositions } from "@/actions/positions"
|
||||
import { fetchMyPositions } from "@/actions/positions"
|
||||
|
||||
export default function Positions() {
|
||||
const t = useTranslations("MePage.items.positions")
|
||||
@@ -16,7 +16,7 @@ export default function Positions() {
|
||||
const [loading, setLoading] = useState(true)
|
||||
|
||||
useEffect(() => {
|
||||
getMyPositions(locale)
|
||||
fetchMyPositions(locale)
|
||||
.then(setPositions)
|
||||
.finally(() => setLoading(false))
|
||||
}, [locale])
|
||||
|
||||
@@ -8,7 +8,7 @@ import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Spinner } from "@/components/ui/spinner";
|
||||
import { BirthdatePicker } from "@/components/ui/birthdate-picker";
|
||||
import { UpdateUser } from "@/actions/auth";
|
||||
import { updateUser } from "@/actions/auth";
|
||||
import { toast } from "sonner";
|
||||
import { Check, X } from "lucide-react";
|
||||
|
||||
@@ -36,7 +36,7 @@ export default function Profile({ user, setUser }: Props) {
|
||||
|
||||
const onSubmit: SubmitHandler<FormData> = async (data) => {
|
||||
try {
|
||||
const response = await UpdateUser(data.first_name, data.second_name, data.birth_date);
|
||||
const response = await updateUser(data.first_name, data.second_name, data.birth_date);
|
||||
|
||||
if (response == null) toast(t("form.updateError"), { icon: <X size={16} /> })
|
||||
else {
|
||||
|
||||
@@ -1,16 +1,19 @@
|
||||
import { GetUser } from "@/actions/auth";
|
||||
import { fetchUser } from "@/actions/auth";
|
||||
import { redirect } from "next/navigation";
|
||||
import MeComponent from "./component";
|
||||
import { getConsents } from "@/actions/consents";
|
||||
import { fetchConsents } from "@/actions/consents";
|
||||
import { fetchAllPositions, fetchAllPermissions } from "@/actions/positions";
|
||||
|
||||
export default async function Me() {
|
||||
const user = await GetUser();
|
||||
const user = await fetchUser();
|
||||
|
||||
if (!user) {
|
||||
redirect("/api/auth/initiate");
|
||||
}
|
||||
|
||||
const consents = await getConsents();
|
||||
const consents = await fetchConsents();
|
||||
const permissions = user.is_admin ? await fetchAllPermissions() : null;
|
||||
const positions = user.is_admin ? await fetchAllPositions() : null;
|
||||
|
||||
return <MeComponent userData={user} consentsData={consents} />;
|
||||
return <MeComponent userData={user} consentsData={consents} permissionsData={permissions} positionsData={positions} />;
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
import { getSession } from "@/actions/oauth";
|
||||
import { fetchSession } from "@/actions/oauth";
|
||||
import { isRedirectError } from "next/dist/client/components/redirect-error";
|
||||
import { cookies } from "next/headers";
|
||||
import { redirect } from "next/navigation";
|
||||
@@ -14,7 +14,7 @@ export default async function OAuthPage({
|
||||
const session = (await searchParams).session as string | undefined;
|
||||
if (!session) redirect("/oauth/error");
|
||||
|
||||
const data = await getSession(session);
|
||||
const data = await fetchSession(session);
|
||||
if (!data) redirect("/oauth/error");
|
||||
|
||||
const store = await cookies();
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
"use client"
|
||||
|
||||
import { Register } from "@/actions/auth";
|
||||
import Header from "@/components/header";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Field, FieldDescription, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field";
|
||||
@@ -13,7 +12,8 @@ import { useRouter } from "next/navigation";
|
||||
import Link from "next/link";
|
||||
import { Sex } from "@/types";
|
||||
import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
|
||||
import { ArrowLeft, ArrowRight, Check } from "lucide-react";
|
||||
import { ArrowLeft, ArrowRight } from "lucide-react";
|
||||
import { registerUser } from "@/actions/auth";
|
||||
|
||||
interface FormData {
|
||||
email: string;
|
||||
@@ -34,7 +34,7 @@ export default function RegisterPage() {
|
||||
const onSubmit: SubmitHandler<FormData> = async (data) => {
|
||||
setError(null);
|
||||
|
||||
const result = await Register(data.email, data.password, data.first_name, data.second_name, data.sex);
|
||||
const result = await registerUser(data.email, data.password, data.first_name, data.second_name, data.sex);
|
||||
if (!result.success) {
|
||||
setError(result.message ?? null);
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user