Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
refactor: simplify user check by adding canAddUser
Marc Seitz5215dcb5be8c
diff --git a/components/sidebar/team-switcher.tsx b/components/sidebar/team-switcher.tsxindex 5a51eac3..590de579 100644--- a/components/sidebar/team-switcher.tsx+++ b/components/sidebar/team-switcher.tsx@@ -4,21 +4,13 @@ import * as React from "react";import { useLimits } from "@/ee/limits/swr-handler";import { PlanEnum } from "@/ee/stripe/constants";-import {- ChevronsUpDown,- GalleryVerticalEndIcon,- Loader,- Plus,- UserRoundPlusIcon,-} from "lucide-react";+import { ChevronsUpDown, UserRoundPlusIcon } from "lucide-react";import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuLabel,- DropdownMenuSeparator,- DropdownMenuShortcut,DropdownMenuTrigger,} from "@/components/ui/dropdown-menu";import {@@ -28,8 +20,6 @@ import {useSidebar,} from "@/components/ui/sidebar";-import { useInvitations } from "@/lib/swr/use-invitations";-import { useGetTeam } from "@/lib/swr/use-team";import { Team } from "@/lib/types";import { cn } from "@/lib/utils";@@ -37,8 +27,6 @@ import { AddSeatModal } from "../billing/add-seat-modal";import { UpgradePlanModal } from "../billing/upgrade-plan-modal";import { AddTeamMembers } from "../teams/add-team-member-modal";import { Avatar, AvatarFallback } from "../ui/avatar";-import { Button } from "../ui/button";-import { ButtonTooltip } from "../ui/tooltip";export function TeamSwitcher({currentTeam: activeTeam,@@ -53,12 +41,8 @@ export function TeamSwitcher({React.useState<boolean>(false);const [isAddSeatModalOpen, setAddSeatModalOpen] =React.useState<boolean>(false);- const { team, loading } = useGetTeam()!;const { isMobile } = useSidebar();- const { limits } = useLimits();- const { invitations } = useInvitations();- const numUsers = (team && team.users.length) ?? 1;- const numInvitations = (invitations && invitations.length) ?? 0;+ const { canAddUsers } = useLimits();const switchTeam = (team: Team) => {localStorage.setItem("currentTeamId", team.id);@@ -68,7 +52,7 @@ export function TeamSwitcher({if (!activeTeam) return null;return (- <SidebarMenu className="flex flex-row gap-1 group-data-[collapsible=icon]:flex-col group-data-[collapsible=icon]:gap-1.5">+ <SidebarMenu className="flex flex-row items-center gap-1 group-data-[collapsible=icon]:flex-col group-data-[collapsible=icon]:gap-1.5"><SidebarMenuItem><DropdownMenu><DropdownMenuTrigger asChild>@@ -128,60 +112,37 @@ export function TeamSwitcher({</DropdownMenu></SidebarMenuItem><SidebarMenuItem>- {loading ? (- <Button type="button" variant="outline" className="h-12 w-12 p-1">- <Loader className="animate-spin" />- </Button>- ) : activeTeam.plan === "free" ? (+ {activeTeam.plan?.includes("free") ? (<UpgradePlanModalclickedPlan={PlanEnum.Pro}trigger={"invite_team_members"}><SidebarMenuButtonsize="lg"- className="border data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground"+ className="size-12 justify-center border data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground group-data-[collapsible=icon]:hidden">- <Button- type="button"- variant="ghost"- className="h-8 w-8 bg-gray-300 p-1 dark:bg-muted"- >- <UserRoundPlusIcon className="!h-4 !w-4" />- </Button>+ <UserRoundPlusIcon className="!size-5" strokeWidth={1.5} /></SidebarMenuButton></UpgradePlanModal>- ) : limits === null ||- (limits && limits.users > numUsers + numInvitations) ? (+ ) : canAddUsers ? (<AddTeamMembersopen={isTeamMemberInviteModalOpen}setOpen={setTeamMemberInviteModalOpen}><SidebarMenuButtonsize="lg"- className="border data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground"+ className="size-12 justify-center border data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground group-data-[collapsible=icon]:hidden">- <Button- type="button"- variant="ghost"- className="h-8 w-8 bg-gray-300 p-1 dark:bg-muted"- >- <UserRoundPlusIcon className="!h-4 !w-4" />- </Button>+ <UserRoundPlusIcon className="!size-5" strokeWidth={1.5} /></SidebarMenuButton></AddTeamMembers>) : (<AddSeatModal open={isAddSeatModalOpen} setOpen={setAddSeatModalOpen}><SidebarMenuButtonsize="lg"- className="border data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground"+ className="size-12 justify-center border data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground group-data-[collapsible=icon]:hidden">- <Button- type="button"- variant="ghost"- className="h-8 w-8 bg-gray-300 p-1 dark:bg-muted"- >- <UserRoundPlusIcon className="!h-4 !w-4" />- </Button>+ <UserRoundPlusIcon className="!size-5" strokeWidth={1.5} /></SidebarMenuButton></AddSeatModal>)}diff --git a/ee/limits/server.ts b/ee/limits/server.tsindex a0e643c1..62905930 100644--- a/ee/limits/server.ts+++ b/ee/limits/server.ts@@ -73,15 +73,9 @@ export async function getLimits({_count: {select: {documents: true,- },- },- documents: {- select: {- _count: {- select: {- links: true,- },- },+ links: true,+ users: true,+ invitations: true,},},},@@ -92,10 +86,8 @@ export async function getLimits({}const documentCount = team._count.documents;- const linkCount = team.documents.reduce(- (sum, doc) => sum + doc._count.links,- 0,- );+ const linkCount = team._count.links;+ const userCount = team._count.users + team._count.invitations;// parse the limits json with zod and return the limits// {datarooms: 1, users: 1, domains: 1, customDomainOnPro: boolean, customDomainInDataroom: boolean}@@ -107,7 +99,7 @@ export async function getLimits({if (isFreePlan(team.plan)) {return {...parsedData,- usage: { documents: documentCount, links: linkCount },+ usage: { documents: documentCount, links: linkCount, users: userCount },};} else {return {@@ -116,7 +108,7 @@ export async function getLimits({links: parsedData.links === 50 ? Infinity : parsedData.links,documents:parsedData.documents === 50 ? Infinity : parsedData.documents,- usage: { documents: documentCount, links: linkCount },+ usage: { documents: documentCount, links: linkCount, users: userCount },};}} catch (error) {@@ -126,7 +118,7 @@ export async function getLimits({return {...defaultLimits,- usage: { documents: documentCount, links: linkCount },+ usage: { documents: documentCount, links: linkCount, users: userCount },};}}diff --git a/ee/limits/swr-handler.ts b/ee/limits/swr-handler.tsindex 166ef561..f7d438c1 100644--- a/ee/limits/swr-handler.ts+++ b/ee/limits/swr-handler.ts@@ -16,6 +16,7 @@ export type LimitProps = {usage: {documents: number;links: number;+ users: number;};fileSizeLimits:| {@@ -43,11 +44,13 @@ export function useLimits() {? data?.usage?.documents < data?.documents: true;const canAddLinks = data?.links ? data?.usage?.links < data?.links : true;+ const canAddUsers = data?.users ? data?.usage?.users < data?.users : true;return {limits: data,canAddDocuments,canAddLinks,+ canAddUsers,error,loading: !data && !error,};