Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions apps/web/src/app/api/guilds/[guildId]/status-messages/route.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import { Prisma, prisma } from "@msk-forms/db";
import { parseStatusMessages, statusMessagesSchema } from "@msk-forms/shared";
import { NextResponse, type NextRequest } from "next/server";

import { getCurrentUser } from "@/lib/auth";
import { canManageForms } from "@/lib/guild";

export const runtime = "nodejs";
export const dynamic = "force-dynamic";

/**
* Save the guild-wide automatic per-status messages (manager-only). Blank
* entries are dropped, so clearing a status' textbox removes its template.
*/
export async function PATCH(
request: NextRequest,
{ params }: { params: Promise<{ guildId: string }> },
) {
const { guildId } = await params;

const user = await getCurrentUser();
if (!user) return NextResponse.json({ error: "Unauthorized." }, { status: 401 });
if (!(await canManageForms(guildId, user.id))) {
return NextResponse.json({ error: "Forbidden." }, { status: 403 });
}

const body = (await request.json().catch(() => null)) as { messages?: unknown } | null;
const parsed = statusMessagesSchema.safeParse(body?.messages);
if (!parsed.success) {
return NextResponse.json({ error: "Invalid messages." }, { status: 422 });
}

const messages = parseStatusMessages(parsed.data);
await prisma.guild.update({
where: { id: guildId },
data: { statusMessages: messages as Prisma.InputJsonValue },
});
return NextResponse.json({ ok: true });
}
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ export async function POST(
actorName: user.username,
toStatusLabel,
eventVisibility: action.hidden ? "internal" : "public",
// Omitted -> auto per-status template; provided -> reviewer override
// (empty string opts out). Hidden changes never carry a message anyway.
applicantMessage: action.message,
notify: notify
? { userId: submission.userId!, type: "status_change", payload: notify }
: null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export default async function EditFormPage({
pages: spec?.pages.length ? spec.pages : [{ id: "p1", title: "", fields: [] }],
automations: settings.automations,
experiment: settings.experiment ?? { enabled: false, variants: [] },
statusMessages: settings.statusMessages ?? {},
}}
/>
</div>
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/app/dashboard/[guildId]/forms/new/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ export default async function NewFormPage({
pages: [{ id: "p1", title: "", fields: [] }],
automations: [],
experiment: { enabled: false, variants: [] },
statusMessages: {},
}}
/>
</div>
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/app/dashboard/[guildId]/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export default async function GuildLayout({
...(canManage
? [
{ href: `/dashboard/${guildId}/statuses`, label: t.statusesTab, prefix: true },
{ href: `/dashboard/${guildId}/messages`, label: t.messagesTab, prefix: true },
{ href: `/dashboard/${guildId}/categories`, label: t.categoriesTab, prefix: true },
{ href: `/dashboard/${guildId}/branding`, label: t.brandingTab, prefix: true },
{ href: `/dashboard/${guildId}/bot`, label: t.botTab, prefix: true },
Expand Down
59 changes: 59 additions & 0 deletions apps/web/src/app/dashboard/[guildId]/messages/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import { prisma } from "@msk-forms/db";
import { parseStatusMessages } from "@msk-forms/shared";
import { Card } from "@msk-forms/ui";

import { StatusMessagesForm } from "@/components/messages/status-messages-form";
import { requireUser } from "@/lib/auth";
import { getStatusOptionsForGuild } from "@/lib/forms";
import { canManageForms } from "@/lib/guild";
import { getDict } from "@/i18n";

export const runtime = "nodejs";
export const dynamic = "force-dynamic";

export default async function StatusMessagesPage({
params,
}: {
params: Promise<{ guildId: string }>;
}) {
const { guildId } = await params;
const user = await requireUser(`/dashboard/${guildId}/messages`);
const dict = await getDict();
const t = dict.dashboard;

if (!(await canManageForms(guildId, user.id))) {
return (
<Card className="p-8">
<p className="text-muted-foreground">{t.msgNoPerm}</p>
</Card>
);
}

const [statuses, guild] = await Promise.all([
getStatusOptionsForGuild(guildId, dict.statusLabels),
prisma.guild.findUnique({ where: { id: guildId }, select: { statusMessages: true } }),
]);
const messages = parseStatusMessages(guild?.statusMessages);

return (
<div className="flex flex-col gap-4">
<div className="flex flex-col gap-1">
<h2 className="font-heading text-xl font-semibold text-foreground">{t.msgTitle}</h2>
<p className="text-sm text-muted-foreground">{t.msgIntro}</p>
</div>
<StatusMessagesForm
guildId={guildId}
statuses={statuses}
initial={messages}
t={{
placeholder: t.msgPlaceholder,
hint: t.msgHint,
save: t.msgSave,
saving: t.msgSaving,
saved: t.msgSaved,
errSave: t.msgErr,
}}
/>
</div>
);
}
19 changes: 19 additions & 0 deletions apps/web/src/app/dashboard/[guildId]/submissions/[id]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { prisma } from "@msk-forms/db";
import { parseStatusMessages, resolveStatusMessage } from "@msk-forms/shared";
import type { Route } from "next";
import { StatusBadge } from "@msk-forms/ui";
import Link from "next/link";
Expand Down Expand Up @@ -37,6 +39,22 @@ export default async function SubmissionDetailPage({
const status = resolveStatus(submission.status, submission.statusDefs, dict.statusLabels);
const answers = (submission.answers ?? {}) as Record<string, unknown>;

// Resolve the per-status message template (form override -> guild) so the
// review panel can prefill the applicant message when a status is picked.
const [guildCfg, formCfg] = await Promise.all([
prisma.guild.findUnique({ where: { id: guildId }, select: { statusMessages: true } }),
prisma.form.findUnique({ where: { id: submission.formId }, select: { settings: true } }),
]);
const guildMsgs = parseStatusMessages(guildCfg?.statusMessages);
const formMsgs = parseStatusMessages(
(formCfg?.settings as { statusMessages?: unknown } | null)?.statusMessages,
);
const statusMessages: Record<string, string> = {};
for (const opt of submission.options) {
const msg = resolveStatusMessage(guildMsgs, formMsgs, opt.key);
if (msg) statusMessages[opt.key] = msg;
}

return (
<div className="flex flex-col gap-6">
<div className="flex flex-col gap-3">
Expand Down Expand Up @@ -137,6 +155,7 @@ export default async function SubmissionDetailPage({
submissionId={submission.id}
currentStatus={submission.status}
options={submission.options}
statusMessages={statusMessages}
t={t}
/>
) : (
Expand Down
33 changes: 33 additions & 0 deletions apps/web/src/components/builder/form-builder.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ export interface FormBuilderInitial {
pages: FormPage[];
automations: AutomationRule[];
experiment: Experiment;
/** Per-form status message overrides, keyed by status key. */
statusMessages: Record<string, string>;
}

/** ISO → `datetime-local` input value (YYYY-MM-DDTHH:MM) in the viewer's tz. */
Expand Down Expand Up @@ -163,6 +165,9 @@ export function FormBuilder({
const [pages, setPages] = useState<FormPage[]>(initial.pages);
const [automations, setAutomations] = useState<AutomationRule[]>(initial.automations);
const [experiment, setExperiment] = useState<Experiment>(initial.experiment);
const [statusMessages, setStatusMessages] = useState<Record<string, string>>(
initial.statusMessages,
);
const [error, setError] = useState<string | null>(null);
const [saving, setSaving] = useState(false);

Expand Down Expand Up @@ -244,6 +249,13 @@ export function FormBuilder({
if (experiment.enabled) settings.experiment = experiment;
if (showCountdown) settings.showCountdown = true;
settings.singleSubmission = singleSubmission;
// Keep only non-blank per-status overrides.
const trimmedMessages = Object.fromEntries(
Object.entries(statusMessages)
.map(([k, v]) => [k, v.trim()] as const)
.filter(([, v]) => v),
);
if (Object.keys(trimmedMessages).length > 0) settings.statusMessages = trimmedMessages;
const payload = {
title: title.trim(),
description: description.trim() || null,
Expand Down Expand Up @@ -354,6 +366,27 @@ export function FormBuilder({
/>
</Field>
</div>
<details className="rounded-md border border-border p-3">
<summary className="cursor-pointer text-sm font-medium text-foreground">
{t.statusMessagesLabel}
</summary>
<p className="mt-2 text-xs text-muted-foreground">{t.statusMessagesHint}</p>
<div className="mt-3 flex flex-col gap-3">
{statusOptions.map((s) => (
<Field key={s.value} label={s.label}>
<Textarea
value={statusMessages[s.value] ?? ""}
onChange={(e) =>
setStatusMessages((m) => ({ ...m, [s.value]: e.target.value }))
}
placeholder={t.statusMessagesPlaceholder}
rows={2}
maxLength={2000}
/>
</Field>
))}
</div>
</details>
<div className="grid gap-4 sm:grid-cols-2">
<Field label={t.opensLabel} hint={t.scheduleHint}>
<DateField
Expand Down
87 changes: 87 additions & 0 deletions apps/web/src/components/messages/status-messages-form.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
"use client";

import { Button, Card, Field, Textarea } from "@msk-forms/ui";
import { useRouter } from "next/navigation";
import { useState } from "react";

interface StatusMessagesLabels {
placeholder: string;
hint: string;
save: string;
saving: string;
saved: string;
errSave: string;
}

/**
* Guild-wide per-status message editor. Each status gets an optional message
* automatically sent to the applicant when a submission enters it. Blank = no
* message. A per-form override can be set in the form builder.
*/
export function StatusMessagesForm({
guildId,
statuses,
initial,
t,
}: {
guildId: string;
statuses: { value: string; label: string }[];
initial: Record<string, string>;
t: StatusMessagesLabels;
}) {
const router = useRouter();
const [messages, setMessages] = useState<Record<string, string>>(initial);
const [saving, setSaving] = useState(false);
const [error, setError] = useState<string | null>(null);
const [saved, setSaved] = useState(false);

function set(key: string, value: string) {
setMessages((m) => ({ ...m, [key]: value }));
setSaved(false);
}

async function save() {
setSaving(true);
setError(null);
try {
const res = await fetch(`/api/guilds/${guildId}/status-messages`, {
method: "PATCH",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ messages }),
});
if (!res.ok) throw new Error(t.errSave);
setSaved(true);
router.refresh();
} catch (err) {
setError(err instanceof Error ? err.message : t.errSave);
} finally {
setSaving(false);
}
}

return (
<Card className="flex flex-col gap-4 p-5">
<div className="flex flex-col gap-4">
{statuses.map((s) => (
<Field key={s.value} label={s.label}>
<Textarea
value={messages[s.value] ?? ""}
onChange={(e) => set(s.value, e.target.value)}
placeholder={t.placeholder}
rows={2}
maxLength={2000}
/>
</Field>
))}
</div>
<p className="text-xs text-muted-foreground">{t.hint}</p>
<div className="flex items-center gap-3">
<Button type="button" onClick={save} disabled={saving}>
{saving ? t.saving : t.save}
</Button>
{saved && <span className="text-sm text-primary">{t.saved}</span>}
{error && <span className="text-sm text-destructive">{error}</span>}
</div>
</Card>
);
}
31 changes: 29 additions & 2 deletions apps/web/src/components/review/review-panel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { Button, Card, Checkbox, Field, Select, Textarea } from "@msk-forms/ui";
import { useRouter } from "next/navigation";
import { useState } from "react";
import { useEffect, useState } from "react";

import type { Dictionary } from "@/i18n";
import type { SubmissionAction } from "@/lib/submission-action";
Expand All @@ -19,19 +19,28 @@ export function ReviewPanel({
submissionId,
currentStatus,
options,
statusMessages,
t,
}: {
guildId: string;
submissionId: string;
currentStatus: string;
options: { key: string; label: string }[];
/** Resolved per-status message template (form override -> guild) for this form. */
statusMessages: Record<string, string>;
t: ReviewDict;
}) {
const router = useRouter();
const [status, setStatus] = useState(currentStatus);
const [hidden, setHidden] = useState(false);
const [note, setNote] = useState("");
const [message, setMessage] = useState("");
// Editable applicant message that travels with the status change, prefilled
// from the target status' template. Reset whenever the target status changes.
const [statusMsg, setStatusMsg] = useState(statusMessages[currentStatus] ?? "");
useEffect(() => {
setStatusMsg(statusMessages[status] ?? "");
}, [status, statusMessages]);
const [pending, setPending] = useState<SubmissionAction["kind"] | null>(null);
const [error, setError] = useState<string | null>(null);

Expand Down Expand Up @@ -77,11 +86,29 @@ export function ReviewPanel({
type="button"
className="shrink-0"
disabled={pending !== null || status === currentStatus}
onClick={() => submit({ kind: "status", status, hidden })}
onClick={() => {
const original = statusMessages[status] ?? "";
// Unchanged prefill -> let the server auto-apply the template;
// otherwise send the (edited or cleared) message as an override.
const msg = statusMsg === original ? undefined : statusMsg;
submit({ kind: "status", status, hidden, message: msg });
}}
>
{pending === "status" ? t.saving : t.apply}
</Button>
</div>
{!hidden && (
<>
<Textarea
value={statusMsg}
onChange={(e) => setStatusMsg(e.target.value)}
placeholder={t.statusMessagePlaceholder}
rows={2}
maxLength={2000}
/>
<p className="text-xs text-muted-foreground">{t.statusMessageHint}</p>
</>
)}
<Checkbox
id="hide-status-change"
checked={hidden}
Expand Down
Loading