feat(people): adapt person user flows to status model
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
|
||||
import { UserStatus } from "@/generated/prisma/client"
|
||||
import { getI18n } from "@/i18n/server"
|
||||
import { AssignmentService } from "@/services/assignment.service"
|
||||
import { PersonService } from "@/services/person.service"
|
||||
@@ -74,7 +75,7 @@ export default async function PersonInfoPage({
|
||||
{copy.detail.labels.status}
|
||||
</span>
|
||||
<span>
|
||||
{person.user.isActive
|
||||
{person.user.status === UserStatus.ACTIVE
|
||||
? userCopy.status.active
|
||||
: userCopy.status.inactive}
|
||||
</span>
|
||||
|
||||
@@ -11,6 +11,7 @@ import {
|
||||
SubmitButton,
|
||||
type SubmitButtonCopy,
|
||||
} from "@/components/forms/submitButton"
|
||||
import { UserStatus } from "@/generated/prisma/client"
|
||||
import { PERSON_DEPARTMENTS } from "@/lib/constants"
|
||||
import {
|
||||
buildUnifiedUpdateSchema,
|
||||
@@ -70,7 +71,9 @@ export default function EditPersonForm({
|
||||
department: person.department ?? "OTHER",
|
||||
email: person.email ?? "",
|
||||
phone: person.phone ?? "",
|
||||
...(hasUser && user ? { role: user.role, isActive: user.isActive } : {}),
|
||||
...(hasUser && user
|
||||
? { role: user.role, isActive: user.status === UserStatus.ACTIVE }
|
||||
: {}),
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ import Link from "next/link"
|
||||
import PageHeader from "@/components/common/pageheader"
|
||||
import PaginationButtons from "@/components/common/pagination"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import { UserStatus } from "@/generated/prisma/client"
|
||||
import { getI18n } from "@/i18n/server"
|
||||
import { PersonService } from "@/services/person.service"
|
||||
|
||||
@@ -105,7 +106,7 @@ export default async function PeoplePage(props: {
|
||||
</td>
|
||||
<td className="p-4">
|
||||
{person.user
|
||||
? person.user.isActive
|
||||
? person.user.status === UserStatus.ACTIVE
|
||||
? userStatusCopy.active
|
||||
: userStatusCopy.inactive
|
||||
: "—"}
|
||||
|
||||
Reference in New Issue
Block a user