feat(form): add submission link webhook placeholder

app/actions/submissions.ts

@@ -15,6 +15,12 @@ import {
 } from "@/lib/submission-intake";
 import { submissionWebhookMessage } from "@/lib/submission-webhook";
 
+function getSubmissionResultLink(formId: string, submissionId: string) {
+  const baseUrl = process.env.BASE_URL || process.env.NEXTAUTH_URL;
+  if (!baseUrl) return `/admin/form/${formId}/result/${submissionId}`;
+  return new URL(`/admin/form/${formId}/result/${submissionId}`, baseUrl).toString();
+}
+
 export async function submitForm(
   formId: string,
   answersList: FormAnswerPayload[],
@@ -171,11 +177,13 @@ export async function submitForm(
 
   if (form.discordWebhookUrl) {
     try {
+      const submissionLink = getSubmissionResultLink(formId, result.submissionId);
       const message = submissionWebhookMessage({
         template: templateToUse,
         isUpdate: result.isUpdate,
         userName: session.user.name,
         discordId,
+        submissionLink,
         questions: questionsList,
         answers: normalizedAnswers,
         oldAnswersByQuestionId: result.oldAnswersDict,

app/admin/form/[id]/extra/client.tsx

@@ -336,10 +336,10 @@ export default function FormExtraClient({ form }: FormExtraClientProps) {
               className="min-h-24"
             />
             <p className="text-sm text-muted-foreground">
-              Use <code>{`{1}`}</code>, <code>{`{2}`}</code> to insert answers according to question order, and <code>{`{username}`}</code>, <code>{`{displayname}`}</code>, <code>{`{id}`}</code> for user info.
+              Use <code>{`{1}`}</code>, <code>{`{2}`}</code> to insert answers according to question order, <code>{`{link}`}</code> for the admin result link, and <code>{`{username}`}</code>, <code>{`{displayname}`}</code>, <code>{`{id}`}</code> for user info.
             </p>
             <div className="flex flex-wrap gap-2">
-              {["username", "displayname", "id", "1", "2"].map((variable) => (
+              {["username", "displayname", "id", "link", "1", "2"].map((variable) => (
                 <Button
                   key={variable}
                   type="button"
@@ -368,10 +368,10 @@ export default function FormExtraClient({ form }: FormExtraClientProps) {
               className="min-h-24"
             />
             <p className="text-sm text-muted-foreground">
-              Used when a user updates their existing submission. Use <code>{`{1}`}</code>, <code>{`{2}`}</code> for answers, <code>{`{update}`}</code> to show what was changed, and <code>{`{username}`}</code>, <code>{`{displayname}`}</code>, <code>{`{id}`}</code> for user info.
+              Used when a user updates their existing submission. Use <code>{`{1}`}</code>, <code>{`{2}`}</code> for answers, <code>{`{update}`}</code> to show what was changed, <code>{`{link}`}</code> for the admin result link, and <code>{`{username}`}</code>, <code>{`{displayname}`}</code>, <code>{`{id}`}</code> for user info.
             </p>
             <div className="flex flex-wrap gap-2">
-              {["username", "displayname", "id", "update", "1", "2"].map((variable) => (
+              {["username", "displayname", "id", "link", "update", "1", "2"].map((variable) => (
                 <Button
                   key={variable}
                   type="button"

lib/discord-webhook-settings.ts

@@ -30,6 +30,9 @@ export function previewWebhookTemplate(
     const key = variable.toLowerCase();
     if (key === "username" || key === "displayname") return "Example User";
     if (key === "id") return "123456789";
+    if (key === "link") {
+      return "https://erika.sudloh.com/admin/form/example-form/result/example-submission";
+    }
     if (key === "update") return "Question 1: Previous answer → Example answer";
     if (/^\d+$/.test(key)) return `Example answer ${key}`;
     return `{${variable}}`;

lib/submission-webhook.test.ts

@@ -31,6 +31,7 @@ test("uses an image URL for image-only placeholders", () => {
     isUpdate: false,
     userName: "Gunshiz",
     discordId: "123",
+    submissionLink: "https://erika.sudloh.com/admin/form/form-1/result/submission-1",
     questions,
     answers: [{
       questionId: "name",
@@ -48,12 +49,26 @@ test("uses the configured template", () => {
     isUpdate: false,
     userName: "Gunshiz",
     discordId: "123",
+    submissionLink: "https://erika.sudloh.com/admin/form/form-1/result/submission-1",
     questions,
     answers,
     oldAnswersByQuestionId: {},
   })).toBe("New answer: Erika by Gunshiz (123)");
 });
 
+test("uses a submission result link placeholder", () => {
+  expect(submissionWebhookMessage({
+    template: "Review: {link}",
+    isUpdate: false,
+    userName: "Gunshiz",
+    discordId: "123",
+    submissionLink: "https://erika.sudloh.com/admin/form/form-1/result/submission-1",
+    questions,
+    answers,
+    oldAnswersByQuestionId: {},
+  })).toBe("Review: https://erika.sudloh.com/admin/form/form-1/result/submission-1");
+});
+
 describe("default templates", () => {
   test("sends a new-submission message when its template is blank", () => {
     expect(submissionWebhookMessage({
@@ -61,6 +76,7 @@ describe("default templates", () => {
       isUpdate: false,
       userName: "Gunshiz",
       discordId: "123",
+      submissionLink: "https://erika.sudloh.com/admin/form/form-1/result/submission-1",
       questions,
       answers,
       oldAnswersByQuestionId: {},
@@ -73,6 +89,7 @@ describe("default templates", () => {
       isUpdate: true,
       userName: "Gunshiz",
       discordId: "123",
+      submissionLink: "https://erika.sudloh.com/admin/form/form-1/result/submission-1",
       questions,
       answers,
       oldAnswersByQuestionId: { name: "Old name" },

lib/submission-webhook.ts

@@ -14,6 +14,7 @@ type SubmissionWebhookMessageOptions = {
   isUpdate: boolean;
   userName: string | null | undefined;
   discordId: string;
+  submissionLink: string;
   questions: SubmissionQuestion[];
   answers: NormalizedSubmissionAnswer[];
   oldAnswersByQuestionId: OldAnswersByQuestionId;
@@ -24,6 +25,7 @@ export function submissionWebhookMessage({
   isUpdate,
   userName,
   discordId,
+  submissionLink,
   questions,
   answers,
   oldAnswersByQuestionId,
@@ -43,6 +45,9 @@ export function submissionWebhookMessage({
     if (key === "id") {
       return discordId;
     }
+    if (key === "link") {
+      return submissionLink;
+    }
     if (key === "update") {
       return updatesText;
     }