aferrer/stock-manager
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: consolidate admin/users management under /people

Browse Source
This commit is contained in:
Asis ferrer
2026-06-17 09:32:26 +02:00
parent 4f370eee70
commit d6b42d78e7
31 changed files with 1928 additions and 855 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit/app/people/edit-person-form-wiring.test.ts
+170
View File
@@ -0,0 +1,170 @@
import { createElement } from "react"
import { renderToStaticMarkup } from "react-dom/server"
import { beforeEach, describe, expect, it, vi } from "vitest"
import { en } from "@/i18n/dictionaries/en"
import { es } from "@/i18n/dictionaries/es"
import type { PersonWithUser } from "@/services/person.service"
const mocks = vi.hoisted(() => ({
getI18n: vi.fn(),
findByIdWithUser: vi.fn(),
findById: vi.fn(),
personForm: vi.fn(),
push: vi.fn(),
toastError: vi.fn(),
toastSuccess: vi.fn(),
}))
vi.mock("@/i18n/server", () => ({
getI18n: mocks.getI18n,
}))
vi.mock("@/services/person.service", () => ({
PersonService: {
findByIdWithUser: mocks.findByIdWithUser,
findById: mocks.findById,
},
}))
vi.mock("@/app/(dashboard)/people/_components/edit.person.form", () => ({
default: (props: unknown) => {
mocks.personForm(props)
return createElement("div", null, "Edit person form")
},
}))
vi.mock("next/navigation", () => ({
useRouter: () => ({ push: mocks.push }),
redirect: vi.fn(),
}))
vi.mock("@/actions/person.actions", () => ({
updatePersonUserAction: vi.fn(),
}))
vi.mock("sonner", () => ({
toast: {
error: mocks.toastError,
success: mocks.toastSuccess,
},
}))
const basePerson: PersonWithUser = {
id: "person-1",
firstName: "Ada",
lastName: "Lovelace",
department: "ENGINEERING",
email: "ada@example.test",
phone: "1234",
userId: null,
isActive: true,
createdAt: new Date("2024-01-01"),
updatedAt: new Date("2024-01-01"),
user: null,
}
const personWithUser: PersonWithUser = {
...basePerson,
id: "person-2",
userId: "user-1",
user: {
id: "user-1",
name: "Ada Lovelace",
email: "ada@example.test",
role: "ADMIN",
isActive: true,
createdAt: new Date("2024-01-01"),
updatedAt: new Date("2024-01-01"),
password: "hashed",
},
}
describe("edit person page wiring", () => {
beforeEach(() => {
vi.clearAllMocks()
mocks.getI18n.mockResolvedValue({ dictionary: en, locale: "en" })
})
it("loads the person without user, passes PersonWithoutUser to the edit form", async () => {
mocks.findByIdWithUser.mockResolvedValue({ ...basePerson, user: null })
const { default: PersonEditPage } = await import(
"@/app/(dashboard)/people/[personId]/edit/page"
)
renderToStaticMarkup(
await PersonEditPage({
params: Promise.resolve({ personId: "person-1" }),
}),
)
expect(mocks.findByIdWithUser).toHaveBeenCalledWith("person-1")
expect(mocks.personForm).toHaveBeenCalledWith(
expect.objectContaining({
person: expect.objectContaining({
id: "person-1",
user: null,
}),
formCopy: en.admin.users.form,
schemaCopy: {
...en.admin.users.schema,
...en.inventory.people.schema,
},
roleLabels: en.admin.users.roles,
}),
)
})
it("passes Spanish copy in es locale and passes the linked User to the form", async () => {
mocks.getI18n.mockResolvedValue({ dictionary: es, locale: "es" })
mocks.findByIdWithUser.mockResolvedValue(personWithUser)
const { default: PersonEditPage } = await import(
"@/app/(dashboard)/people/[personId]/edit/page"
)
renderToStaticMarkup(
await PersonEditPage({
params: Promise.resolve({ personId: "person-2" }),
}),
)
expect(mocks.personForm).toHaveBeenCalledWith(
expect.objectContaining({
person: expect.objectContaining({
id: "person-2",
user: expect.objectContaining({
id: "user-1",
role: "ADMIN",
isActive: true,
}),
}),
formCopy: es.admin.users.form,
roleLabels: es.admin.users.roles,
departmentCopy: es.inventory.people.departments,
fallbackCopy: expect.objectContaining({
unknownDepartment: es.inventory.people.fallback.unknownDepartment,
}),
}),
)
})
it("renders 'Person not found' in Spanish when person does not exist", async () => {
mocks.getI18n.mockResolvedValue({ dictionary: es, locale: "es" })
mocks.findByIdWithUser.mockResolvedValue(null)
const { default: PersonEditPage } = await import(
"@/app/(dashboard)/people/[personId]/edit/page"
)
const html = renderToStaticMarkup(
await PersonEditPage({
params: Promise.resolve({ personId: "missing" }),
}),
)
expect(html).toContain("Persona no encontrada")
expect(mocks.personForm).not.toHaveBeenCalled()
})
})
tests/unit/app/people/person-form-pages.test.ts
+28 -5
View File
@@ -5,8 +5,10 @@ import { es } from "@/i18n/dictionaries/es"
const mocks = vi.hoisted(() => ({
getI18n: vi.fn(),
findByIdWithUser: vi.fn(),
findById: vi.fn(),
redirect: vi.fn(),
personForm: vi.fn(),
}))
vi.mock("@/i18n/server", () => ({
@@ -15,6 +17,7 @@ vi.mock("@/i18n/server", () => ({
vi.mock("@/services/person.service", () => ({
PersonService: {
findByIdWithUser: mocks.findByIdWithUser,
findById: mocks.findById,
},
}))
@@ -29,6 +32,14 @@ vi.mock("next/navigation", () => ({
vi.mock("@/actions/person.actions", () => ({
createNewPerson: vi.fn(),
updatePerson: vi.fn(),
updatePersonUserAction: vi.fn(),
}))
vi.mock("@/app/(dashboard)/people/_components/edit.person.form", () => ({
default: (props: unknown) => {
mocks.personForm(props)
return null
},
}))
vi.mock("sonner", () => ({
@@ -44,18 +55,23 @@ describe("person pages", () => {
mocks.getI18n.mockResolvedValue({ dictionary: es, locale: "es" })
})
it("renders the edit person page with Person heading and no username", async () => {
it("renders the edit person page with Person heading and passes person to unified form", async () => {
const { default: PersonEditPage } = await import(
"@/app/(dashboard)/people/[personId]/edit/page"
)
mocks.findById.mockResolvedValue({
mocks.findByIdWithUser.mockResolvedValue({
id: "person-1",
firstName: "Ada",
lastName: "Lovelace",
email: "ada@example.test",
phone: "1234",
department: "ENGINEERING",
userId: null,
isActive: true,
createdAt: new Date("2024-01-01"),
updatedAt: new Date("2024-01-01"),
user: null,
})
const html = renderToStaticMarkup(
@@ -65,8 +81,15 @@ describe("person pages", () => {
)
expect(html).toContain("Editar persona")
expect(html).toContain("Actualizar persona")
expect(html).not.toContain("Usuario")
expect(mocks.personForm).toHaveBeenCalledWith(
expect.objectContaining({
person: expect.objectContaining({
id: "person-1",
firstName: "Ada",
lastName: "Lovelace",
}),
}),
)
})
it("renders a Person not-found message on edit page", async () => {
@@ -74,7 +97,7 @@ describe("person pages", () => {
"@/app/(dashboard)/people/[personId]/edit/page"
)
mocks.findById.mockResolvedValue(null)
mocks.findByIdWithUser.mockResolvedValue(null)
const html = renderToStaticMarkup(
await PersonEditPage({
tests/unit/app/people/person-form-wiring.test.ts
-63
View File
@@ -1,63 +0,0 @@
import { createElement } from "react"
import { renderToStaticMarkup } from "react-dom/server"
import { beforeEach, describe, expect, it, vi } from "vitest"
import { en } from "@/i18n/dictionaries/en"
const mocks = vi.hoisted(() => ({
getI18n: vi.fn(),
findById: vi.fn(),
personForm: vi.fn(),
}))
vi.mock("@/i18n/server", () => ({
getI18n: mocks.getI18n,
}))
vi.mock("@/services/person.service", () => ({
PersonService: {
findById: mocks.findById,
},
}))
vi.mock("@/app/(dashboard)/people/_components/person.form", () => ({
default: (props: unknown) => {
mocks.personForm(props)
return createElement("div", null, "Person form")
},
}))
describe("person form schema wiring", () => {
beforeEach(() => {
vi.clearAllMocks()
})
it("passes server-resolved Person schema copy into the edit person form boundary", async () => {
mocks.getI18n.mockResolvedValue({ dictionary: en, locale: "en" })
mocks.findById.mockResolvedValue({
id: "person-1",
firstName: "Ada",
lastName: "Lovelace",
department: "ENGINEERING",
email: "ada@example.test",
phone: "1234",
})
const { default: PersonEditPage } = await import(
"@/app/(dashboard)/people/[personId]/edit/page"
)
renderToStaticMarkup(
await PersonEditPage({
params: Promise.resolve({ personId: "person-1" }),
}),
)
expect(mocks.personForm).toHaveBeenCalledWith(
expect.objectContaining({
mode: "edit",
schemaCopy: en.inventory.people.schema,
}),
)
})
})
tests/unit/app/people/person-pages.test.ts
+155 -2
View File
@@ -7,6 +7,7 @@ import { en } from "@/i18n/dictionaries/en"
const mocks = vi.hoisted(() => ({
findAllPaginated: vi.fn(),
findById: vi.fn(),
findByIdWithUser: vi.fn(),
findAllByPerson: vi.fn(),
getI18n: vi.fn(),
}))
@@ -19,6 +20,7 @@ vi.mock("@/services/person.service", () => ({
PersonService: {
findAllPaginated: mocks.findAllPaginated,
findById: mocks.findById,
findByIdWithUser: mocks.findByIdWithUser,
},
}))
@@ -62,6 +64,11 @@ describe("person pages", () => {
email: "ada@example.test",
phone: "1234",
department: "ENGINEERING",
userId: null,
isActive: true,
createdAt: new Date("2024-01-01"),
updatedAt: new Date("2024-01-01"),
user: null,
},
],
totalPages: 1,
@@ -86,6 +93,72 @@ describe("person pages", () => {
expect(html).toContain("/people/person-1/edit")
})
it("renders role and status columns for people with linked users", async () => {
const { default: PeoplePage } = await import(
"@/app/(dashboard)/people/page"
)
mocks.findAllPaginated.mockResolvedValue({
data: [
{
id: "person-1",
firstName: "Ada",
lastName: "Lovelace",
email: "ada@example.test",
phone: "1234",
department: "ENGINEERING",
userId: "user-1",
isActive: true,
createdAt: new Date("2024-01-01"),
updatedAt: new Date("2024-01-01"),
user: {
id: "user-1",
name: "Ada Lovelace",
email: "ada@example.test",
role: "ADMIN",
isActive: true,
createdAt: new Date("2024-01-01"),
updatedAt: new Date("2024-01-01"),
password: "hashed",
movements: [],
assignments: [],
person: null,
},
},
{
id: "person-2",
firstName: "Bob",
lastName: "Jones",
email: "bob@example.test",
phone: null,
department: "IT",
userId: null,
isActive: true,
createdAt: new Date("2024-01-01"),
updatedAt: new Date("2024-01-01"),
user: null,
},
],
totalPages: 1,
})
const html = renderToStaticMarkup(
await PeoplePage({ searchParams: Promise.resolve({}) }),
)
// Column headers from inventory.people.list.columns
expect(html).toContain("Role")
expect(html).toContain("Status")
// Person with linked user: role label + active label
expect(html).toContain("Admin")
expect(html).toContain("Active")
// Person without user: no canonical enum leaks, just placeholder
expect(html).not.toContain(">STAFF<")
expect(html).not.toContain(">ADMIN<")
})
it("renders the person list empty state from Person copy", async () => {
const { default: PeoplePage } = await import(
"@/app/(dashboard)/people/page"
@@ -108,13 +181,18 @@ describe("person pages", () => {
"@/app/(dashboard)/people/[personId]/page"
)
mocks.findById.mockResolvedValue({
mocks.findByIdWithUser.mockResolvedValue({
id: "person-1",
firstName: "Ada",
lastName: "Lovelace",
email: "ada@example.test",
phone: "1234",
department: "DRIVER",
userId: null,
isActive: true,
createdAt: new Date("2024-01-01"),
updatedAt: new Date("2024-01-01"),
user: null,
})
mocks.findAllByPerson.mockResolvedValue([
{
@@ -144,12 +222,87 @@ describe("person pages", () => {
expect(html).toContain("Laptop")
})
it("renders person detail User role and status when person has linked User", async () => {
const { default: PersonInfoPage } = await import(
"@/app/(dashboard)/people/[personId]/page"
)
mocks.findByIdWithUser.mockResolvedValue({
id: "person-1",
firstName: "Ada",
lastName: "Lovelace",
email: "ada@example.test",
phone: "1234",
department: "DRIVER",
userId: "user-1",
isActive: true,
createdAt: new Date("2024-01-01"),
updatedAt: new Date("2024-01-01"),
user: {
id: "user-1",
name: "Ada Lovelace",
email: "ada@example.test",
role: "ADMIN",
isActive: true,
createdAt: new Date("2024-01-01"),
updatedAt: new Date("2024-01-01"),
password: "hashed",
movements: [],
assignments: [],
person: null,
},
})
mocks.findAllByPerson.mockResolvedValue([])
const html = renderToStaticMarkup(
await PersonInfoPage({
params: Promise.resolve({ personId: "person-1" }),
}),
)
expect(html).toContain("Role")
expect(html).toContain("Status")
expect(html).toContain("Admin")
expect(html).toContain("Active")
// Canonical enum value must not leak into display
expect(html).not.toContain(">ADMIN<")
})
it("renders 'No user account' placeholder for person without linked User", async () => {
const { default: PersonInfoPage } = await import(
"@/app/(dashboard)/people/[personId]/page"
)
mocks.findByIdWithUser.mockResolvedValue({
id: "person-1",
firstName: "Ada",
lastName: "Lovelace",
email: "ada@example.test",
phone: "1234",
department: "DRIVER",
userId: null,
isActive: true,
createdAt: new Date("2024-01-01"),
updatedAt: new Date("2024-01-01"),
user: null,
})
mocks.findAllByPerson.mockResolvedValue([])
const html = renderToStaticMarkup(
await PersonInfoPage({
params: Promise.resolve({ personId: "person-1" }),
}),
)
expect(html).toContain("No user account")
})
it("renders person detail not-found from Person copy", async () => {
const { default: PersonInfoPage } = await import(
"@/app/(dashboard)/people/[personId]/page"
)
mocks.findById.mockResolvedValue(null)
mocks.findByIdWithUser.mockResolvedValue(null)
mocks.findAllByPerson.mockResolvedValue([])
const html = renderToStaticMarkup(