Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: add tags to datarooms
Marc Seitz303eef3718e5
diff --git a/components/datarooms/dataroom-card.tsx b/components/datarooms/dataroom-card.tsxindex e178b8a3..f63f35b9 100644--- a/components/datarooms/dataroom-card.tsx+++ b/components/datarooms/dataroom-card.tsx@@ -5,6 +5,9 @@ import { useRouter } from "next/router";import { formatDistanceToNow } from "date-fns";+import { TagColorProps } from "@/lib/types";++import TagBadge from "@/components/links/link-sheet/tags/tag-badge";import { Button } from "@/components/ui/button";import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";import {@@ -25,6 +28,15 @@ type DataroomView = {viewedAt: Date;};+type DataroomTag = {+ tag: {+ id: string;+ name: string;+ color: string;+ description: string | null;+ };+};+type DataroomWithDetails = {id: string;name: string;@@ -35,6 +47,7 @@ type DataroomWithDetails = {links: DataroomLink[];views: DataroomView[];createdAt: Date;+ tags?: DataroomTag[];};interface DataroomCardProps {@@ -108,6 +121,28 @@ export default function DataroomCard({ dataroom }: DataroomCardProps) {</TooltipProvider></div></div>++ {/* Tags */}+ {dataroom.tags && dataroom.tags.length > 0 && (+ <div+ className="flex flex-wrap gap-1.5"+ onClick={(e) => e.preventDefault()}+ >+ {dataroom.tags.slice(0, 3).map((tagItem) => (+ <TagBadge+ key={tagItem.tag.id}+ name={tagItem.tag.name}+ color={tagItem.tag.color as TagColorProps}+ withIcon+ />+ ))}+ {dataroom.tags.length > 3 && (+ <span className="text-xs text-muted-foreground">+ +{dataroom.tags.length - 3} more+ </span>+ )}+ </div>+ )}</CardHeader><CardContent>diff --git a/components/datarooms/settings/dataroom-tag-section.tsx b/components/datarooms/settings/dataroom-tag-section.tsxnew file mode 100644index 00000000..1e109d3c--- /dev/null+++ b/components/datarooms/settings/dataroom-tag-section.tsx@@ -0,0 +1,237 @@+import Link from "next/link";++import { Dispatch, SetStateAction, useMemo, useState } from "react";++import { PlanEnum } from "@/ee/stripe/constants";+import { CircleHelpIcon, Tag } from "lucide-react";+import { toast } from "sonner";+import { mutate } from "swr";++import { usePlan } from "@/lib/swr/use-billing";+import { useTags } from "@/lib/swr/use-tags";+import { TagColorProps } from "@/lib/types";++import { UpgradePlanModal } from "@/components/billing/upgrade-plan-modal";+import { Button } from "@/components/ui/button";+import {+ Card,+ CardContent,+ CardDescription,+ CardFooter,+ CardHeader,+ CardTitle,+} from "@/components/ui/card";+import { Label } from "@/components/ui/label";+import { MultiSelect } from "@/components/ui/multi-select-v2";+import { BadgeTooltip } from "@/components/ui/tooltip";++type TagProps = {+ id: string;+ name: string;+ color: string;+ description: string | null;+};++function getTagOption(tag: TagProps) {+ return {+ value: tag.id,+ label: tag.name,+ icon: (+ <Tag+ size={20}+ className={`rounded-sm border border-gray-200 bg-${tag.color}-100 p-1 dark:text-primary-foreground`}+ />+ ),+ meta: { color: tag.color, description: tag.description },+ };+}++interface DataroomTagSectionProps {+ dataroomId: string;+ teamId: string;+ initialTags?: {+ tag: {+ id: string;+ name: string;+ color: string;+ description: string | null;+ };+ }[];+}++export default function DataroomTagSection({+ dataroomId,+ teamId,+ initialTags,+}: DataroomTagSectionProps) {+ const [isPopoverOpen, setIsPopoverOpen] = useState(false);+ const [selectedValues, setSelectedValues] = useState<string[]>(+ initialTags?.map((t) => t.tag.id) || [],+ );+ const [showUpgradeModal, setShowUpgradeModal] = useState(false);+ const [isSaving, setIsSaving] = useState(false);+ const { isFree } = usePlan();++ const {+ tagCount,+ tags: availableTags,+ loading: loadingTags,+ } = useTags({+ query: {+ sortBy: "createdAt",+ sortOrder: "desc",+ },+ });++ const options = useMemo(+ () => availableTags?.map((tag) => getTagOption(tag)),+ [availableTags],+ );++ // Check if there are unsaved changes+ const hasChanges = useMemo(() => {+ const initialTagIds = initialTags?.map((t) => t.tag.id) || [];+ if (selectedValues.length !== initialTagIds.length) return true;+ return !selectedValues.every((id) => initialTagIds.includes(id));+ }, [selectedValues, initialTags]);++ // Callback to handle value change+ const handleValueChange = (value: string[]) => {+ setSelectedValues(value);+ };++ // Save tags to API+ const handleSave = async () => {+ setIsSaving(true);++ try {+ const res = await fetch(`/api/teams/${teamId}/datarooms/${dataroomId}`, {+ method: "PATCH",+ headers: {+ "Content-Type": "application/json",+ },+ body: JSON.stringify({ tags: selectedValues }),+ });++ if (!res.ok) {+ const { error } = await res.json();+ toast.error(error);+ return;+ }++ await Promise.all([+ mutate(`/api/teams/${teamId}/datarooms`),+ mutate(`/api/teams/${teamId}/datarooms/${dataroomId}`),+ ]);++ toast.success("Successfully updated tags!");+ } catch (error) {+ toast.error("Failed to update tags");+ console.error("Error updating tags:", error);+ } finally {+ setIsSaving(false);+ }+ };++ const createTag = async (tag: string) => {+ if (isFree && tagCount && tagCount >= 5) {+ setShowUpgradeModal(true);+ toast.error("You have reached the maximum number of tags.");+ return false;+ }++ const res = await fetch(`/api/teams/${teamId}/tags`, {+ method: "POST",+ headers: {+ "Content-Type": "application/json",+ },+ body: JSON.stringify({ name: tag }),+ });+ if (!res.ok) {+ const { error } = await res.json();+ toast.error(error);+ return false;+ }++ const newTag = await res.json();+ await mutate(+ `/api/teams/${teamId}/tags?${new URLSearchParams({+ sortBy: "createdAt",+ sortOrder: "desc",+ includeLinksCount: false,+ } as Record<string, any>).toString()}`,+ );++ // Add to selected values - same pattern as link-sheet+ setSelectedValues([...selectedValues, newTag.id]);+ setIsPopoverOpen(false);+ toast.success("Successfully created tag!");+ return true;+ };++ return (+ <>+ <Card className="bg-transparent">+ <CardHeader>+ <CardTitle>Tags</CardTitle>+ <CardDescription>+ Organize your dataroom by adding tags for better categorization and+ filtering+ </CardDescription>+ </CardHeader>+ <CardContent>+ <div className="flex justify-between">+ <div className="flex items-center gap-2">+ <Label htmlFor="dataroom-tags">Tags</Label>+ <BadgeTooltip content="Organize datarooms by tags to easily filter and find them">+ <CircleHelpIcon className="h-4 w-4 shrink-0 text-muted-foreground hover:text-foreground" />+ </BadgeTooltip>+ </div>+ <Link+ href={`/settings/tags`}+ className="text-xs text-muted-foreground hover:text-foreground hover:underline"+ >+ Manage+ </Link>+ </div>+ <div className="mt-2 flex gap-2">+ <MultiSelect+ loading={loadingTags}+ options={options ?? []}+ value={selectedValues}+ setIsPopoverOpen={setIsPopoverOpen}+ isPopoverOpen={isPopoverOpen}+ onValueChange={handleValueChange}+ placeholder="Select tags..."+ maxCount={3}+ searchPlaceholder="Search or add tags..."+ onCreate={(search) => createTag(search)}+ popoverClassName="sm:w-[400px]"+ />+ <Button+ onClick={handleSave}+ loading={isSaving}+ disabled={!hasChanges || isSaving}+ size="default"+ >+ Save+ </Button>+ </div>+ </CardContent>+ <CardFooter className="flex items-center justify-between rounded-b-lg border-t bg-muted px-6 py-3">+ <p className="text-sm text-muted-foreground transition-colors">+ Tags help you organize and filter datarooms across your workspace.+ </p>+ </CardFooter>+ </Card>+ {showUpgradeModal && (+ <UpgradePlanModal+ clickedPlan={PlanEnum.Pro}+ trigger="create_tag"+ open={showUpgradeModal}+ setOpen={setShowUpgradeModal}+ />+ )}+ </>+ );+}diff --git a/components/ui/multi-select-v2.tsx b/components/ui/multi-select-v2.tsxindex 0a32e10f..b0d2750e 100644--- a/components/ui/multi-select-v2.tsx+++ b/components/ui/multi-select-v2.tsx@@ -115,6 +115,13 @@ interface MultiSelectProps<* Optional, can be used to add custom styles.*/className?: string;++ /**+ * Additional class names to apply to the popover content.+ * Optional, can be used to customize popover width and styles.+ */+ popoverClassName?: string;+isPopoverOpen: boolean;setIsPopoverOpen: React.Dispatch<React.SetStateAction<boolean>>;loading?: boolean;@@ -147,6 +154,7 @@ export const MultiSelect = React.forwardRef<modalPopover = false,asChild = false,className,+ popoverClassName,value,searchPlaceholder = "Search...",inputClassName,@@ -216,11 +224,7 @@ export const MultiSelect = React.forwardRef<// };// 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-smreturn (- <Popover- open={isPopoverOpen}- onOpenChange={setIsPopoverOpen}- modal- >+ <Popover open={isPopoverOpen} onOpenChange={setIsPopoverOpen} modal><PopoverTrigger asChild><Buttonref={ref}@@ -271,7 +275,10 @@ export const MultiSelect = React.forwardRef<</Button></PopoverTrigger><PopoverContent- className="w-auto p-0 sm:w-[600px] sm:max-w-[35rem]"+ className={cn(+ "w-auto p-0 sm:w-[600px] sm:max-w-[35rem]",+ popoverClassName,+ )}align="start"onEscapeKeyDown={() => setIsPopoverOpen(false)}>diff --git a/lib/swr/use-dataroom.ts b/lib/swr/use-dataroom.tsindex cfb5a533..47a00756 100644--- a/lib/swr/use-dataroom.ts+++ b/lib/swr/use-dataroom.ts@@ -33,7 +33,17 @@ export function useDataroom() {const shouldFetch = teamId && id && isDataroomPage;const { data: dataroom, error } = useSWR<- Dataroom & { _count?: { viewerGroups: number; permissionGroups: number } }+ Dataroom & {+ _count?: { viewerGroups: number; permissionGroups: number };+ tags?: {+ tag: {+ id: string;+ name: string;+ color: string;+ description: string | null;+ };+ }[];+ }>(shouldFetch ? `/api/teams/${teamId}/datarooms/${id}` : null, fetcher, {dedupingInterval: 10000,onError: (err) => {diff --git a/lib/swr/use-datarooms.ts b/lib/swr/use-datarooms.tsindex 8d638a01..1c1704e1 100644--- a/lib/swr/use-datarooms.ts+++ b/lib/swr/use-datarooms.ts@@ -1,3 +1,5 @@+import { useRouter } from "next/router";+import { useTeam } from "@/context/team-context";import { Dataroom } from "@prisma/client";import useSWR from "swr";@@ -18,18 +20,39 @@ export type DataroomWithCount = Dataroom & {views: {viewedAt: Date;}[];+ tags?: {+ tag: {+ id: string;+ name: string;+ color: string;+ description: string | null;+ };+ }[];};export default function useDatarooms() {+ const router = useRouter();const teamInfo = useTeam();- const { data: datarooms, error } = useSWR<DataroomWithCount[]>(+ const queryParams = router.query;+ const searchQuery = queryParams["search"];+ const statusQuery = queryParams["status"];+ const tagsQuery = queryParams["tags"];++ const queryParts = [];+ if (searchQuery) queryParts.push(`search=${searchQuery}`);+ if (statusQuery) queryParts.push(`status=${statusQuery}`);+ if (tagsQuery) queryParts.push(`tags=${tagsQuery}`);+ const queryString = queryParts.length > 0 ? `?${queryParts.join("&")}` : "";++ const { data: datarooms, error, mutate } = useSWR<DataroomWithCount[]>(teamInfo?.currentTeam?.id &&- `/api/teams/${teamInfo?.currentTeam?.id}/datarooms`,+ `/api/teams/${teamInfo?.currentTeam?.id}/datarooms${queryString}`,fetcher,{revalidateOnFocus: false,dedupingInterval: 30000,+ keepPreviousData: true,},);@@ -37,5 +60,6 @@ export default function useDatarooms() {datarooms,loading: !datarooms && !error,error,+ mutate,};}diff --git a/pages/api/teams/[teamId]/datarooms/[id]/index.ts b/pages/api/teams/[teamId]/datarooms/[id]/index.tsindex eab83bc1..c441144b 100644--- a/pages/api/teams/[teamId]/datarooms/[id]/index.ts+++ b/pages/api/teams/[teamId]/datarooms/[id]/index.ts@@ -51,6 +51,18 @@ export default async function handle(},include: {_count: { select: { viewerGroups: true, permissionGroups: true } },+ tags: {+ include: {+ tag: {+ select: {+ id: true,+ name: true,+ color: true,+ description: true,+ },+ },+ },+ },},});@@ -106,12 +118,14 @@ export default async function handle(defaultPermissionStrategy,allowBulkDownload,showLastUpdated,+ tags,} = req.body as {name?: string;enableChangeNotifications?: boolean;defaultPermissionStrategy?: DefaultPermissionStrategy;allowBulkDownload?: boolean;showLastUpdated?: boolean;+ tags?: string[];};const featureFlags = await getFeatureFlags({ teamId: team.id });@@ -129,26 +143,68 @@ export default async function handle(});}- const dataroom = await prisma.dataroom.update({- where: {- id: dataroomId,- },- data: {- ...(name && { name }),- ...(typeof enableChangeNotifications === "boolean" && {- enableChangeNotifications,- }),- ...(defaultPermissionStrategy && { defaultPermissionStrategy }),- ...(typeof allowBulkDownload === "boolean" && {- allowBulkDownload,- }),- ...(typeof showLastUpdated === "boolean" && {- showLastUpdated,- }),- },+ const updatedDataroom = await prisma.$transaction(async (tx) => {+ const dataroom = await tx.dataroom.update({+ where: {+ id: dataroomId,+ },+ data: {+ ...(name && { name }),+ ...(typeof enableChangeNotifications === "boolean" && {+ enableChangeNotifications,+ }),+ ...(defaultPermissionStrategy && { defaultPermissionStrategy }),+ ...(typeof allowBulkDownload === "boolean" && {+ allowBulkDownload,+ }),+ ...(typeof showLastUpdated === "boolean" && {+ showLastUpdated,+ }),+ },+ });++ // Handle tags if provided+ if (tags !== undefined) {+ // First, delete all existing tags for this dataroom+ await tx.tagItem.deleteMany({+ where: {+ dataroomId: dataroomId,+ itemType: "DATAROOM_TAG",+ },+ });++ // Then create the new tags (if any)+ if (tags.length > 0) {+ await tx.tagItem.createMany({+ data: tags.map((tagId: string) => ({+ tagId,+ itemType: "DATAROOM_TAG",+ dataroomId: dataroomId,+ taggedBy: userId,+ })),+ });+ }+ }++ // Fetch the updated dataroom with tags+ const dataroomTags = await tx.tag.findMany({+ where: {+ items: {+ some: { dataroomId: dataroom.id },+ },+ },+ select: {+ id: true,+ name: true,+ color: true,+ description: true,+ },+ });++ return { ...dataroom, tags: dataroomTags };});- return res.status(200).json(dataroom);+ return res.status(200).json(updatedDataroom);} catch (error) {errorhandler(error, res);}diff --git a/pages/api/teams/[teamId]/datarooms/index.ts b/pages/api/teams/[teamId]/datarooms/index.tsindex ea086171..cfc06dd4 100644--- a/pages/api/teams/[teamId]/datarooms/index.ts+++ b/pages/api/teams/[teamId]/datarooms/index.ts@@ -21,7 +21,12 @@ export default async function handle(}const userId = (session.user as CustomUser).id;- const { teamId } = req.query as { teamId: string };+ const { teamId, search, status, tags } = req.query as {+ teamId: string;+ search?: string;+ status?: string;+ tags?: string;+ };try {const teamAccess = await prisma.userTeam.findUnique({@@ -40,11 +45,38 @@ export default async function handle(return res.status(401).end("Unauthorized");}+ // Build where clause based on filters+ const whereClause: any = {+ teamId: teamId,+ };++ // Search filter+ if (search) {+ whereClause.name = {+ contains: search,+ mode: "insensitive",+ };+ }++ // Tags filter+ if (tags) {+ const tagNames = tags.split(",").filter(Boolean);+ if (tagNames.length > 0) {+ whereClause.tags = {+ some: {+ tag: {+ name: {+ in: tagNames,+ },+ },+ },+ };+ }+ }+// Check if the user is part of the teamconst datarooms = await prisma.dataroom.findMany({- where: {- teamId: teamId,- },+ where: whereClause,include: {_count: {select: { documents: true, views: true },@@ -73,13 +105,46 @@ export default async function handle(viewedAt: true,},},+ tags: {+ include: {+ tag: {+ select: {+ id: true,+ name: true,+ color: true,+ description: true,+ },+ },+ },+ },},orderBy: {createdAt: "desc",},});- return res.status(200).json(datarooms);+ // Status filter (applied after fetching since it's computed)+ let filteredDatarooms = datarooms;+ if (status) {+ filteredDatarooms = datarooms.filter((dataroom) => {+ const activeLinks = dataroom.links.filter((link) => {+ if (link.isArchived) return false;+ if (link.expiresAt && new Date(link.expiresAt) < new Date())+ return false;+ return true;+ });+ const isActive = activeLinks.length > 0;++ if (status === "active") {+ return isActive;+ } else if (status === "inactive") {+ return !isActive;+ }+ return true;+ });+ }++ return res.status(200).json(filteredDatarooms);} catch (error) {console.error("Request error", error);return res.status(500).json({ error: "Error fetching datarooms" });diff --git a/pages/datarooms/[id]/settings/index.tsx b/pages/datarooms/[id]/settings/index.tsxindex b88c50a1..8a47b615 100644--- a/pages/datarooms/[id]/settings/index.tsx+++ b/pages/datarooms/[id]/settings/index.tsx@@ -10,6 +10,7 @@ import { useDataroom } from "@/lib/swr/use-dataroom";import { DataroomHeader } from "@/components/datarooms/dataroom-header";import { DataroomNavigation } from "@/components/datarooms/dataroom-navigation";+import DataroomTagSection from "@/components/datarooms/settings/dataroom-tag-section";import DeleteDataroom from "@/components/datarooms/settings/delete-dataroooom";import DuplicateDataroom from "@/components/datarooms/settings/duplicate-dataroom";import SettingsTabs from "@/components/datarooms/settings/settings-tabs";@@ -122,6 +123,11 @@ export default function Settings() {})}/>+ <DataroomTagSection+ dataroomId={dataroom.id}+ teamId={teamId!}+ initialTags={dataroom.tags}+ /><DuplicateDataroom dataroomId={dataroom.id} teamId={teamId} /><Card className="bg-transparent"><CardHeader>diff --git a/pages/datarooms/index.tsx b/pages/datarooms/index.tsxindex 9880890d..c9cf4474 100644--- a/pages/datarooms/index.tsx+++ b/pages/datarooms/index.tsx@@ -1,15 +1,17 @@import Link from "next/link";import { useRouter } from "next/router";-import { useEffect } from "react";+import { useEffect, useMemo, useState } from "react";import { useTeam } from "@/context/team-context";import { PlanEnum } from "@/ee/stripe/constants";-import { PlusIcon } from "lucide-react";+import { FilterIcon, PlusIcon } from "lucide-react";+import { useQueryState } from "nuqs";import { usePlan } from "@/lib/swr/use-billing";import useDatarooms from "@/lib/swr/use-datarooms";import useLimits from "@/lib/swr/use-limits";+import { useTags } from "@/lib/swr/use-tags";import { daysLeft } from "@/lib/utils";import { UpgradePlanModal } from "@/components/billing/upgrade-plan-modal";@@ -18,7 +20,16 @@ import DataroomCard from "@/components/datarooms/dataroom-card";import { DataroomTrialModal } from "@/components/datarooms/dataroom-trial-modal";import { EmptyDataroom } from "@/components/datarooms/empty-dataroom";import AppLayout from "@/components/layouts/app";+import { SearchBoxPersisted } from "@/components/search-box";import { Button } from "@/components/ui/button";+import { MultiSelect } from "@/components/ui/multi-select-v2";+import {+ Select,+ SelectContent,+ SelectItem,+ SelectTrigger,+ SelectValue,+} from "@/components/ui/select";import { Separator } from "@/components/ui/separator";export default function DataroomsPage() {@@ -29,6 +40,20 @@ export default function DataroomsPage() {const { limits } = useLimits();const router = useRouter();+ const [statusFilter, setStatusFilter] = useQueryState("status");+ const [tagsFilter, setTagsFilter] = useQueryState<string[]>("tags", {+ parse: (value: string) => value.split(",").filter(Boolean),+ serialize: (value: string[]) => value.join(","),+ });+ const [isTagsPopoverOpen, setIsTagsPopoverOpen] = useState(false);++ const { tags: availableTags } = useTags({+ query: {+ sortBy: "name",+ sortOrder: "asc",+ },+ });+const numDatarooms = datarooms?.length ?? 0;const limitDatarooms = limits?.datarooms ?? 1;@@ -37,11 +62,35 @@ export default function DataroomsPage() {isDataroomsPlus ||(isBusiness && numDatarooms < limitDatarooms);+ const searchQuery = router.query.search as string | undefined;+// Sort datarooms alphabetically by nameconst sortedDatarooms = datarooms?.slice().sort((a, b) => {return a.name.localeCompare(b.name);});+ // Filter out only dataroom tags+ const dataroomTags = useMemo(() => {+ if (!availableTags) return [];+ return availableTags;+ }, [availableTags]);++ const tagOptions = useMemo(() => {+ return (+ dataroomTags?.map((tag) => ({+ value: tag.name,+ label: tag.name,+ meta: { color: tag.color, description: tag.description },+ })) || []+ );+ }, [dataroomTags]);++ const selectedTagValues = useMemo(() => {+ return tagsFilter || [];+ }, [tagsFilter]);++ const hasActiveFilters = searchQuery || statusFilter || tagsFilter?.length;+useEffect(() => {if (!isTrial && (isFree || isPro)) router.push("/documents");}, [isTrial, isFree, isPro]);@@ -128,6 +177,57 @@ export default function DataroomsPage() {)}</div></section>+ {/* Search and Filters */}+ <div className="mb-4 flex justify-end gap-3">+ <div className="w-full sm:w-[280px]">+ <SearchBoxPersisted+ placeholder="Search datarooms..."+ inputClassName="h-10"+ />+ </div>++ <div className="w-full sm:w-[320px]">+ <MultiSelect+ options={tagOptions}+ value={selectedTagValues}+ onValueChange={(value) =>+ setTagsFilter(value.length > 0 ? value : null)+ }+ placeholder="Tags"+ maxCount={2}+ searchPlaceholder="Search tags..."+ isPopoverOpen={isTagsPopoverOpen}+ setIsPopoverOpen={setIsTagsPopoverOpen}+ popoverClassName="sm:w-[320px]"+ />+ </div>+ </div>++ {hasActiveFilters && (+ <div className="mb-4 flex items-center gap-2 text-sm text-muted-foreground">+ <span>+ Showing {sortedDatarooms?.length || 0} of {numDatarooms} dataroom+ {numDatarooms !== 1 ? "s" : ""}+ </span>+ <Button+ variant="link"+ size="sm"+ className="h-auto p-0 text-xs"+ onClick={() => {+ router.push(+ {+ pathname: router.pathname,+ query: {},+ },+ undefined,+ { shallow: true },+ );+ }}+ >+ Clear filters+ </Button>+ </div>+ )}<Separator className="mb-5 bg-gray-200 dark:bg-gray-800" />