Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: add link configuration to welcome screen
Marc Seitzb1d0e3abf654
diff --git a/components/links/link-sheet/index.tsx b/components/links/link-sheet/index.tsxindex 310ba9f3..dca8794c 100644--- a/components/links/link-sheet/index.tsx+++ b/components/links/link-sheet/index.tsx@@ -8,9 +8,6 @@ import {} from "@/components/ui/sheet";import { Separator } from "@/components/ui/separator";import { Dispatch, SetStateAction, useEffect, useState } from "react";-import PasswordSection from "./password-section";-import ExpirationSection from "./expiration-section";-import EmailProtectionSection from "./email-protection-section";import { useRouter } from "next/router";import { useDocumentLinks } from "@/lib/swr/use-document";import { useDomains } from "@/lib/swr/use-domains";@@ -20,16 +17,9 @@ import { toast } from "sonner";import { Label } from "@/components/ui/label";import { convertDataUrlToFile, uploadImage } from "@/lib/utils";import DomainSection from "./domain-section";-import AllowDownloadSection from "./allow-download-section";import { useTeam } from "@/context/team-context";-import EmailAuthenticationSection from "./email-authentication-section";-import AllowNotificationSection from "./allow-notification-section";-import FeedbackSection from "./feedback-section";-import OGSection from "./og-section";import { ScrollArea } from "@/components/ui/scroll-area";-import AllowListSection from "./allow-list-section";-import DenyListSection from "./deny-list-section";-import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion";+import { LinkOptions } from "./link-options";export const DEFAULT_LINK_PROPS = {id: null,@@ -221,30 +211,7 @@ export default function LinkSheet({</div></div>- <div>- <EmailProtectionSection {...{ data, setData }} />- <AllowNotificationSection {...{ data, setData }} />- <AllowDownloadSection {...{ data, setData }} />- <ExpirationSection {...{ data, setData }} />-- <Accordion type="single" collapsible>- <AccordionItem value="item-1" className="border-none">- <AccordionTrigger className="py-0 rounded-lg space-x-2">- <span className="text-sm font-medium leading-6 text-foreground">- Advanced Link Access Options- </span>- </AccordionTrigger>- <AccordionContent className="first:pt-5">- <EmailAuthenticationSection {...{ data, setData }} />- <AllowListSection {...{ data, setData }} />- <DenyListSection {...{ data, setData }} />- <PasswordSection {...{ data, setData }} />- <OGSection {...{ data, setData }} />- <FeedbackSection {...{ data, setData }} />- </AccordionContent>- </AccordionItem>- </Accordion>- </div>+ <LinkOptions data={data} setData={setData} /></div></div></div>diff --git a/components/links/link-sheet/link-options.tsx b/components/links/link-sheet/link-options.tsxnew file mode 100644index 00000000..4057c80a--- /dev/null+++ b/components/links/link-sheet/link-options.tsx@@ -0,0 +1,54 @@+import { Dispatch, SetStateAction } from "react";+import { DEFAULT_LINK_TYPE } from "@/components/links/link-sheet";++import EmailProtectionSection from "@/components/links/link-sheet/email-protection-section";+import AllowNotificationSection from "@/components/links/link-sheet/allow-notification-section";+import AllowDownloadSection from "@/components/links/link-sheet/allow-download-section";+import ExpirationSection from "@/components/links/link-sheet/expiration-section";+import {+ Accordion,+ AccordionContent,+ AccordionItem,+ AccordionTrigger,+} from "@/components/ui/accordion";+import EmailAuthenticationSection from "@/components/links/link-sheet/email-authentication-section";+import AllowListSection from "@/components/links/link-sheet/allow-list-section";+import DenyListSection from "@/components/links/link-sheet/deny-list-section";+import PasswordSection from "@/components/links/link-sheet/password-section";+import OGSection from "@/components/links/link-sheet/og-section";+import FeedbackSection from "@/components/links/link-sheet/feedback-section";++export const LinkOptions = ({+ data,+ setData,+}: {+ data: DEFAULT_LINK_TYPE;+ setData: Dispatch<SetStateAction<DEFAULT_LINK_TYPE>>;+}) => {+ return (+ <div>+ <EmailProtectionSection {...{ data, setData }} />+ <AllowNotificationSection {...{ data, setData }} />+ <AllowDownloadSection {...{ data, setData }} />+ <ExpirationSection {...{ data, setData }} />++ <Accordion type="single" collapsible>+ <AccordionItem value="item-1" className="border-none">+ <AccordionTrigger className="py-0 rounded-lg space-x-2">+ <span className="text-sm font-medium leading-6 text-foreground">+ Advanced Link Access Options+ </span>+ </AccordionTrigger>+ <AccordionContent className="first:pt-5">+ <EmailAuthenticationSection {...{ data, setData }} />+ <AllowListSection {...{ data, setData }} />+ <DenyListSection {...{ data, setData }} />+ <PasswordSection {...{ data, setData }} />+ <OGSection {...{ data, setData }} />+ <FeedbackSection {...{ data, setData }} />+ </AccordionContent>+ </AccordionItem>+ </Accordion>+ </div>+ );+};diff --git a/components/welcome/notion-form.tsx b/components/welcome/notion-form.tsxindex 29166dc9..9f23942a 100644--- a/components/welcome/notion-form.tsx+++ b/components/welcome/notion-form.tsx@@ -4,20 +4,38 @@ import { useState, type FormEvent } from "react";import { toast } from "sonner";import Skeleton from "../Skeleton";import { STAGGER_CHILD_VARIANTS } from "@/lib/constants";-import { copyToClipboard } from "@/lib/utils";-import { Button } from "../ui/button";+import {+ convertDataUrlToFile,+ copyToClipboard,+ uploadImage,+} from "@/lib/utils";+import { Button } from "@/components/ui/button";import { usePlausible } from "next-plausible";import { useTeam } from "@/context/team-context";-import { Label } from "../ui/label";+import { Label } from "@/components/ui/label";import { parsePageId } from "notion-utils";+import { LinkOptions } from "@/components/links/link-sheet/link-options";+import {+ DEFAULT_LINK_PROPS,+ DEFAULT_LINK_TYPE,+} from "@/components/links/link-sheet";+import {+ Accordion,+ AccordionContent,+ AccordionItem,+ AccordionTrigger,+} from "@/components/ui/accordion";export default function NotionForm() {const router = useRouter();const plausible = usePlausible();const [uploading, setUploading] = useState<boolean>(false);+ const [isLoading, setIsLoading] = useState<boolean>(false);const [currentLinkId, setCurrentLinkId] = useState<string | null>(null);const [currentDocId, setCurrentDocId] = useState<string | null>(null);const [notionLink, setNotionLink] = useState<string | null>(null);+ const [linkData, setLinkData] =+ useState<DEFAULT_LINK_TYPE>(DEFAULT_LINK_PROPS);const teamInfo = useTeam();const createNotionFileName = () => {@@ -98,15 +116,51 @@ export default function NotionForm() {}};- const handleContinue = (id: string) => {+ const handleSubmit = async (event: any) => {+ event.preventDefault();++ setIsLoading(true);++ // Upload the image if it's a data URL+ let blobUrl: string | null =+ linkData.metaImage && linkData.metaImage.startsWith("data:")+ ? null+ : linkData.metaImage;+ if (linkData.metaImage && linkData.metaImage.startsWith("data:")) {+ // Convert the data URL to a blob+ const blob = convertDataUrlToFile({ dataUrl: linkData.metaImage });+ // Upload the blob to vercel storage+ blobUrl = await uploadImage(blob);+ setLinkData({ ...linkData, metaImage: blobUrl });+ }++ const response = await fetch(`/api/links/${currentLinkId}`, {+ method: "PUT",+ headers: {+ "Content-Type": "application/json",+ },+ body: JSON.stringify({+ ...linkData,+ metaImage: blobUrl,+ documentId: currentDocId,+ }),+ });++ if (!response.ok) {+ // handle error with toast message+ const { error } = await response.json();+ toast.error(error);+ setIsLoading(false);+ return;+ }+copyToClipboard(- `${process.env.NEXT_PUBLIC_BASE_URL}/view/${id}`,+ `${process.env.NEXT_PUBLIC_BASE_URL}/view/${currentLinkId}`,"Link copied to clipboard. Redirecting to document page...",);- setTimeout(() => {- router.push(`/documents/${currentDocId}`);- setUploading(false);- }, 2000);++ router.push(`/documents/${currentDocId}`);+ setIsLoading(false);};return (@@ -226,12 +280,23 @@ export default function NotionForm() {</div></div></div>+ <div className="w-full max-w-xs sm:max-w-lg pb-8">+ <Accordion type="single" collapsible>+ <AccordionItem value="item-1" className="border-none">+ <AccordionTrigger className="py-0 rounded-lg space-x-2">+ <span className="text-sm font-medium leading-6 text-foreground">+ Configure Link Options+ </span>+ </AccordionTrigger>+ <AccordionContent className="first:pt-5">+ <LinkOptions data={linkData} setData={setLinkData} />+ </AccordionContent>+ </AccordionItem>+ </Accordion>+ </div><div className="flex items-center justify-center mb-4">- <Button- onClick={() => handleContinue(currentLinkId)}- type="submit"- >- {"Share Document"}+ <Button loading={isLoading} onClick={handleSubmit}>+ Share document link</Button></div></div>