diff --git a/apps/admin/src/features/inquiries/InquiriesPage.tsx b/apps/admin/src/features/inquiries/InquiriesPage.tsx index eae6131..3d3a4f4 100644 --- a/apps/admin/src/features/inquiries/InquiriesPage.tsx +++ b/apps/admin/src/features/inquiries/InquiriesPage.tsx @@ -11,7 +11,7 @@ import { message, } from "antd"; import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; -import type { AdminBooking } from "@personal-brand/api-client"; +import type { AdminBooking, InquirySubmission } from "@personal-brand/api-client"; import { createApiClient } from "../../lib/api.js"; import { useState } from "react"; @@ -50,6 +50,10 @@ export function InquiriesPage() { queryFn: () => client.getAdminBooking(selectedId!), enabled: Boolean(selectedId), }); + const submissions = useQuery({ + queryKey: ["admin-inquiry-submissions"], + queryFn: () => client.listAdminInquirySubmissions(), + }); return ( )} + + + rowKey="id" + loading={submissions.isLoading} + dataSource={submissions.data ?? []} + columns={[ + { title: "表单", dataIndex: ["inquiryForm", "name"] }, + { title: "版本", dataIndex: "formVersion", render: (value) => `v${value}` }, + { + title: "提交时间", + dataIndex: "createdAt", + render: (value: string) => new Date(value).toLocaleString("zh-CN"), + }, + { + title: "内容", + dataIndex: "values", + render: (value: Record) => JSON.stringify(value), + }, + ]} + /> + ); } diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts index 50c4361..4341d9e 100644 --- a/apps/api/src/main.ts +++ b/apps/api/src/main.ts @@ -483,6 +483,16 @@ export class AdminWorkspaceController { }); } + @Get("submissions") + listSubmissions(@Req() request: FastifyRequest): Promise { + this.requireAdmin(request); + return this.prisma.inquirySubmission.findMany({ + where: { brandId: this.brandId() }, + include: { inquiryForm: { select: { name: true } } }, + orderBy: { createdAt: "desc" }, + }); + } + @Post("forms") createForm(@Req() request: FastifyRequest, @Body() body: CreateInquiryFormDto): Promise { this.requireAdmin(request); diff --git a/apps/api/test/http.integration.test.js b/apps/api/test/http.integration.test.js index 3ac4cf3..c92d348 100644 --- a/apps/api/test/http.integration.test.js +++ b/apps/api/test/http.integration.test.js @@ -189,6 +189,15 @@ test("admin can create and version an inquiry form", async () => { }); assert.equal(submission.statusCode, 201); assert.equal(JSON.parse(submission.body).formVersion, 2); + const adminSubmissionsWithoutToken = await request("/admin/workspace/submissions"); + assert.equal(adminSubmissionsWithoutToken.statusCode, 401); + const adminSubmissions = await request("/admin/workspace/submissions", { + headers: { authorization: `Bearer ${token}` }, + }); + assert.equal(adminSubmissions.statusCode, 200); + assert.ok( + JSON.parse(adminSubmissions.body).some((item) => item.id === JSON.parse(submission.body).id), + ); } finally { await prisma.inquirySubmission.deleteMany({ where: { inquiryFormId: id } }); await prisma.inquiryForm.delete({ where: { id } }); diff --git a/packages/api-client/src/index.ts b/packages/api-client/src/index.ts index dafaa84..c24b14b 100644 --- a/packages/api-client/src/index.ts +++ b/packages/api-client/src/index.ts @@ -152,6 +152,16 @@ export interface InquiryForm { isEnabled: boolean; fieldsSnapshot: unknown[]; } +export interface InquirySubmission { + id: string; + inquiryFormId: string; + formVersion: number; + fieldsSnapshot: unknown[]; + values: Record; + activeFields: Record; + createdAt: string; + inquiryForm?: { name: string }; +} export interface PublicWorkspace { brand: BrandProfile | null; modules: BrandModule[]; @@ -337,6 +347,9 @@ export class ApiClient { listAdminInquiryForms(): Promise { return this.request("/admin/workspace/forms"); } + listAdminInquirySubmissions(): Promise { + return this.request("/admin/workspace/submissions"); + } createAdminInquiryForm(body: { name: string; offeringId?: string;