Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

refactor: cleanup plan variables

Marc Seitze766ba5c9d62
diff --git a/components/analytics/documents-table.tsx b/components/analytics/documents-table.tsx
index 05401a7f..83d0414f 100644
--- a/components/analytics/documents-table.tsx
+++ b/components/analytics/documents-table.tsx
@@ -168,8 +168,7 @@ export default function DocumentsTable({
}) {
const router = useRouter();
const teamInfo = useTeam();
- const { plan, isTrial } = usePlan();
- const isFree = plan === "free";
+ const { isTrial, isFree } = usePlan();
const [sorting, setSorting] = useState<SortingState>([
{ id: "lastViewed", desc: true },
]);
diff --git a/components/analytics/links-table.tsx b/components/analytics/links-table.tsx
index 09b718fb..6e965d1b 100644
--- a/components/analytics/links-table.tsx
+++ b/components/analytics/links-table.tsx
@@ -230,8 +230,7 @@ export default function LinksTable({
}) {
const router = useRouter();
const teamInfo = useTeam();
- const { plan, isTrial } = usePlan();
- const isFree = plan === "free";
+ const { isTrial, isFree } = usePlan();
const [sorting, setSorting] = useState<SortingState>([
{ id: "lastViewed", desc: true },
]);
diff --git a/components/analytics/views-table.tsx b/components/analytics/views-table.tsx
index f76baed3..73998439 100644
--- a/components/analytics/views-table.tsx
+++ b/components/analytics/views-table.tsx
@@ -287,8 +287,7 @@ export default function ViewsTable({
}) {
const router = useRouter();
const teamInfo = useTeam();
- const { plan, isTrial } = usePlan();
- const isFree = plan === "free";
+ const { isTrial, isFree } = usePlan();
const { interval = "7d" } = router.query;
const [sorting, setSorting] = useState<SortingState>([
{ id: "viewedAt", desc: true },
diff --git a/components/analytics/visitors-table.tsx b/components/analytics/visitors-table.tsx
index b09c65a0..092fb2f1 100644
--- a/components/analytics/visitors-table.tsx
+++ b/components/analytics/visitors-table.tsx
@@ -216,8 +216,7 @@ export default function VisitorsTable({
}) {
const router = useRouter();
const teamInfo = useTeam();
- const { plan, isTrial } = usePlan();
- const isFree = plan === "free";
+ const { isTrial, isFree } = usePlan();
const { interval = "7d" } = router.query;
const [sorting, setSorting] = useState<SortingState>([
{ id: "lastActive", desc: true },
diff --git a/components/billing/upgrade-plan-container.tsx b/components/billing/upgrade-plan-container.tsx
index 7b3faf25..aed15b74 100644
--- a/components/billing/upgrade-plan-container.tsx
+++ b/components/billing/upgrade-plan-container.tsx
@@ -21,7 +21,7 @@ export default function UpgradePlanContainer() {
const router = useRouter();
const [loading, setLoading] = useState<boolean>(false);
const teamInfo = useTeam();
- const { plan } = usePlan();
+ const { plan, isFree, isDataroomsPlus } = usePlan();
const manageSubscription = async () => {
if (!teamInfo?.currentTeam?.id) {
@@ -54,7 +54,7 @@ export default function UpgradePlanContainer() {
};
const ButtonList = () => {
- if (plan === "free") {
+ if (isFree) {
return (
<Link href="/settings/upgrade">
<Button>Upgrade Plan</Button>
@@ -77,7 +77,9 @@ export default function UpgradePlanContainer() {
<CardDescription>
You are currently on the{" "}
<span className="mx-0.5 rounded-full bg-background px-2.5 py-1 text-xs font-bold tracking-normal text-foreground ring-1 ring-gray-800 dark:ring-gray-400">
- {plan.charAt(0).toUpperCase() + plan.slice(1)}
+ {isDataroomsPlus
+ ? "Datarooms+"
+ : plan.charAt(0).toUpperCase() + plan.slice(1)}
</span>{" "}
plan.{" "}
<Link
diff --git a/components/datarooms/actions/generate-index-dialog.tsx b/components/datarooms/actions/generate-index-dialog.tsx
index 3e0aef88..e85c8908 100644
--- a/components/datarooms/actions/generate-index-dialog.tsx
+++ b/components/datarooms/actions/generate-index-dialog.tsx
@@ -46,7 +46,7 @@ export default function GenerateIndexDialog({
disabled = false,
}: GenerateIndexDialogProps) {
const { links } = useDataroomLinks();
- const { plan, trial } = usePlan();
+ const { isDatarooms, isDataroomsPlus, isTrial } = usePlan();
const analytics = useAnalytics();
const [isLoading, setIsLoading] = useState(false);
@@ -55,7 +55,7 @@ export default function GenerateIndexDialog({
useState<IndexFileFormat>("excel");
const [isOpen, setIsOpen] = useState(false);
- const hasDataroomsPlan = plan === "datarooms" || trial;
+ const hasDataroomsPlan = isDatarooms || isDataroomsPlus || isTrial;
const handleGenerateIndex = async () => {
if (!hasDataroomsPlan) {
diff --git a/components/datarooms/add-dataroom-modal.tsx b/components/datarooms/add-dataroom-modal.tsx
index 0df4aa69..bccb098f 100644
--- a/components/datarooms/add-dataroom-modal.tsx
+++ b/components/datarooms/add-dataroom-modal.tsx
@@ -41,7 +41,7 @@ export function AddDataroomModal({
const [open, setOpen] = useState<boolean>(openModal);
const teamInfo = useTeam();
- const { plan } = usePlan();
+ const { isFree, isPro } = usePlan();
const analytics = useAnalytics();
const dataroomSchema = z.object({
name: z.string().min(3, {
@@ -100,7 +100,7 @@ export function AddDataroomModal({
};
// If the team is on a free plan, show the upgrade modal
- if (plan === "free" || plan === "pro") {
+ if (isFree || isPro) {
if (children) {
return (
<UpgradePlanModal
diff --git a/components/datarooms/settings/duplicate-dataroom.tsx b/components/datarooms/settings/duplicate-dataroom.tsx
index c3bdb2bf..5c0487e2 100644
--- a/components/datarooms/settings/duplicate-dataroom.tsx
+++ b/components/datarooms/settings/duplicate-dataroom.tsx
@@ -32,16 +32,16 @@ export default function DuplicateDataroom({
const [loading, setLoading] = useState<boolean>(false);
const [planModalOpen, setPlanModalOpen] = useState<boolean>(false);
const { limits } = useLimits();
- const { plan, trial } = usePlan();
+ const { isBusiness, isDatarooms, isDataroomsPlus, isTrial } = usePlan();
const { datarooms: dataRooms } = useDatarooms();
const numDatarooms = dataRooms?.length ?? 0;
const limitDatarooms = limits?.datarooms ?? 1;
- const isBusiness = plan === "business";
- const isDatarooms = plan === "datarooms";
- const isTrialDatarooms = trial === "drtrial";
+ const isTrialDatarooms = isTrial;
const canCreateUnlimitedDatarooms =
- isDatarooms || (isBusiness && numDatarooms < limitDatarooms);
+ isDatarooms ||
+ isDataroomsPlus ||
+ (isBusiness && numDatarooms < limitDatarooms);
const handleDuplicateDataroom = async (
e: React.MouseEvent<HTMLButtonElement>,
@@ -93,7 +93,11 @@ export default function DuplicateDataroom({
const ButtonList = () => {
if (
(isBusiness && !canCreateUnlimitedDatarooms) ||
- (isTrialDatarooms && dataRooms && !isBusiness && !isDatarooms)
+ (isTrialDatarooms &&
+ dataRooms &&
+ !isBusiness &&
+ !isDatarooms &&
+ !isDataroomsPlus)
) {
return (
<Button onClick={(e) => setPlanModalOpen(true)} loading={loading}>
diff --git a/components/documents/document-header.tsx b/components/documents/document-header.tsx
index 87b89f5c..66681d4f 100644
--- a/components/documents/document-header.tsx
+++ b/components/documents/document-header.tsx
@@ -71,7 +71,7 @@ export default function DocumentHeader({
const { theme, systemTheme } = useTheme();
const isLight =
theme === "light" || (theme === "system" && systemTheme === "light");
- const { plan, trial } = usePlan();
+ const { isPro, isFree, isTrial, isBusiness, isDatarooms } = usePlan();
const [isEditingName, setIsEditingName] = useState<boolean>(false);
const [menuOpen, setMenuOpen] = useState<boolean>(false);
const [isFirstClick, setIsFirstClick] = useState<boolean>(false);
@@ -86,8 +86,6 @@ export default function DocumentHeader({
const enterPressedRef = useRef<boolean>(false);
const dropdownRef = useRef<HTMLDivElement | null>(null);
- const isFree = plan === "free";
- const isTrial = !!trial;
const actionRows: React.ReactNode[][] = [];
if (actions) {
@@ -717,7 +715,7 @@ export default function DocumentHeader({
))}
{prismaDocument.type === "sheet" &&
!prismaDocument.advancedExcelEnabled &&
- (plan === "business" || plan === "datarooms" || isTrial) && (
+ (isBusiness || isDatarooms || isTrial) && (
<DropdownMenuItem
onClick={() => enableAdvancedExcel(prismaDocument)}
>
@@ -842,7 +840,7 @@ export default function DocumentHeader({
/>
)}
- {prismaDocument.type === "sheet" && (isFree || plan === "pro") && (
+ {prismaDocument.type === "sheet" && (isFree || isPro) && (
<AlertBanner
id="advanced-excel-alert"
variant="default"
@@ -868,7 +866,7 @@ export default function DocumentHeader({
{prismaDocument.type === "sheet" &&
!prismaDocument.advancedExcelEnabled &&
- (plan === "business" || plan === "datarooms" || isTrial) && (
+ (isBusiness || isDatarooms || isTrial) && (
<AlertBanner
id="enable-advanced-excel-alert"
variant="default"
diff --git a/components/domains/add-domain-modal.tsx b/components/domains/add-domain-modal.tsx
index 3456f4d5..2d215596 100644
--- a/components/domains/add-domain-modal.tsx
+++ b/components/domains/add-domain-modal.tsx
@@ -41,7 +41,7 @@ export function AddDomainModal({
const [loading, setLoading] = useState<boolean>(false);
const teamInfo = useTeam();
- const { plan } = usePlan();
+ const { isFree, isPro, isBusiness } = usePlan();
const { limits } = useLimits();
const analytics = useAnalytics();
const addDomainSchema = z.object({
@@ -108,10 +108,10 @@ export function AddDomainModal({
// - on business plan and has custom domain in dataroom disabled
// => then show the upgrade modal
if (
- plan === "free" ||
- (plan === "pro" && !limits?.customDomainOnPro) ||
+ isFree ||
+ (isPro && !limits?.customDomainOnPro) ||
(linkType === "DATAROOM_LINK" &&
- plan === "business" &&
+ isBusiness &&
!limits?.customDomainInDataroom)
) {
if (children) {
diff --git a/components/folders/add-folder-modal.tsx b/components/folders/add-folder-modal.tsx
index 6198e5c5..76152db2 100644
--- a/components/folders/add-folder-modal.tsx
+++ b/components/folders/add-folder-modal.tsx
@@ -48,7 +48,7 @@ export function AddFolderModal({
const [open, setOpen] = useState<boolean>(false);
const teamInfo = useTeam();
- const { plan, trial } = usePlan();
+ const { isFree, isTrial } = usePlan();
const analytics = useAnalytics();
/** current folder name */
@@ -134,7 +134,7 @@ export function AddFolderModal({
};
// If the team is on a free plan, show the upgrade modal
- if (plan === "free" && (!isDataroom || !trial)) {
+ if (isFree && (!isDataroom || !isTrial)) {
if (children) {
return (
<UpgradePlanModal
diff --git a/components/links/link-sheet/custom-fields-panel/index.tsx b/components/links/link-sheet/custom-fields-panel/index.tsx
index a8274873..20c71a17 100644
--- a/components/links/link-sheet/custom-fields-panel/index.tsx
+++ b/components/links/link-sheet/custom-fields-panel/index.tsx
@@ -38,11 +38,11 @@ export default function CustomFieldsPanel({
isConfigOpen: boolean;
setIsConfigOpen: (open: boolean) => void;
}) {
- const { plan } = usePlan();
+ const { isDatarooms, isDataroomsPlus, isBusiness } = usePlan();
const getFieldLimit = () => {
- if (plan === "datarooms") return 3;
- if (plan === "business") return 1;
+ if (isDatarooms || isDataroomsPlus) return 3;
+ if (isBusiness) return 1;
return 0;
};
@@ -50,7 +50,7 @@ export default function CustomFieldsPanel({
const fieldLimit = getFieldLimit();
if (fields.length >= fieldLimit) {
toast.error(
- `You can only add up to ${fieldLimit} custom field${fieldLimit === 1 ? "" : "s"} on the ${plan === "datarooms" ? "Data Rooms" : "Business"} plan`,
+ `You can only add up to ${fieldLimit} custom field${fieldLimit === 1 ? "" : "s"} on the ${isDatarooms ? "Data Rooms" : "Business"} plan`,
);
return;
}
@@ -117,7 +117,7 @@ export default function CustomFieldsPanel({
<span className="mt-1 block text-sm text-muted-foreground">
You can add up to {fieldLimit} custom field
{fieldLimit === 1 ? "" : "s"} on the{" "}
- {plan === "datarooms" ? "Data Rooms" : "Business"} plan.
+ {isDatarooms ? "Data Rooms" : "Business"} plan.
</span>
)}
</SheetDescription>
diff --git a/components/links/link-sheet/domain-section.tsx b/components/links/link-sheet/domain-section.tsx
index 4fe76ba4..b8b704d8 100644
--- a/components/links/link-sheet/domain-section.tsx
+++ b/components/links/link-sheet/domain-section.tsx
@@ -18,7 +18,7 @@ import {
} from "@/components/ui/select";
import { BLOCKED_PATHNAMES } from "@/lib/constants";
-import { BasePlan } from "@/lib/swr/use-billing";
+import { BasePlan, usePlan } from "@/lib/swr/use-billing";
import useLimits from "@/lib/swr/use-limits";
import { cn } from "@/lib/utils";
@@ -28,14 +28,12 @@ export default function DomainSection({
data,
setData,
domains,
- plan,
linkType,
editLink,
}: {
data: DEFAULT_LINK_TYPE;
setData: Dispatch<SetStateAction<DEFAULT_LINK_TYPE>>;
domains?: Domain[];
- plan?: BasePlan | null;
linkType: "DOCUMENT_LINK" | "DATAROOM_LINK";
editLink?: boolean;
}) {
@@ -43,6 +41,8 @@ export default function DomainSection({
const teamInfo = useTeam();
const { limits } = useLimits();
+ const { isBusiness, isDatarooms, isDataroomsPlus } = usePlan();
+
const handleDomainChange = (value: string) => {
// const value = event.target.value;
@@ -102,7 +102,7 @@ export default function DomainSection({
papermark.io
</SelectItem>
{linkType === "DOCUMENT_LINK" &&
- (plan === "business" || (limits && limits.customDomainOnPro)) && (
+ (isBusiness || (limits && limits.customDomainOnPro)) && (
<>
{domains?.map(({ slug }) => (
<SelectItem
@@ -116,7 +116,8 @@ export default function DomainSection({
</>
)}
{linkType === "DATAROOM_LINK" &&
- (plan === "datarooms" ||
+ (isDatarooms ||
+ isDataroomsPlus ||
(limits && limits.customDomainInDataroom)) && (
<>
{domains?.map(({ slug }) => (
diff --git a/components/links/link-sheet/index.tsx b/components/links/link-sheet/index.tsx
index ff7cbe7b..07a4a4a6 100644
--- a/components/links/link-sheet/index.tsx
+++ b/components/links/link-sheet/index.tsx
@@ -138,7 +138,7 @@ export default function LinkSheet({
mutate: mutateGroups,
} = useDataroomGroups();
const teamInfo = useTeam();
- const { plan, trial } = usePlan();
+ const { isFree, isDatarooms, isDataroomsPlus, isTrial } = usePlan();
const analytics = useAnalytics();
const [data, setData] = useState<DEFAULT_LINK_TYPE>(
DEFAULT_LINK_PROPS(linkType, groupId),
@@ -151,7 +151,7 @@ export default function LinkSheet({
}, [currentLink]);
const handlePreviewLink = async (link: LinkWithViews) => {
- if (link.domainId && plan === "free") {
+ if (link.domainId && isFree) {
toast.error("You need to upgrade to preview this link");
return;
}
@@ -390,7 +390,7 @@ export default function LinkSheet({
<TabsTrigger value={LinkAudienceType.GENERAL}>
General
</TabsTrigger>
- {plan === "datarooms" || trial ? (
+ {isDatarooms || isDataroomsPlus || isTrial ? (
<TabsTrigger value={LinkAudienceType.GROUP}>
Group
</TabsTrigger>
@@ -429,7 +429,6 @@ export default function LinkSheet({
<div className="space-y-2">
<DomainSection
{...{ data, setData, domains }}
- plan={plan}
linkType={linkType}
editLink={!!currentLink}
/>
@@ -541,7 +540,6 @@ export default function LinkSheet({
<div className="space-y-2">
<DomainSection
{...{ data, setData, domains }}
- plan={plan}
linkType={linkType}
editLink={!!currentLink}
/>
diff --git a/components/links/link-sheet/link-options.tsx b/components/links/link-sheet/link-options.tsx
index fc221ff8..e6b8ee2c 100644
--- a/components/links/link-sheet/link-options.tsx
+++ b/components/links/link-sheet/link-options.tsx
@@ -43,13 +43,16 @@ export const LinkOptions = ({
linkType: LinkType;
editLink?: boolean;
}) => {
- const { plan, trial } = usePlan();
+ const {
+ isStarter,
+ isPro,
+ isBusiness,
+ isDatarooms,
+ isDataroomsPlus,
+ isTrial,
+ } = usePlan();
const { limits } = useLimits();
- const isTrial = !!trial;
- const isPro = plan === "pro";
- const isBusiness = plan === "business";
- const isDatarooms = plan === "datarooms";
const allowAdvancedLinkControls = limits
? limits?.advancedLinkControlsOnPro
: false;
@@ -83,7 +86,8 @@ export const LinkOptions = ({
isTrial ||
(isPro && allowAdvancedLinkControls) ||
isBusiness ||
- isDatarooms
+ isDatarooms ||
+ isDataroomsPlus
}
handleUpgradeStateChange={handleUpgradeStateChange}
editLink={editLink ?? false}
@@ -95,7 +99,8 @@ export const LinkOptions = ({
isTrial ||
(isPro && allowAdvancedLinkControls) ||
isBusiness ||
- isDatarooms
+ isDatarooms ||
+ isDataroomsPlus
}
handleUpgradeStateChange={handleUpgradeStateChange}
/>
@@ -106,7 +111,8 @@ export const LinkOptions = ({
isTrial ||
(isPro && allowAdvancedLinkControls) ||
isBusiness ||
- isDatarooms
+ isDatarooms ||
+ isDataroomsPlus
}
handleUpgradeStateChange={handleUpgradeStateChange}
/>
@@ -118,7 +124,8 @@ export const LinkOptions = ({
isTrial ||
(isPro && allowAdvancedLinkControls) ||
isBusiness ||
- isDatarooms
+ isDatarooms ||
+ isDataroomsPlus
}
handleUpgradeStateChange={handleUpgradeStateChange}
/>
@@ -130,18 +137,23 @@ export const LinkOptions = ({
isTrial ||
(isPro && allowAdvancedLinkControls) ||
isBusiness ||
- isDatarooms
+ isDatarooms ||
+ isDataroomsPlus
}
handleUpgradeStateChange={handleUpgradeStateChange}
/>
<WatermarkSection
{...{ data, setData }}
- isAllowed={isTrial || isDatarooms || allowWatermarkOnBusiness}
+ isAllowed={
+ isTrial || isDatarooms || isDataroomsPlus || allowWatermarkOnBusiness
+ }
handleUpgradeStateChange={handleUpgradeStateChange}
/>
<AgreementSection
{...{ data, setData }}
- isAllowed={isTrial || isDatarooms}
+ isAllowed={
+ isTrial || isDatarooms || isDataroomsPlus || allowWatermarkOnBusiness
+ }
handleUpgradeStateChange={handleUpgradeStateChange}
/>
{linkType === LinkType.DOCUMENT_LINK ? (
@@ -153,7 +165,8 @@ export const LinkOptions = ({
isTrial ||
(isPro && allowAdvancedLinkControls) ||
isBusiness ||
- isDatarooms
+ isDatarooms ||
+ isDataroomsPlus
}
handleUpgradeStateChange={handleUpgradeStateChange}
/>
@@ -161,14 +174,19 @@ export const LinkOptions = ({
) : null}
<CustomFieldsSection
{...{ data, setData }}
- isAllowed={isTrial || isBusiness || isDatarooms}
+ isAllowed={isTrial || isBusiness || isDatarooms || isDataroomsPlus}
handleUpgradeStateChange={handleUpgradeStateChange}
/>
{linkType === LinkType.DOCUMENT_LINK ? (
<ProBannerSection
{...{ data, setData }}
isAllowed={
- isTrial || isPro || isBusiness || isDatarooms || plan === "starter"
+ isTrial ||
+ isPro ||
+ isBusiness ||
+ isDatarooms ||
+ isDataroomsPlus ||
+ isStarter
}
handleUpgradeStateChange={handleUpgradeStateChange}
/>
diff --git a/components/links/links-table.tsx b/components/links/links-table.tsx
index 60e3231f..9ae79768 100644
--- a/components/links/links-table.tsx
+++ b/components/links/links-table.tsx
@@ -73,7 +73,7 @@ export default function LinksTable({
}) {
const now = Date.now();
const router = useRouter();
- const { plan } = usePlan();
+ const { isFree } = usePlan();
const teamInfo = useTeam();
const { groupId } = router.query as {
groupId?: string;
@@ -178,7 +178,7 @@ export default function LinksTable({
};
const handlePreviewLink = async (link: LinkWithViews) => {
- if (link.domainId && plan === "free") {
+ if (link.domainId && isFree) {
toast.error("You need to upgrade to preview this link");
return;
}
@@ -321,8 +321,6 @@ export default function LinksTable({
? links.filter((link) => link.isArchived).length
: 0;
- const hasFreePlan = plan === "free";
-
return (
<>
<div className="w-full">
@@ -374,7 +372,7 @@ export default function LinksTable({
Updated
</Badge>
)}
- {link.domainId && hasFreePlan ? (
+ {link.domainId && isFree ? (
<span className="ml-2 rounded-full bg-destructive px-2.5 py-0.5 text-xs text-foreground ring-1 ring-destructive">
Inactive
</span>
@@ -385,7 +383,7 @@ export default function LinksTable({
<div
className={cn(
`group/cell relative flex w-full items-center gap-x-4 overflow-hidden truncate rounded-sm px-3 py-1.5 text-center text-secondary-foreground transition-all group-hover/row:ring-1 group-hover/row:ring-gray-400 group-hover/row:dark:ring-gray-100 md:py-1`,
- link.domainId && hasFreePlan
+ link.domainId && isFree
? "bg-destructive hover:bg-red-700 hover:dark:bg-red-200"
: "bg-secondary hover:bg-emerald-700 hover:dark:bg-emerald-200",
)}
@@ -410,7 +408,7 @@ export default function LinksTable({
: `${process.env.NEXT_PUBLIC_MARKETING_URL}/view/${link.id}`}
</div>
- {link.domainId && hasFreePlan ? (
+ {link.domainId && isFree ? (
<button
className="absolute bottom-0 left-0 right-0 top-0 z-10 hidden w-full whitespace-nowrap text-center text-sm group-hover/cell:block group-hover/cell:text-primary-foreground"
onClick={() =>
diff --git a/components/sidebar/app-sidebar.tsx b/components/sidebar/app-sidebar.tsx
index 26e44a75..8d582426 100644
--- a/components/sidebar/app-sidebar.tsx
+++ b/components/sidebar/app-sidebar.tsx
@@ -48,8 +48,17 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
>(null);
const { currentTeam, teams, setCurrentTeam, isLoading }: TeamContextType =
useTeam() || initialState;
- const { plan: userPlan, trial: userTrial, isAnnualPlan } = usePlan();
- const isTrial = !!userTrial;
+ const {
+ plan: userPlan,
+ isAnnualPlan,
+ isPro,
+ isBusiness,
+ isDatarooms,
+ isDataroomsPlus,
+ isFree,
+ isTrial,
+ } = usePlan();
+
const { limits } = useLimits();
const linksLimit = limits?.links;
const documentsLimit = limits?.documents;
@@ -88,8 +97,7 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
url: "/datarooms",
icon: ServerIcon,
current: router.pathname.includes("datarooms"),
- disabled:
- userPlan !== "business" && userPlan !== "datarooms" && !isTrial,
+ disabled: !isBusiness && !isDatarooms && !isDataroomsPlus && !isTrial,
trigger: "sidebar_datarooms",
plan: PlanEnum.Business,
},
@@ -98,7 +106,7 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
url: "/visitors",
icon: ContactIcon,
current: router.pathname.includes("visitors"),
- disabled: userPlan === "free" && !isTrial,
+ disabled: isFree && !isTrial,
trigger: "sidebar_visitors",
plan: PlanEnum.Pro,
},
@@ -160,12 +168,17 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
</p>
<p className="ml-2 flex items-center text-2xl font-bold tracking-tighter text-black group-data-[collapsible=icon]:hidden dark:text-white">
<Link href="/documents">Papermark</Link>
- {userPlan && userPlan != "free" ? (
+ {userPlan && !isFree && !isDataroomsPlus ? (
<span className="ml-4 rounded-full bg-background px-2.5 py-1 text-xs tracking-normal text-foreground ring-1 ring-gray-800">
{userPlan.charAt(0).toUpperCase() + userPlan.slice(1)}
</span>
) : null}
- {userTrial ? (
+ {isDataroomsPlus ? (
+ <span className="ml-4 rounded-full bg-background px-2.5 py-1 text-xs tracking-normal text-foreground ring-1 ring-gray-800">
+ Datarooms+
+ </span>
+ ) : null}
+ {isTrial ? (
<span className="ml-2 rounded-sm bg-foreground px-2 py-0.5 text-xs tracking-normal text-background ring-1 ring-gray-800">
Trial
</span>
@@ -193,13 +206,13 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
{/*
* if user is free and showProBanner is true show pro banner
*/}
- {userPlan === "free" && showProBanner ? (
+ {isFree && showProBanner ? (
<ProBanner setShowProBanner={setShowProBanner} />
) : null}
{/*
* if user is pro and showProAnnualBanner is true show pro annual banner
*/}
- {userPlan === "pro" && !isAnnualPlan && showProAnnualBanner ? (
+ {isPro && !isAnnualPlan && showProAnnualBanner ? (
<ProAnnualBanner
setShowProAnnualBanner={setShowProAnnualBanner}
/>
diff --git a/lib/swr/use-billing.ts b/lib/swr/use-billing.ts
index a8e7a1e4..96b997fb 100644
--- a/lib/swr/use-billing.ts
+++ b/lib/swr/use-billing.ts
@@ -91,6 +91,13 @@ export function usePlan() {
isOldAccount: parsedPlan.old,
isCustomer: plan?.isCustomer,
isAnnualPlan: plan?.subscriptionCycle === "yearly",
+ isFree: parsedPlan.plan === "free",
+ isStarter: parsedPlan.plan === "starter",
+ isPro: parsedPlan.plan === "pro",
+ isBusiness: parsedPlan.plan === "business",
+ isDatarooms:
+ parsedPlan.plan === "datarooms" || parsedPlan.plan === "datarooms-plus",
+ isDataroomsPlus: parsedPlan.plan === "datarooms-plus",
loading: !plan && !error,
error,
};
diff --git a/pages/api/file/browser-upload.ts b/pages/api/file/browser-upload.ts
index 58617d7d..9466da9a 100644
--- a/pages/api/file/browser-upload.ts
+++ b/pages/api/file/browser-upload.ts
@@ -45,7 +45,7 @@ export default async function handler(
const stripedTeamPlan = team?.plan.replace("+old", "");
if (
stripedTeamPlan &&
- ["business", "datarooms"].includes(stripedTeamPlan)
+ ["business", "datarooms", "datarooms-plus"].includes(stripedTeamPlan)
) {
maxSize = 100 * 1024 * 1024; // 100 MB
}
diff --git a/pages/api/teams/[teamId]/datarooms/create-from-folder.ts b/pages/api/teams/[teamId]/datarooms/create-from-folder.ts
index 7cb9db50..79924cc6 100644
--- a/pages/api/teams/[teamId]/datarooms/create-from-folder.ts
+++ b/pages/api/teams/[teamId]/datarooms/create-from-folder.ts
@@ -157,7 +157,7 @@ export default async function handle(
if (
!team.plan.includes("drtrial") &&
- ["business", "datarooms"].includes(stripedTeamPlan) &&
+ ["business", "datarooms", "datarooms-plus"].includes(stripedTeamPlan) &&
limits &&
team._count.datarooms >= limits.datarooms
) {
diff --git a/pages/api/teams/[teamId]/datarooms/index.ts b/pages/api/teams/[teamId]/datarooms/index.ts
index 552bba60..50ad8ea4 100644
--- a/pages/api/teams/[teamId]/datarooms/index.ts
+++ b/pages/api/teams/[teamId]/datarooms/index.ts
@@ -75,8 +75,15 @@ export default async function handle(
where: {
id: teamId,
plan: {
- // exclude all teams not on `business`, `datarooms`, `business+old`, `datarooms+old` plan
- in: ["business", "datarooms", "business+old", "datarooms+old"],
+ // exclude all teams not on `business`, `datarooms`, `datarooms-plus`, `business+old`, `datarooms+old`, `datarooms-plus+old` plan
+ in: [
+ "business",
+ "datarooms",
+ "datarooms-plus",
+ "business+old",
+ "datarooms+old",
+ "datarooms-plus+old",
+ ],
},
users: {
some: {
diff --git a/pages/datarooms/[id]/groups/index.tsx b/pages/datarooms/[id]/groups/index.tsx
index 2066a9b7..de37e7de 100644
--- a/pages/datarooms/[id]/groups/index.tsx
+++ b/pages/datarooms/[id]/groups/index.tsx
@@ -22,7 +22,7 @@ import useDataroomGroups from "@/lib/swr/use-dataroom-groups";
import { cn } from "@/lib/utils";
export default function DataroomGroupPage() {
- const { plan, trial } = usePlan();
+ const { isDatarooms, isDataroomsPlus, isTrial } = usePlan();
const { dataroom } = useDataroom();
const { viewerGroups, loading } = useDataroomGroups();
@@ -33,7 +33,7 @@ export default function DataroomGroupPage() {
}
const ButtonComponent = () => {
- if (plan === "datarooms" || trial) {
+ if (isDatarooms || isDataroomsPlus || isTrial) {
return <Button onClick={() => setModalOpen(true)}>Create group</Button>;
}
return (
diff --git a/pages/datarooms/[id]/settings/index.tsx b/pages/datarooms/[id]/settings/index.tsx
index 195b9679..9cc7c17e 100644
--- a/pages/datarooms/[id]/settings/index.tsx
+++ b/pages/datarooms/[id]/settings/index.tsx
@@ -19,8 +19,7 @@ export default function Settings() {
const teamInfo = useTeam();
const teamId = teamInfo?.currentTeam?.id;
- const { plan } = usePlan();
- const isDataroomsPlan = plan === "datarooms";
+ const { isDatarooms, isDataroomsPlus } = usePlan();
if (!dataroom) {
return <div>Loading...</div>;
@@ -85,7 +84,7 @@ export default function Settings() {
}
/>
<DuplicateDataroom dataroomId={dataroom.id} teamId={teamId} />
- {isDataroomsPlan ? (
+ {isDatarooms || isDataroomsPlus ? (
<DeleteDataroom
dataroomId={dataroom.id}
dataroomName={dataroom.name}
diff --git a/pages/datarooms/index.tsx b/pages/datarooms/index.tsx
index 3bda4a5b..1d8805b6 100644
--- a/pages/datarooms/index.tsx
+++ b/pages/datarooms/index.tsx
@@ -28,20 +28,18 @@ import { daysLeft } from "@/lib/utils";
export default function DataroomsPage() {
const { datarooms } = useDatarooms();
- const { plan, trial } = usePlan();
+ const { isFree, isPro, isBusiness, isDatarooms, isDataroomsPlus, isTrial } =
+ usePlan();
const { limits } = useLimits();
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 isTrial = !!trial;
const canCreateUnlimitedDatarooms =
- isDatarooms || (isBusiness && numDatarooms < limitDatarooms);
+ isDatarooms ||
+ isDataroomsPlus ||
+ (isBusiness && numDatarooms < limitDatarooms);
useEffect(() => {
if (!isTrial && (isFree || isPro)) router.push("/documents");
@@ -72,7 +70,11 @@ export default function DataroomsPage() {
<span>Upgrade to Add Data Room</span>
</Button>
</UpgradePlanModal>
- ) : isTrial && datarooms && !isBusiness && !isDatarooms ? (
+ ) : isTrial &&
+ datarooms &&
+ !isBusiness &&
+ !isDatarooms &&
+ !isDataroomsPlus ? (
<div className="flex items-center gap-x-4">
<div className="text-sm text-destructive">
<span>Dataroom Trial: </span>
@@ -92,7 +94,7 @@ export default function DataroomsPage() {
</Button>
</UpgradePlanModal>
</div>
- ) : isBusiness || isDatarooms ? (
+ ) : isBusiness || isDatarooms || isDataroomsPlus ? (
<AddDataroomModal>
<Button
className="group flex flex-1 items-center justify-start gap-x-3 px-3 text-left"
diff --git a/pages/documents/[id]/settings.tsx b/pages/documents/[id]/settings.tsx
index e7ee2501..96fb0aa9 100644
--- a/pages/documents/[id]/settings.tsx
+++ b/pages/documents/[id]/settings.tsx
@@ -48,7 +48,7 @@ type Feedback = {
export default function Settings() {
const { document, primaryVersion } = useDocument();
- const { plan } = usePlan();
+ const { plan, isBusiness } = usePlan();
const teamInfo = useTeam();
const teamId = teamInfo?.currentTeam?.id;
const id = document?.id;
@@ -61,8 +61,6 @@ export default function Settings() {
// },
// );
- const isNotBusiness = plan !== "business";
-
const [loading, setLoading] = useState(false);
const [loadingStatus, setLoadingStatus] = useState(false);
const [value, setValue] = useState<string>("");
diff --git a/pages/settings/presets.tsx b/pages/settings/presets.tsx
index 490e3400..6cf31706 100644
--- a/pages/settings/presets.tsx
+++ b/pages/settings/presets.tsx
@@ -531,7 +531,7 @@ export default function Presets() {
</div>
<div className="flex justify-end">
- {plan === "free" || plan === "pro" || !isTrial ? (
+ {(plan === "free" || plan === "pro") && !isTrial ? (
<UpgradePlanModal
clickedPlan={PlanEnum.Business}
trigger={"presets_page"}
diff --git a/pages/visitors/[id]/index.tsx b/pages/visitors/[id]/index.tsx
index 3262a3fb..07f70495 100644
--- a/pages/visitors/[id]/index.tsx
+++ b/pages/visitors/[id]/index.tsx
@@ -23,13 +23,10 @@ import useViewer from "@/lib/swr/use-viewer";
export default function VisitorDetailPage() {
const router = useRouter();
- const { plan, trial } = usePlan();
+ const { isFree, isTrial } = usePlan();
const { viewer, error } = useViewer();
const views = viewer?.views;
- const isTrial = !!trial;
- const isFree = plan == "free";
-
useEffect(() => {
if (isFree && !isTrial) router.push("/documents");
}, [isTrial, isFree]);
diff --git a/pages/visitors/index.tsx b/pages/visitors/index.tsx
index 9de32890..aa8076ff 100644
--- a/pages/visitors/index.tsx
+++ b/pages/visitors/index.tsx
@@ -12,12 +12,9 @@ import useViewers from "@/lib/swr/use-viewers";
export default function Visitors() {
const router = useRouter();
- const { plan, trial } = usePlan();
+ const { isFree, isTrial } = usePlan();
const { viewers, isValidating, isFiltered } = useViewers();
- const isTrial = !!trial;
- const isFree = plan == "free";
-
useEffect(() => {
if (isFree && !isTrial) router.push("/documents");
}, [isTrial, isFree]);