Skip to content

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

chore: rabbit updates

Marc Seitza90f763ee509
diff --git a/components/links/link-sheet/index.tsx b/components/links/link-sheet/index.tsx
index 6af7b0e2..49c0f1f9 100644
--- a/components/links/link-sheet/index.tsx
+++ b/components/links/link-sheet/index.tsx
@@ -89,7 +89,7 @@ export const DEFAULT_LINK_PROPS = (
uploadFolderId: null,
uploadFolderName: "Home",
enableIndexFile: false,
- permissions: {},
+ permissions: () => ({}), // lazy factory
permissionGroupId: null,
});
diff --git a/components/links/link-sheet/link-success-sheet.tsx b/components/links/link-sheet/link-success-sheet.tsx
index a61059db..9778626b 100644
--- a/components/links/link-sheet/link-success-sheet.tsx
+++ b/components/links/link-sheet/link-success-sheet.tsx
@@ -47,13 +47,13 @@ export default function LinkSuccessSheet({
}: LinkSuccessSheetProps) {
const [copied, setCopied] = useState(false);
+ const linkUrl =
+ link.domainId && link.slug
+ ? `https://${link.domainSlug}/${link.slug}`
+ : `${process.env.NEXT_PUBLIC_MARKETING_URL}/view/${link.id}`;
+
const copyToClipboard = async () => {
try {
- const linkUrl =
- link.domainId && link.slug
- ? `https://${link.domainSlug}/${link.slug}`
- : `${process.env.NEXT_PUBLIC_MARKETING_URL}/view/${link.id}`;
-
await navigator.clipboard.writeText(linkUrl);
setCopied(true);
setTimeout(() => setCopied(false), 2000);
@@ -63,16 +63,9 @@ export default function LinkSuccessSheet({
};
const openLink = () => {
- const linkUrl = link.domainSlug
- ? `https://${link.domainSlug}/${link.slug}`
- : `${process.env.NEXT_PUBLIC_MARKETING_URL}/view/${link.id}`;
window.open(linkUrl, "_blank");
};
- const linkUrl = link.domainSlug
- ? `https://${link.domainSlug}/${link.slug}`
- : `${process.env.NEXT_PUBLIC_MARKETING_URL}/view/${link.id}`;
-
return (
<Sheet open={isOpen} onOpenChange={setIsOpen}>
<SheetContent className="flex w-[90%] flex-col justify-between border-l border-gray-200 bg-background px-4 text-foreground dark:border-gray-800 dark:bg-gray-900 sm:w-[600px] sm:max-w-2xl md:px-5">
diff --git a/components/links/links-table.tsx b/components/links/links-table.tsx
index 19209187..677107e8 100644
--- a/components/links/links-table.tsx
+++ b/components/links/links-table.tsx
@@ -304,7 +304,7 @@ export default function LinksTable({
try {
// Update the permissions for the existing link
- await fetch(
+ const res = await fetch(
`/api/teams/${teamInfo?.currentTeam?.id}/datarooms/${targetId}/permission-groups/${editPermissionLink.permissionGroupId}`,
{
method: "PUT",
@@ -318,6 +318,11 @@ export default function LinksTable({
},
);
+ if (!res.ok) {
+ const { error } = await res.json();
+ throw new Error(error ?? "Failed to update permissions");
+ }
+
// Refresh the links cache
const endpointTargetType = `${targetType.toLowerCase()}s`;
mutate(
diff --git a/ee/features/permissions/components/dataroom-link-sheet.tsx b/ee/features/permissions/components/dataroom-link-sheet.tsx
index 4674dddc..ad1345f3 100644
--- a/ee/features/permissions/components/dataroom-link-sheet.tsx
+++ b/ee/features/permissions/components/dataroom-link-sheet.tsx
@@ -61,7 +61,7 @@ export const DEFAULT_LINK_PROPS = (
showBanner: boolean = true,
) => ({
...BASE_DEFAULT_LINK_PROPS(linkType, groupId, showBanner),
- permissions: {},
+ permissions: null,
});
type ItemPermission = Record<
diff --git a/ee/features/permissions/components/permissions-sheet.tsx b/ee/features/permissions/components/permissions-sheet.tsx
index d3a209f7..b8ec4035 100644
--- a/ee/features/permissions/components/permissions-sheet.tsx
+++ b/ee/features/permissions/components/permissions-sheet.tsx
@@ -526,6 +526,7 @@ export function PermissionsSheet({
view: updatedPermissions.view,
download: updatedPermissions.download,
partialView: false,
+ partialDownload: false,
},
};
diff --git a/pages/api/links/[id]/index.ts b/pages/api/links/[id]/index.ts
index 8ed1d2b8..35fbcd1a 100644
--- a/pages/api/links/[id]/index.ts
+++ b/pages/api/links/[id]/index.ts
@@ -329,6 +329,7 @@ export default async function handle(
enableWatermark: linkData.enableWatermark || false,
watermarkConfig: linkData.watermarkConfig || null,
groupId: linkData.groupId || null,
+ permissionGroupId: linkData.permissionGroupId || null,
audienceType: linkData.audienceType || LinkAudienceType.GENERAL,
enableConversation: linkData.enableConversation || false,
enableUpload: linkData.enableUpload || false,
diff --git a/pages/api/teams/[teamId]/datarooms/[id]/permission-groups/[permissionGroupId].ts b/pages/api/teams/[teamId]/datarooms/[id]/permission-groups/[permissionGroupId].ts
index e4079258..57cf0959 100644
--- a/pages/api/teams/[teamId]/datarooms/[id]/permission-groups/[permissionGroupId].ts
+++ b/pages/api/teams/[teamId]/datarooms/[id]/permission-groups/[permissionGroupId].ts
@@ -188,7 +188,7 @@ export default async function handle(
itemType: permission.itemType,
canView: permission.view,
canDownload: permission.download,
- canDownloadOriginal: permission.download,
+ canDownloadOriginal: false,
};
if (existing) {
diff --git a/pages/api/teams/[teamId]/datarooms/[id]/permission-groups/index.ts b/pages/api/teams/[teamId]/datarooms/[id]/permission-groups/index.ts
index 79f6adb2..9ba34815 100644
--- a/pages/api/teams/[teamId]/datarooms/[id]/permission-groups/index.ts
+++ b/pages/api/teams/[teamId]/datarooms/[id]/permission-groups/index.ts
@@ -91,7 +91,7 @@ export default async function handle(
// Update the link with the permission group
if (linkId) {
await tx.link.update({
- where: { id: linkId },
+ where: { id: linkId, teamId: teamId },
data: {
permissionGroupId: permissionGroup.id,
},