|
{assignment?.recipient?.firstName}{" "}
diff --git a/src/app/(dashboard)/inventory/assets/[assetId]/edit/page.tsx b/src/app/(dashboard)/inventory/assets/[assetId]/edit/page.tsx
index ec94198..6e8746d 100644
--- a/src/app/(dashboard)/inventory/assets/[assetId]/edit/page.tsx
+++ b/src/app/(dashboard)/inventory/assets/[assetId]/edit/page.tsx
@@ -3,7 +3,7 @@
import { getI18n } from "@/i18n/server"
import { AssetService } from "@/services/asset.service"
import { ItemService } from "@/services/item.service"
-import { RecipientService } from "@/services/recipient.service"
+import { PersonService } from "@/services/person.service"
import type { AssetWithAssignment } from "@/types"
import EditAssetForm from "../../_components/edit.asset.form"
@@ -15,7 +15,7 @@ export default async function EditAssetPage({
}) {
const { assetId } = await params
const items = await ItemService.findAll()
- const recipients = await RecipientService.findAll()
+ const people = await PersonService.findAll()
const asset = await AssetService.findById(assetId)
const { dictionary } = await getI18n()
const copy = dictionary.inventory.assets
@@ -31,7 +31,7 @@ export default async function EditAssetPage({
+ params: Promise<{ personId: string }>
}) {
- const { recipientId } = await params
+ const { personId } = await params
const { dictionary } = await getI18n()
- const copy = dictionary.inventory.recipients
- const recipient = await RecipientService.findById(recipientId)
+ const copy = dictionary.inventory.people
+ const person = await PersonService.findById(personId)
- if (!recipient) {
+ if (!person) {
return {copy.edit.notFound}
}
@@ -22,8 +22,8 @@ export default async function RecipientEditPage({
{copy.edit.title}
-
+ params: Promise<{ personId: string }>
}) {
- const { recipientId } = await params
+ const { personId } = await params
const { dictionary } = await getI18n()
- const copy = dictionary.inventory.recipients
+ const copy = dictionary.inventory.people
const assignmentCopy = dictionary.inventory.assignments
- const recipient = await RecipientService.findById(recipientId)
- const assignments = await AssignmentService.findAllByRecipient(recipientId)
+ const person = await PersonService.findById(personId)
+ const assignments = await AssignmentService.findAllByPerson(personId)
- if (!recipient) {
+ if (!person) {
return {copy.detail.notFound}
}
@@ -25,33 +25,25 @@ export default async function RecipientInfoPage({
-
- {`${recipient.firstName} ${recipient.lastName}`}
-
+ {`${person.firstName} ${person.lastName}`}
-
-
- {copy.detail.labels.username}
-
- {recipient.username}
-
{copy.detail.labels.email}
- {recipient.email}
+ {person.email}
{copy.detail.labels.phone}
- {recipient.phone}
+ {person.phone}
{copy.detail.labels.department}
- {formatRecipientDepartment(
- recipient.department,
+ {formatPersonDepartment(
+ person.department,
copy.departments,
copy.fallback,
)}
diff --git a/src/app/(dashboard)/people/_components/person.copy.ts b/src/app/(dashboard)/people/_components/person.copy.ts
new file mode 100644
index 0000000..be84458
--- /dev/null
+++ b/src/app/(dashboard)/people/_components/person.copy.ts
@@ -0,0 +1,22 @@
+import type { Dictionary } from "@/i18n/dictionaries"
+
+export type PersonListCopy = Dictionary["inventory"]["people"]["list"]
+export type PersonDetailCopy = Dictionary["inventory"]["people"]["detail"]
+export type PersonFormCopy = Dictionary["inventory"]["people"]["form"]
+export type PersonDepartmentCopy =
+ Dictionary["inventory"]["people"]["departments"]
+export type PersonFallbackCopy = Dictionary["inventory"]["people"]["fallback"]
+
+export function formatPersonDepartment(
+ department: string | null | undefined,
+ departmentCopy: PersonDepartmentCopy,
+ fallbackCopy: PersonFallbackCopy,
+) {
+ if (!department) {
+ return fallbackCopy.unknownDepartment
+ }
+
+ return department in departmentCopy
+ ? departmentCopy[department as keyof PersonDepartmentCopy]
+ : fallbackCopy.unknownDepartment
+}
diff --git a/src/app/(dashboard)/recipients/_components/recipient.form.tsx b/src/app/(dashboard)/people/_components/person.form.tsx
similarity index 68%
rename from src/app/(dashboard)/recipients/_components/recipient.form.tsx
rename to src/app/(dashboard)/people/_components/person.form.tsx
index e79fbfe..2a450c8 100644
--- a/src/app/(dashboard)/recipients/_components/recipient.form.tsx
+++ b/src/app/(dashboard)/people/_components/person.form.tsx
@@ -5,42 +5,39 @@ import { useRouter } from "next/navigation"
import { useMemo } from "react"
import { useForm } from "react-hook-form"
import { toast } from "sonner"
-import {
- createNewRecipient,
- updateRecipient,
-} from "@/actions/recipient.actions"
+import { createNewPerson, updatePerson } from "@/actions/person.actions"
import {
SubmitButton,
type SubmitButtonCopy,
} from "@/components/forms/submitButton"
-import { RECIPIENT_DEPARTMENTS } from "@/lib/constants"
+import { PERSON_DEPARTMENTS } from "@/lib/constants"
import {
- buildCreateRecipientSchema,
- buildUpdateRecipientSchema,
- type CreateRecipientFormType,
- type RecipientSchemaCopy,
- type UpdateRecipientFormType,
-} from "@/schemas/recipient.schema"
-import type { Recipient } from "@/types"
+ buildCreatePersonSchema,
+ buildUpdatePersonSchema,
+ type CreatePersonFormType,
+ type PersonSchemaCopy,
+ type UpdatePersonFormType,
+} from "@/schemas/person.schema"
+import type { Person } from "@/types"
import {
- formatRecipientDepartment,
- type RecipientDepartmentCopy,
- type RecipientFallbackCopy,
- type RecipientFormCopy,
-} from "./recipient.copy"
+ formatPersonDepartment,
+ type PersonDepartmentCopy,
+ type PersonFallbackCopy,
+ type PersonFormCopy,
+} from "./person.copy"
-interface RecipientFormProps {
- initialData?: Recipient
+interface PersonFormProps {
+ initialData?: Person
mode?: "create" | "edit"
- formCopy: RecipientFormCopy
- schemaCopy: RecipientSchemaCopy
- departmentCopy: RecipientDepartmentCopy
- fallbackCopy: RecipientFallbackCopy
+ formCopy: PersonFormCopy
+ schemaCopy: PersonSchemaCopy
+ departmentCopy: PersonDepartmentCopy
+ fallbackCopy: PersonFallbackCopy
submitButtonCopy: SubmitButtonCopy
}
-export default function RecipientForm({
+export default function PersonForm({
initialData,
mode = "create",
formCopy,
@@ -48,13 +45,13 @@ export default function RecipientForm({
departmentCopy,
fallbackCopy,
submitButtonCopy,
-}: RecipientFormProps) {
+}: PersonFormProps) {
const router = useRouter()
const schema = useMemo(
() =>
mode === "create"
- ? buildCreateRecipientSchema(schemaCopy)
- : buildUpdateRecipientSchema(schemaCopy),
+ ? buildCreatePersonSchema(schemaCopy)
+ : buildUpdatePersonSchema(schemaCopy),
[mode, schemaCopy],
)
@@ -63,11 +60,10 @@ export default function RecipientForm({
handleSubmit,
setError,
formState: { errors, isSubmitting, isSubmitSuccessful },
- } = useForm({
+ } = useForm({
resolver: zodResolver(schema),
defaultValues: {
id: initialData?.id || "",
- username: initialData?.username || "",
firstName: initialData?.firstName || "",
lastName: initialData?.lastName || "",
department: initialData?.department || "OTHER",
@@ -76,16 +72,16 @@ export default function RecipientForm({
},
})
- const onSubmit = async (formData: CreateRecipientFormType) => {
+ const onSubmit = async (formData: CreatePersonFormType) => {
const response =
mode === "create"
- ? await createNewRecipient(formData)
- : await updateRecipient(formData as UpdateRecipientFormType)
+ ? await createNewPerson(formData)
+ : await updatePerson(formData as UpdatePersonFormType)
if (response?.errors) {
Object.entries(response.errors).forEach(([fieldName, messages]) => {
messages.forEach((msg: string) => {
- setError(fieldName as keyof CreateRecipientFormType, {
+ setError(fieldName as keyof CreatePersonFormType, {
type: "server",
message: msg,
})
@@ -97,28 +93,13 @@ export default function RecipientForm({
if (response?.success) {
toast.success(response.message)
- router.push("/recipients")
+ router.push("/people")
}
}
return (
|