Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
fix: show dataroom index for drplus and higher and those with feature…
Marc Seitz8cf4460559d7
diff --git a/components/datarooms/groups/group-permissions.tsx b/components/datarooms/groups/group-permissions.tsxindex 622294e8..a9748eab 100644--- a/components/datarooms/groups/group-permissions.tsx+++ b/components/datarooms/groups/group-permissions.tsx@@ -33,12 +33,12 @@ import {resolveToggleIntent,type PermissionChanges,} from "@/lib/dataroom/permissions-tree";-import { useFeatureFlags } from "@/lib/hooks/use-feature-flags";import { useDataroomFoldersTree } from "@/lib/swr/use-dataroom";import { cn } from "@/lib/utils";import {HIERARCHICAL_DISPLAY_STYLE,getHierarchicalDisplayName,+ useDataroomIndexEnabled,} from "@/lib/utils/hierarchical-display";import CloudDownloadOff from "@/components/shared/icons/cloud-download-off";@@ -60,8 +60,7 @@ import {} from "@/components/ui/tooltip";const PermissionItemName = ({ item }: { item: FileOrFolder }) => {- const { isFeatureEnabled } = useFeatureFlags();- const isDataroomIndexEnabled = isFeatureEnabled("dataroomIndex");+ const isDataroomIndexEnabled = useDataroomIndexEnabled();const displayName = getHierarchicalDisplayName(item.name,diff --git a/lib/api/links/link-data.ts b/lib/api/links/link-data.tsindex 444a9160..13923d7b 100644--- a/lib/api/links/link-data.ts+++ b/lib/api/links/link-data.ts@@ -9,6 +9,7 @@ import {ViewerGroupAccessControls,} from "@prisma/client";+import { getFeatureFlags } from "@/lib/featureFlags";import prisma from "@/lib/prisma";import { sortItemsByIndexAndName } from "@/lib/utils/sort-items-by-index-name";@@ -16,7 +17,13 @@ import { sortItemsByIndexAndName } from "@/lib/utils/sort-items-by-index-name";// Types// ============================================================================-type LinkFetchStatus = "ok" | "not_found" | "archived" | "deleted" | "free" | "frozen";+type LinkFetchStatus =+ | "ok"+ | "not_found"+ | "archived"+ | "deleted"+ | "free"+ | "frozen";export type LinkFetchResult =| {@@ -25,6 +32,7 @@ export type LinkFetchResult =link: any;brand: Partial<Brand> | Partial<DataroomBrand> | null;linkId?: string;+ dataroomIndexEnabled?: boolean;}| {status: Exclude<LinkFetchStatus, "ok">;@@ -744,11 +752,29 @@ async function processLinkData(const serializedLink = JSON.parse(JSON.stringify(returnLink));const serializedBrand = brand ? JSON.parse(JSON.stringify(brand)) : null;+ // Mirrors the rebuild gate in `calculate-indexes.ts`. Computed here+ // because `link.team` is stripped from the payload below.+ let dataroomIndexEnabled: boolean | undefined;+ if (linkType === "DATAROOM_LINK" && link.teamId) {+ const hasDataroomsPlusPlan =+ teamPlan === "datarooms-plus" ||+ teamPlan === "datarooms-plus+old" ||+ teamPlan === "datarooms-premium" ||+ teamPlan === "datarooms-unlimited";+ if (hasDataroomsPlusPlan) {+ dataroomIndexEnabled = true;+ } else {+ const featureFlags = await getFeatureFlags({ teamId: link.teamId });+ dataroomIndexEnabled = featureFlags.dataroomIndex;+ }+ }+return {status: "ok",linkType,link: serializedLink,brand: serializedBrand,+ dataroomIndexEnabled,};}diff --git a/lib/utils/hierarchical-display.ts b/lib/utils/hierarchical-display.tsindex 012a890a..616cf700 100644--- a/lib/utils/hierarchical-display.ts+++ b/lib/utils/hierarchical-display.ts@@ -1,25 +1,25 @@import { useFeatureFlags } from "@/lib/hooks/use-feature-flags";+import { usePlan } from "@/lib/swr/use-billing";++export function useDataroomIndexEnabled(): boolean {+ const { isFeatureEnabled } = useFeatureFlags();+ const { isDataroomsPlus } = usePlan();+ return isDataroomsPlus || isFeatureEnabled("dataroomIndex");+}-/**- * Returns the display name with hierarchical index if enabled- */export function useHierarchicalDisplayName(name: string,hierarchicalIndex?: string | null,): string {- const { isFeatureEnabled } = useFeatureFlags();- const isDataroomIndexEnabled = isFeatureEnabled("dataroomIndex");+ const isEnabled = useDataroomIndexEnabled();- if (isDataroomIndexEnabled && hierarchicalIndex) {+ if (isEnabled && hierarchicalIndex) {return `${hierarchicalIndex} ${name}`;}return name;}-/**- * Non-hook version for use in non-React contexts- */export function getHierarchicalDisplayName(name: string,hierarchicalIndex?: string | null,@@ -32,9 +32,6 @@ export function getHierarchicalDisplayName(return name;}-/**- * CSS class for tabular numbers styling- */export const HIERARCHICAL_DISPLAY_STYLE = {fontVariantNumeric: "tabular-nums" as const,};diff --git a/pages/view/[linkId]/index.tsx b/pages/view/[linkId]/index.tsxindex 509fea48..8eb5030d 100644--- a/pages/view/[linkId]/index.tsx+++ b/pages/view/[linkId]/index.tsx@@ -101,7 +101,7 @@ export const getStaticProps = async (context: GetStaticPropsContext) => {};}- const { linkType, link, brand } = result;+ const { linkType, link, brand, dataroomIndexEnabled } = result;if (!linkType) {return {@@ -268,9 +268,8 @@ export const getStaticProps = async (context: GetStaticPropsContext) => {const { teamId } = link.dataroom;- // Check feature flags+ // `dataroomIndexEnabled` is resolved server-side by `fetchLinkDataById`.const featureFlags = await getFeatureFlags({ teamId });- const dataroomIndexEnabled = featureFlags.dataroomIndex;const annotationsEnabled = featureFlags.annotations;const textSelectionEnabled = featureFlags.textSelection;diff --git a/pages/view/domains/[domain]/[slug]/index.tsx b/pages/view/domains/[domain]/[slug]/index.tsxindex 63e2b5b9..b1ed5954 100644--- a/pages/view/domains/[domain]/[slug]/index.tsx+++ b/pages/view/domains/[domain]/[slug]/index.tsx@@ -84,7 +84,7 @@ export const getStaticProps = async (context: GetStaticPropsContext) => {};}- const { linkType, link, brand, linkId } = result;+ const { linkType, link, brand, linkId, dataroomIndexEnabled } = result;if (!linkType) {return {@@ -242,9 +242,8 @@ export const getStaticProps = async (context: GetStaticPropsContext) => {const { teamId } = link.dataroom;- // Check feature flags+ // `dataroomIndexEnabled` is resolved server-side by `fetchLinkDataByDomainSlug`.const featureFlags = await getFeatureFlags({ teamId });- const dataroomIndexEnabled = featureFlags.dataroomIndex;const textSelectionEnabled = featureFlags.textSelection;const lastUpdatedAt = link.dataroom.documents.reduce(