Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat(agreement): add requireName to agreement
Marc Seitz2fa22867716d
diff --git a/components/links/link-sheet/agreement-panel/index.tsx b/components/links/link-sheet/agreement-panel/index.tsxindex 8dbd5eec..7c20cbed 100644--- a/components/links/link-sheet/agreement-panel/index.tsx+++ b/components/links/link-sheet/agreement-panel/index.tsx@@ -30,6 +30,8 @@ import {import { putFile } from "@/lib/files/put-file";import { getSupportedContentType } from "@/lib/utils/get-content-type";+import LinkItem from "../link-item";+export default function AgreementSheet({isOpen,setIsOpen,@@ -39,7 +41,7 @@ export default function AgreementSheet({}) {const teamInfo = useTeam();const teamId = teamInfo?.currentTeam?.id;- const [data, setData] = useState({ name: "", link: "" });+ const [data, setData] = useState({ name: "", link: "", requireName: true });const [isLoading, setIsLoading] = useState<boolean>(false);const [currentFile, setCurrentFile] = useState<File | null>(null);const [currentLink, setCurrentLink] = useState<string | null>(null);@@ -129,7 +131,7 @@ export default function AgreementSheet({} finally {setIsLoading(false);setIsOpen(false);- setData({ name: "", link: "" });+ setData({ name: "", link: "", requireName: true });}};@@ -173,6 +175,16 @@ export default function AgreementSheet({/></div>+ <div>+ <LinkItem+ title="Require viewer's name"+ enabled={data.requireName}+ action={() =>+ setData({ ...data, requireName: !data.requireName })+ }+ />+ </div>+<div className="space-y-4"><div className="w-full space-y-2"><Label htmlFor="link">Link to an agreement</Label>diff --git a/components/view/access-form/agreement-section.tsx b/components/view/access-form/agreement-section.tsxindex 01710e38..474cbde1 100644--- a/components/view/access-form/agreement-section.tsx+++ b/components/view/access-form/agreement-section.tsx@@ -25,7 +25,7 @@ export default function AgreementSection({return (<div className="pb-5">- <div className="relative flex items-start space-x-2 rounded-md shadow-sm">+ <div className="relative flex items-start space-x-2"><Checkboxid="agreement"onCheckedChange={handleCheckChange}diff --git a/components/view/access-form/index.tsx b/components/view/access-form/index.tsxindex 7cc2ffcd..20a2bb3e 100644--- a/components/view/access-form/index.tsx+++ b/components/view/access-form/index.tsx@@ -36,6 +36,7 @@ export default function AccessForm({requirePassword,requireAgreement,agreementContent,+ requireName,isLoading,linkId,}: {@@ -48,6 +49,7 @@ export default function AccessForm({requirePassword: boolean;requireAgreement?: boolean;agreementContent?: string;+ requireName?: boolean;isLoading: boolean;linkId?: string;}) {@@ -109,7 +111,7 @@ export default function AccessForm({<div className="mt-10 sm:mx-auto sm:w-full sm:max-w-md"><form className="space-y-4" onSubmit={onSubmitHandler}>- {requireAgreement && agreementContent ? (+ {requireAgreement && agreementContent && requireName ? (<NameSection {...{ data, setData, brand }} />) : null}{requireEmail ? (@@ -132,7 +134,7 @@ export default function AccessForm({(requireEmail && !data.email) ||(requirePassword && !data.password) ||(requireAgreement && !data.hasConfirmedAgreement) ||- (requireAgreement && !data.name)+ (requireAgreement && requireName && !data.name)}className="w-1/3 min-w-fit bg-white text-gray-950 hover:bg-white/90"loading={isLoading}diff --git a/components/view/dataroom/dataroom-view.tsx b/components/view/dataroom/dataroom-view.tsxindex 579e2d8f..fdbb253f 100644--- a/components/view/dataroom/dataroom-view.tsx+++ b/components/view/dataroom/dataroom-view.tsx@@ -268,6 +268,7 @@ export default function DataroomView({requirePassword={!!linkPassword}requireAgreement={enableAgreement!}agreementContent={link.agreement?.content}+ requireName={link.agreement?.requireName}isLoading={isLoading}/>);diff --git a/components/view/document-view.tsx b/components/view/document-view.tsxindex eae2c057..a993a750 100644--- a/components/view/document-view.tsx+++ b/components/view/document-view.tsx@@ -208,6 +208,7 @@ export default function DocumentView({requirePassword={!!linkPassword}requireAgreement={enableAgreement!}agreementContent={link.agreement?.content}+ requireName={link.agreement?.requireName}isLoading={isLoading}brand={brand}/>diff --git a/pages/api/teams/[teamId]/agreements/index.ts b/pages/api/teams/[teamId]/agreements/index.tsindex 92b0c627..0d33bfdb 100644--- a/pages/api/teams/[teamId]/agreements/index.ts+++ b/pages/api/teams/[teamId]/agreements/index.ts@@ -80,13 +80,18 @@ export default async function handle(return res.status(401).json("Unauthorized");}- const { name, link } = req.body as { name: string; link: string };+ const { name, link, requireName } = req.body as {+ name: string;+ link: string;+ requireName: boolean;+ };const agreement = await prisma.agreement.create({data: {teamId,name,content: link,+ requireName,},});diff --git a/pages/view/[linkId]/index.tsx b/pages/view/[linkId]/index.tsxindex 136e0021..bf0cf90b 100644--- a/pages/view/[linkId]/index.tsx+++ b/pages/view/[linkId]/index.tsx@@ -240,6 +240,7 @@ export default function ViewPage({emailProtected,emailAuthenticated,password: linkPassword,+ enableAgreement,isArchived,} = link;@@ -259,7 +260,7 @@ export default function ViewPage({);}- if (emailProtected || linkPassword) {+ if (emailProtected || linkPassword || enableAgreement) {return (<><CustomMetatagdiff --git a/prisma/migrations/20240821000000_add_require_name/migration.sql b/prisma/migrations/20240821000000_add_require_name/migration.sqlnew file mode 100644index 00000000..4d37d85a--- /dev/null+++ b/prisma/migrations/20240821000000_add_require_name/migration.sql@@ -0,0 +1,3 @@+-- AlterTable+ALTER TABLE "Agreement" ADD COLUMN "requireName" BOOLEAN NOT NULL DEFAULT true;+diff --git a/prisma/schema.prisma b/prisma/schema.prismaindex 71f45401..f40fda75 100644--- a/prisma/schema.prisma+++ b/prisma/schema.prisma@@ -491,6 +491,8 @@ model Agreement {links Link[]responses AgreementResponse[]+ requireName Boolean @default(true) // Optional require name field+teamId Stringteam Team @relation(fields: [teamId], references: [id], onDelete: Cascade)