Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
fix: hide start dataroom trial
Marc Seitz81f9e2d4db7c
diff --git a/components/documents/document-card.tsx b/components/documents/document-card.tsxindex 68d2e0ac..d5375f10 100644--- a/components/documents/document-card.tsx+++ b/components/documents/document-card.tsx@@ -1,4 +1,3 @@-import Image from "next/image";import Link from "next/link";import { useRouter } from "next/router";@@ -10,7 +9,6 @@ import {FolderInputIcon,Layers2Icon,MoreVertical,- PlusIcon,TrashIcon,} from "lucide-react";import { useTheme } from "next-themes";@@ -18,8 +16,6 @@ import { toast } from "sonner";import { mutate } from "swr";import BarChart from "@/components/shared/icons/bar-chart";-import Check from "@/components/shared/icons/check";-import Copy from "@/components/shared/icons/copy";import { Button } from "@/components/ui/button";import {DropdownMenu,@@ -30,7 +26,6 @@ import {DropdownMenuTrigger,} from "@/components/ui/dropdown-menu";-import { usePlan } from "@/lib/swr/use-billing";import useDatarooms from "@/lib/swr/use-datarooms";import useLimits from "@/lib/swr/use-limits";import { DocumentWithLinksAndLinkCountAndViewCount } from "@/lib/types";@@ -39,7 +34,6 @@ import { fileIcon } from "@/lib/utils/get-file-icon";import { useCopyToClipboard } from "@/lib/utils/use-copy-to-clipboard";import { UpgradePlanModal } from "../billing/upgrade-plan-modal";-import { AddDataroomModal } from "../datarooms/add-dataroom-modal";import { DataroomTrialModal } from "../datarooms/dataroom-trial-modal";import { AddToDataroomModal } from "./add-document-to-dataroom-modal";import { MoveToFolderModal } from "./move-folder-modal";@@ -62,7 +56,6 @@ export default function DocumentsCard({const { theme, systemTheme } = useTheme();const isLight =theme === "light" || (theme === "system" && systemTheme === "light");- const { plan, trial } = usePlan();const { isCopied, copyToClipboard } = useCopyToClipboard({});const [isFirstClick, setIsFirstClick] = useState<boolean>(false);@@ -72,18 +65,7 @@ export default function DocumentsCard({const [trialModalOpen, setTrialModalOpen] = useState<boolean>(false);const [planModalOpen, setPlanModalOpen] = useState<boolean>(false);- const { datarooms: dataRooms } = useDatarooms();-- const { limits } = useLimits();-- const numDatarooms = dataRooms?.length ?? 0;- const limitDatarooms = limits?.datarooms ?? 1;-- const isBusiness = plan === "business";- const isDatarooms = plan === "datarooms";- const isTrialDatarooms = trial === "drtrial";- const canCreateUnlimitedDatarooms =- isDatarooms || (isBusiness && numDatarooms < limitDatarooms);+ const { datarooms } = useDatarooms();const dropdownRef = useRef<HTMLDivElement | null>(null);const { canAddDocuments } = useLimits();@@ -207,33 +189,6 @@ export default function DocumentsCard({);};- const renderDropdownMenuItem = () => {- if (isBusiness && !canCreateUnlimitedDatarooms) {- return (- <DropdownMenuItem onClick={() => setPlanModalOpen(true)}>- <PlusIcon className="mr-2 h-4 w-4" aria-hidden="true" />- <span>Upgrade to Add Datarooms</span>- </DropdownMenuItem>- );- }-- if (isTrialDatarooms && dataRooms && !isBusiness && !isDatarooms) {- return (- <DropdownMenuItem onClick={() => setPlanModalOpen(true)}>- <PlusIcon className="mr-2 h-4 w-4" aria-hidden="true" />- <span>Upgrade to Add Datarooms</span>- </DropdownMenuItem>- );- }-- return (- <DropdownMenuItem onClick={() => setTrialModalOpen(true)}>- <PlusIcon className="mr-2 h-4 w-4" aria-hidden="true" />- <span>Start Data Room Trial</span>- </DropdownMenuItem>- );- };-return (<><div@@ -338,13 +293,12 @@ export default function DocumentsCard({<Layers2Icon className="mr-2 h-4 w-4" />Duplicate document</DropdownMenuItem>- {dataRooms && dataRooms.length !== 0 && (+ {datarooms && datarooms.length !== 0 && (<DropdownMenuItem onClick={() => setAddDataroomOpen(true)}><BetweenHorizontalStartIcon className="mr-2 h-4 w-4" />Add to dataroom</DropdownMenuItem>)}- {renderDropdownMenuItem()}<DropdownMenuSeparator /><DropdownMenuItemonClick={(event) => handleButtonClick(event, prismaDocument.id)}diff --git a/components/documents/document-header.tsx b/components/documents/document-header.tsxindex 46d42d16..dd3715bb 100644--- a/components/documents/document-header.tsx+++ b/components/documents/document-header.tsx@@ -1,15 +1,12 @@-import Image from "next/image";import { useRouter } from "next/router";import { useEffect, useRef, useState } from "react";import { useTeam } from "@/context/team-context";-import { useLimits } from "@/ee/limits/swr-handler";import { Document, DocumentVersion } from "@prisma/client";import {BetweenHorizontalStartIcon,FileDownIcon,- PlusIcon,SheetIcon,Sparkles,TrashIcon,@@ -36,13 +33,11 @@ import {import { usePlan } from "@/lib/swr/use-billing";import useDatarooms from "@/lib/swr/use-datarooms";import { DocumentWithLinksAndLinkCountAndViewCount } from "@/lib/types";-import { cn, getExtension } from "@/lib/utils";+import { cn } from "@/lib/utils";import { fileIcon } from "@/lib/utils/get-file-icon";import PlanBadge from "../billing/plan-badge";import { UpgradePlanModal } from "../billing/upgrade-plan-modal";-import { AddDataroomModal } from "../datarooms/add-dataroom-modal";-import { DataroomTrialModal } from "../datarooms/dataroom-trial-modal";import AdvancedSheet from "../shared/icons/advanced-sheet";import PortraitLandscape from "../shared/icons/portrait-landscape";import LoadingSpinner from "../ui/loading-spinner";@@ -63,7 +58,7 @@ export default function DocumentHeader({}) {const router = useRouter();const teamInfo = useTeam();- const { datarooms: dataRooms } = useDatarooms();+ const { datarooms: datarooms } = useDatarooms();const { theme, systemTheme } = useTheme();const isLight =theme === "light" || (theme === "system" && systemTheme === "light");@@ -75,23 +70,13 @@ export default function DocumentHeader({const [addDataRoomOpen, setAddDataRoomOpen] = useState<boolean>(false);const [addDocumentVersion, setAddDocumentVersion] = useState<boolean>(false);const [openAddDocModal, setOpenAddDocModal] = useState<boolean>(false);- const [trialModalOpen, setTrialModalOpen] = useState<boolean>(false);const [planModalOpen, setPlanModalOpen] = useState<boolean>(false);const nameRef = useRef<HTMLHeadingElement>(null);const enterPressedRef = useRef<boolean>(false);const dropdownRef = useRef<HTMLDivElement | null>(null);- const { limits } = useLimits();-- const numDatarooms = dataRooms?.length ?? 0;- const limitDatarooms = limits?.datarooms ?? 1;-const isFree = plan === "free";- const isBusiness = plan === "business";- const isDatarooms = plan === "datarooms";- const isTrialDatarooms = trial === "drtrial";- const canCreateUnlimitedDatarooms =- isDatarooms || (isBusiness && numDatarooms < limitDatarooms);+ const isTrial = !!trial;const actionRows: React.ReactNode[][] = [];if (actions) {@@ -431,33 +416,6 @@ export default function DocumentHeader({}};- const renderDropdownMenuItem = () => {- if (isBusiness && !canCreateUnlimitedDatarooms) {- return (- <DropdownMenuItem onClick={() => setPlanModalOpen(true)}>- <PlusIcon className="mr-2 h-4 w-4" aria-hidden="true" />- <span>Upgrade to Add Datarooms</span>- </DropdownMenuItem>- );- }-- if (isTrialDatarooms && dataRooms && !isBusiness && !isDatarooms) {- return (- <DropdownMenuItem onClick={() => setPlanModalOpen(true)}>- <PlusIcon className="mr-2 h-4 w-4" aria-hidden="true" />- <span>Upgrade to Add Datarooms</span>- </DropdownMenuItem>- );- }-- return (- <DropdownMenuItem onClick={() => setTrialModalOpen(true)}>- <PlusIcon className="mr-2 h-4 w-4" aria-hidden="true" />- <span>Start Data Room Trial</span>- </DropdownMenuItem>- );- };-return (<header className="flex items-center justify-between gap-x-8"><div className="flex items-center space-x-2">@@ -644,7 +602,7 @@ export default function DocumentHeader({))}{prismaDocument.type === "sheet" &&!prismaDocument.advancedExcelEnabled &&- (plan === "business" || plan === "datarooms" || trial) && (+ (plan === "business" || plan === "datarooms" || isTrial) && (<DropdownMenuItemonClick={() => enableAdvancedExcel(prismaDocument)}>@@ -652,13 +610,12 @@ export default function DocumentHeader({Enable Advanced Mode</DropdownMenuItem>)}- {dataRooms && dataRooms.length !== 0 && (+ {datarooms && datarooms.length !== 0 && (<DropdownMenuItem onClick={() => setAddDataRoomOpen(true)}><BetweenHorizontalStartIcon className="mr-2 h-4 w-4" />Add to dataroom</DropdownMenuItem>)}- {renderDropdownMenuItem()}<DropdownMenuSeparator />{/* Export views in CSV */}@@ -692,12 +649,6 @@ export default function DocumentHeader({/>) : null}- {trialModalOpen ? (- <DataroomTrialModal- openModal={trialModalOpen}- setOpenModal={setTrialModalOpen}- />- ) : null}{planModalOpen ? (<UpgradePlanModalclickedPlan="Data Rooms"diff --git a/pages/datarooms/index.tsx b/pages/datarooms/index.tsxindex 7f918f26..a3583155 100644--- a/pages/datarooms/index.tsx+++ b/pages/datarooms/index.tsx@@ -1,4 +1,7 @@import Link from "next/link";+import { useRouter } from "next/navigation";++import { useEffect } from "react";import { PlusIcon } from "lucide-react";@@ -21,27 +24,27 @@ import { usePlan } from "@/lib/swr/use-billing";import useDatarooms from "@/lib/swr/use-datarooms";import useLimits from "@/lib/swr/use-limits";import { daysLeft } from "@/lib/utils";-import { useEffect } from "react";-import { useRouter } from "next/navigation";export default function DataroomsPage() {const { datarooms } = useDatarooms();const { plan, trial } = usePlan();const { limits } = useLimits();- const router = useRouter()+ const router = useRouter();const numDatarooms = datarooms?.length ?? 0;const limitDatarooms = limits?.datarooms ?? 1;+ const isFree = plan === "free";+ const isPro = plan === "pro";const isBusiness = plan === "business";const isDatarooms = plan === "datarooms";- const isTrialDatarooms = trial === "drtrial";+ const isTrial = !!trial;const canCreateUnlimitedDatarooms =isDatarooms || (isBusiness && numDatarooms < limitDatarooms);- useEffect(()=>{- if(trial == null && plan == 'free') router.push('/documents')- },[trial,plan])+ useEffect(() => {+ if (!isTrial && (isFree || isPro)) router.push("/documents");+ }, [isTrial, isFree, isPro]);return (<AppLayout>@@ -60,12 +63,12 @@ export default function DataroomsPage() {<UpgradePlanModal clickedPlan="Data Rooms" trigger="datarooms"><ButtonclassName="group flex flex-1 items-center justify-start gap-x-3 px-3 text-left"- title="Add New Document"+ title="Upgrade to Add Data Room"><span>Upgrade to Add Data Room</span></Button></UpgradePlanModal>- ) : isTrialDatarooms && datarooms && !isBusiness && !isDatarooms ? (+ ) : isTrial && datarooms && !isBusiness && !isDatarooms ? (<div className="flex items-center gap-x-4"><div className="text-sm text-destructive"><span>Dataroom Trial: </span>@@ -76,7 +79,7 @@ export default function DataroomsPage() {<UpgradePlanModal clickedPlan="Data Rooms" trigger="datarooms"><ButtonclassName="group flex flex-1 items-center justify-start gap-x-3 px-3 text-left"- title="Add New Document"+ title="Upgrade to Add Data Room"><span>Upgrade to Add Data Room</span></Button>@@ -86,7 +89,7 @@ export default function DataroomsPage() {<AddDataroomModal><ButtonclassName="group flex flex-1 items-center justify-start gap-x-3 px-3 text-left"- title="Add New Document"+ title="Create New Document"><PlusIcon className="h-5 w-5 shrink-0" aria-hidden="true" /><span>Create New Dataroom</span>@@ -96,7 +99,7 @@ export default function DataroomsPage() {<DataroomTrialModal><ButtonclassName="group flex flex-1 items-center justify-start gap-x-3 px-3 text-left"- title="Add New Document"+ title="Start Data Room Trial"><span>Start Data Room Trial</span></Button>