Skip to content

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

feat: add permission access controls to data room

Marc Seitzad48abee8773
diff --git a/components/view/dataroom/dataroom-view.tsx b/components/view/dataroom/dataroom-view.tsx
index def19965..621db66b 100644
--- a/components/view/dataroom/dataroom-view.tsx
+++ b/components/view/dataroom/dataroom-view.tsx
@@ -266,7 +266,7 @@ export default function DataroomView({
return (
<div className="bg-gray-950">
<DataroomViewer
- accessControls={group?.accessControls || []}
+ accessControls={link.accessControls || group?.accessControls || []}
brand={brand!}
viewId={viewData.viewId}
isPreview={viewData.isPreview}
diff --git a/components/view/viewer/dataroom-viewer.tsx b/components/view/viewer/dataroom-viewer.tsx
index e7549a6e..ffa77cd7 100644
--- a/components/view/viewer/dataroom-viewer.tsx
+++ b/components/view/viewer/dataroom-viewer.tsx
@@ -4,6 +4,7 @@ import React from "react";
import {
DataroomBrand,
DataroomFolder,
+ PermissionGroupAccessControls,
ViewerGroupAccessControls,
} from "@prisma/client";
import * as SheetPrimitive from "@radix-ui/react-dialog";
@@ -101,7 +102,7 @@ export default function DataroomViewer({
isPreview?: boolean;
folderId: string | null;
setFolderId: React.Dispatch<React.SetStateAction<string | null>>;
- accessControls: ViewerGroupAccessControls[];
+ accessControls: ViewerGroupAccessControls[] | PermissionGroupAccessControls[];
viewerId?: string;
viewData: DEFAULT_DATAROOM_VIEW_TYPE;
enableIndexFile?: boolean;
diff --git a/lib/api/links/link-data.ts b/lib/api/links/link-data.ts
index de2ee3f2..cb7161a7 100644
--- a/lib/api/links/link-data.ts
+++ b/lib/api/links/link-data.ts
@@ -118,6 +118,11 @@ export async function fetchDataroomLinkData({
accessControls: true,
},
},
+ permissionGroup: {
+ select: {
+ accessControls: true,
+ },
+ },
},
});
@@ -160,7 +165,13 @@ export async function fetchDataroomLinkData({
accentColor: dataroomBrand?.accentColor || teamBrand?.accentColor,
};
- return { linkData, brand };
+ // Extract access controls from either ViewerGroup or PermissionGroup
+ const accessControls =
+ linkData.group?.accessControls ||
+ linkData.permissionGroup?.accessControls ||
+ [];
+
+ return { linkData, brand, accessControls };
}
export async function fetchDataroomDocumentLinkData({
diff --git a/lib/types.ts b/lib/types.ts
index c6f18765..f0719639 100644
--- a/lib/types.ts
+++ b/lib/types.ts
@@ -6,6 +6,7 @@ import {
Document,
DocumentVersion,
Link,
+ PermissionGroupAccessControls,
User as PrismaUser,
View,
ViewerGroupAccessControls,
@@ -152,6 +153,9 @@ export interface LinkWithDataroom extends Link {
group?: {
accessControls: ViewerGroupAccessControls[];
};
+ accessControls?:
+ | ViewerGroupAccessControls[]
+ | PermissionGroupAccessControls[];
agreement: Agreement | null;
customFields: CustomField[];
enableIndexFile: boolean;
diff --git a/pages/api/links/[id]/index.ts b/pages/api/links/[id]/index.ts
index b225e430..8ed1d2b8 100644
--- a/pages/api/links/[id]/index.ts
+++ b/pages/api/links/[id]/index.ts
@@ -124,6 +124,8 @@ export default async function handle(
});
linkData = data.linkData;
brand = data.brand;
+ // Include access controls in the link data for the frontend
+ linkData.accessControls = data.accessControls;
console.timeEnd("get-dataroom-link-data");
}
diff --git a/pages/api/links/domains/[...domainSlug].ts b/pages/api/links/domains/[...domainSlug].ts
index 8cd0ab22..5fba0b2e 100644
--- a/pages/api/links/domains/[...domainSlug].ts
+++ b/pages/api/links/domains/[...domainSlug].ts
@@ -173,6 +173,8 @@ export default async function handle(
});
linkData = data.linkData;
brand = data.brand;
+ // Include access controls in the link data for the frontend
+ linkData.accessControls = data.accessControls;
}
console.timeEnd("get-dataroom-link-data");
}