Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
fix: custom domain links in datarooms
Marc Seitzf0cb1706d8fc
diff --git a/components/links/link-sheet/domain-section.tsx b/components/links/link-sheet/domain-section.tsxindex 25435b14..d677713e 100644--- a/components/links/link-sheet/domain-section.tsx+++ b/components/links/link-sheet/domain-section.tsx@@ -3,9 +3,16 @@ import Link from "next/link";import { Dispatch, SetStateAction, useEffect, useState } from "react";import { useTeam } from "@/context/team-context";+import { PlanEnum } from "@/ee/stripe/constants";import { Domain } from "@prisma/client";import { mutate } from "swr";+import { BLOCKED_PATHNAMES } from "@/lib/constants";+import { BasePlan, usePlan } from "@/lib/swr/use-billing";+import useLimits from "@/lib/swr/use-limits";+import { cn } from "@/lib/utils";++import { UpgradePlanModal } from "@/components/billing/upgrade-plan-modal";import { AddDomainModal } from "@/components/domains/add-domain-modal";import { Input } from "@/components/ui/input";import { Label } from "@/components/ui/label";@@ -17,11 +24,6 @@ import {SelectValue,} from "@/components/ui/select";-import { BLOCKED_PATHNAMES } from "@/lib/constants";-import { BasePlan, usePlan } from "@/lib/swr/use-billing";-import useLimits from "@/lib/swr/use-limits";-import { cn } from "@/lib/utils";-import { DEFAULT_LINK_TYPE } from ".";export default function DomainSection({@@ -38,22 +40,55 @@ export default function DomainSection({editLink?: boolean;}) {const [isModalOpen, setModalOpen] = useState(false);+ const [isUpgradeModalOpen, setUpgradeModalOpen] = useState(false);+ const [displayValue, setDisplayValue] = useState<string>("papermark.com");const teamInfo = useTeam();const { limits } = useLimits();const { isBusiness, isDatarooms, isDataroomsPlus } = usePlan();+ // Check plan eligibility for custom domains+ const canUseCustomDomainForDocument =+ isBusiness || (limits && limits.customDomainOnPro);+ const canUseCustomDomainForDataroom =+ isDatarooms || isDataroomsPlus || (limits && limits.customDomainInDataroom);++ // Check if we're editing a link with a custom domain+ const isEditingCustomDomain =+ editLink && data.domain && data.domain !== "papermark.com" ? true : false;+const handleDomainChange = (value: string) => {- // const value = event.target.value;+ // Prevent changes if editing a link with custom domain+ if (isEditingCustomDomain) {+ setDisplayValue(value);+ return;+ }+ // Handle opening the add domain modalif (value === "add_domain" || value === "add_dataroom_domain") {- // Redirect to the add domain pagesetModalOpen(true);setData({ ...data, domain: "papermark.com" });+ setDisplayValue("papermark.com");return;}+ // Check if this is a custom domain selection (not papermark.com)+ if (value !== "papermark.com") {+ // Show upgrade modal if user doesn't have the right plan+ if (+ (linkType === "DOCUMENT_LINK" && !canUseCustomDomainForDocument) ||+ (linkType === "DATAROOM_LINK" && !canUseCustomDomainForDataroom)+ ) {+ setUpgradeModalOpen(true);+ setData({ ...data, domain: "papermark.com" });+ setDisplayValue("papermark.com");+ return;+ }+ }++ // Update domain normally if allowedsetData({ ...data, domain: value });+ setDisplayValue(value);};const handleSelectFocus = () => {@@ -64,32 +99,67 @@ export default function DomainSection({useEffect(() => {if (domains && !editLink) {const defaultDomain = domains.find((domain) => domain.isDefault);++ // Only set a custom domain if the plan allows it+ const canUseCustomDomain =+ (linkType === "DOCUMENT_LINK" && canUseCustomDomainForDocument) ||+ (linkType === "DATAROOM_LINK" && canUseCustomDomainForDataroom);++ const domainValue = canUseCustomDomain+ ? (defaultDomain?.slug ?? "papermark.com")+ : "papermark.com";+setData({...data,- domain: defaultDomain?.slug ?? "papermark.com",+ domain: domainValue,});++ setDisplayValue(domainValue);}- }, [domains, editLink]);+ }, [+ domains,+ editLink,+ linkType,+ isBusiness,+ isDatarooms,+ isDataroomsPlus,+ limits,+ ]);+ // Set defaultDomain based on plan type and link typeconst defaultDomain = editLink? (data.domain ?? "papermark.com")- : (domains?.find((domain) => domain.isDefault)?.slug ?? "papermark.com");+ : (linkType === "DOCUMENT_LINK" && canUseCustomDomainForDocument) ||+ (linkType === "DATAROOM_LINK" && canUseCustomDomainForDataroom)+ ? (domains?.find((domain) => domain.isDefault)?.slug ?? "papermark.com")+ : "papermark.com";++ // Set the initial display value when component mounts+ useEffect(() => {+ setDisplayValue(defaultDomain);+ }, [defaultDomain, editLink]);const currentDomain = domains?.find((domain) => domain.slug === data.domain);const isDomainVerified = currentDomain?.verified;+ const isDisabled =+ linkType === "DOCUMENT_LINK"+ ? isEditingCustomDomain && !canUseCustomDomainForDocument+ : isEditingCustomDomain && !canUseCustomDomainForDataroom;+return (<><Label htmlFor="link-domain">Domain</Label><div className="flex"><Select- defaultValue={defaultDomain}+ value={displayValue}onValueChange={handleDomainChange}onOpenChange={handleSelectFocus}+ disabled={isDisabled}><SelectTriggerclassName={cn(- "flex w-full rounded-none rounded-l-md border border-input bg-white text-foreground placeholder-muted-foreground focus:border-muted-foreground focus:outline-none focus:ring-inset focus:ring-muted-foreground dark:border-gray-500 dark:bg-gray-800 focus:dark:bg-transparent sm:text-sm",+ "flex h-10 w-full rounded-none rounded-l-md border border-input bg-white text-foreground placeholder-muted-foreground focus:border-muted-foreground focus:outline-none focus:ring-inset focus:ring-muted-foreground dark:border-gray-500 dark:bg-gray-800 focus:dark:bg-transparent sm:text-sm",data.domain && data.domain !== "papermark.com"? "": "border-r-1 rounded-r-md",@@ -101,36 +171,44 @@ export default function DomainSection({<SelectItem value="papermark.com" className="hover:bg-muted">papermark.com</SelectItem>- {linkType === "DOCUMENT_LINK" &&- (isBusiness || (limits && limits.customDomainOnPro)) && (- <>- {domains?.map(({ slug }) => (- <SelectItem- key={slug}- value={slug}- className="hover:bg-muted hover:dark:bg-gray-700"- >- {slug}- </SelectItem>- ))}- </>- )}- {linkType === "DATAROOM_LINK" &&- (isDatarooms ||- isDataroomsPlus ||- (limits && limits.customDomainInDataroom)) && (- <>- {domains?.map(({ slug }) => (- <SelectItem- key={slug}- value={slug}- className="hover:bg-muted hover:dark:bg-gray-700"- >- {slug}- </SelectItem>- ))}- </>- )}+ {linkType === "DOCUMENT_LINK" && (+ <>+ {domains?.map(({ slug }) => (+ <SelectItem+ key={slug}+ value={slug}+ className={cn(+ "hover:bg-muted hover:dark:bg-gray-700",+ !canUseCustomDomainForDocument && "opacity-50",+ )}+ >+ {slug}+ {canUseCustomDomainForDocument || isEditingCustomDomain+ ? ""+ : " (upgrade to use)"}+ </SelectItem>+ ))}+ </>+ )}+ {linkType === "DATAROOM_LINK" && (+ <>+ {domains?.map(({ slug }) => (+ <SelectItem+ key={slug}+ value={slug}+ className={cn(+ "hover:bg-muted hover:dark:bg-gray-700",+ !canUseCustomDomainForDataroom && "opacity-50",+ )}+ >+ {slug}+ {canUseCustomDomainForDataroom || isEditingCustomDomain+ ? ""+ : " (upgrade to use)"}+ </SelectItem>+ ))}+ </>+ )}<SelectItemclassName="hover:bg-muted hover:dark:bg-gray-700"value={@@ -150,6 +228,7 @@ export default function DomainSection({name="key"requiredvalue={data.slug || ""}+ disabled={isDisabled}pattern="^[a-zA-Z0-9-]+$"onKeyDown={(e) => {// Allow navigation keys, backspace, delete, etc.@@ -175,9 +254,12 @@ export default function DomainSection({className={cn("hidden rounded-l-none focus:ring-inset",data.domain && data.domain !== "papermark.com" ? "flex" : "",+ isDisabled ? "opacity-50" : "",)}placeholder="deck"onChange={(e) => {+ if (isDisabled) return;+const currentValue = e.target.value.replace(/[^a-zA-Z0-9-]/g, "");const isBlocked = BLOCKED_PATHNAMES.includes(`/${currentValue}`);@@ -195,6 +277,17 @@ export default function DomainSection({) : null}</div>+ {isDisabled && (+ <div+ className="mt-2 text-sm text-muted-foreground"+ onClick={() => {+ setUpgradeModalOpen(true);+ }}+ >+ Custom domain and path cannot be changed on an unsupported plan.+ </div>+ )}+{data.domain && data.domain !== "papermark.com" && !isDomainVerified ? (<div className="mt-4 text-sm text-red-500">Your domain is not verified yet!{" "}@@ -208,11 +301,26 @@ export default function DomainSection({</div>) : null}+ {/* Add domain modal for custom domains */}<AddDomainModalopen={isModalOpen}setOpen={setModalOpen}linkType={linkType}/>++ {/* Upgrade plan modal when trying to use custom domains without the right plan */}+ <UpgradePlanModal+ clickedPlan={+ linkType === "DATAROOM_LINK" ? PlanEnum.DataRooms : PlanEnum.Business+ }+ open={isUpgradeModalOpen}+ setOpen={setUpgradeModalOpen}+ trigger={+ linkType === "DATAROOM_LINK"+ ? "select_custom_domain_dataroom"+ : "select_custom_domain_document"+ }+ /></>);}