Skip to content

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

improvement

Ashish Viradiya104bf089c25e
diff --git a/components/datarooms/dataroom-items-list.tsx b/components/datarooms/dataroom-items-list.tsx
index 6b5d7f19..5144a12c 100644
--- a/components/datarooms/dataroom-items-list.tsx
+++ b/components/datarooms/dataroom-items-list.tsx
@@ -552,8 +552,7 @@ export function DataroomItemsList({
dataroomDocumentId: string;
}[],
) => {
- const hasGroups = viewerGroups && viewerGroups.length > 0;
- if (!hasGroups) return;
+ if (viewerGroups && viewerGroups.length === 0) return;
const defaultPermission =
dataroom?.defaultGroupPermission || "ask_every_time";
diff --git a/components/datarooms/settings/permission-settings.tsx b/components/datarooms/settings/permission-settings.tsx
index 842e130f..99f59de6 100644
--- a/components/datarooms/settings/permission-settings.tsx
+++ b/components/datarooms/settings/permission-settings.tsx
@@ -50,7 +50,9 @@ export default function PermissionSettings({
pId: string;
defaultGroupPermission: DefaultGroupPermissionStrategy;
}>(
- dataroomId ? `/api/teams/${teamId}/datarooms/${dataroomId}` : null,
+ teamId && dataroomId
+ ? `/api/teams/${teamId}/datarooms/${dataroomId}`
+ : null,
fetcher,
);
@@ -339,4 +341,4 @@ export default function PermissionSettings({
</CardContent>
</Card>
);
-}
+}
\ No newline at end of file
diff --git a/lib/hooks/use-dataroom-permissions.ts b/lib/hooks/use-dataroom-permissions.ts
index dae8a1c5..105e63c8 100644
--- a/lib/hooks/use-dataroom-permissions.ts
+++ b/lib/hooks/use-dataroom-permissions.ts
@@ -18,7 +18,7 @@ export const useDataroomPermissions = () => {
try {
const response = await fetch(
- `/api/teams/${teamId}/datarooms/${dataroomId}/groups/apply-default-permissions`,
+ `/api/teams/${encodeURIComponent(teamId)}/datarooms/${encodeURIComponent(dataroomId)}/groups/apply-default-permissions`,
{
method: "POST",
headers: {
@@ -63,7 +63,7 @@ export const useDataroomPermissions = () => {
try {
const response = await fetch(
- `/api/teams/${teamId}/datarooms/${dataroomId}/groups/inherit-parent-permissions`,
+ `/api/teams/${encodeURIComponent(teamId)}/datarooms/${encodeURIComponent(dataroomId)}/groups/inherit-parent-permissions`,
{
method: "POST",
headers: {
diff --git a/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/index.ts b/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/index.ts
index 6a354b17..65456ca0 100644
--- a/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/index.ts
+++ b/pages/api/teams/[teamId]/datarooms/[id]/groups/[groupId]/index.ts
@@ -99,7 +99,7 @@ export default async function handle(
const userId = (session.user as CustomUser).id;
try {
- const team = await prisma.team.findUnique({
+ const team = await prisma.team.findFirst({
where: {
id: teamId,
users: {
diff --git a/pages/api/teams/[teamId]/datarooms/[id]/groups/apply-default-permissions.ts b/pages/api/teams/[teamId]/datarooms/[id]/groups/apply-default-permissions.ts
index 160f5e2a..d754a453 100644
--- a/pages/api/teams/[teamId]/datarooms/[id]/groups/apply-default-permissions.ts
+++ b/pages/api/teams/[teamId]/datarooms/[id]/groups/apply-default-permissions.ts
@@ -36,7 +36,7 @@ export default async function handler(
}
// Check if the user is part of the team
- const team = await prisma.team.findUnique({
+ const team = await prisma.team.findFirst({
where: {
id: teamId,
users: {
@@ -55,15 +55,15 @@ export default async function handler(
const dataroom = await prisma.dataroom.findUnique({
where: {
id: dataroomId,
- teamId,
},
select: {
id: true,
+ teamId: true,
defaultGroupPermission: true,
},
});
- if (!dataroom) {
+ if (!dataroom || dataroom.teamId !== teamId) {
return res.status(404).json({ message: "Dataroom not found" });
}
diff --git a/pages/api/teams/[teamId]/datarooms/[id]/groups/inherit-parent-permissions.ts b/pages/api/teams/[teamId]/datarooms/[id]/groups/inherit-parent-permissions.ts
index a721863a..2e052ab6 100644
--- a/pages/api/teams/[teamId]/datarooms/[id]/groups/inherit-parent-permissions.ts
+++ b/pages/api/teams/[teamId]/datarooms/[id]/groups/inherit-parent-permissions.ts
@@ -37,7 +37,7 @@ export default async function handler(
}
// Check if the user is part of the team
- const team = await prisma.team.findUnique({
+ const team = await prisma.team.findFirst({
where: {
id: teamId,
users: {
@@ -53,7 +53,7 @@ export default async function handler(
}
// Get dataroom and verify it exists and belongs to the team
- const dataroom = await prisma.dataroom.findUnique({
+ const dataroom = await prisma.dataroom.findFirst({
where: {
id: dataroomId,
teamId,
diff --git a/prisma/migrations/20250616102233_group_permission/migration.sql b/prisma/migrations/20250617063944_group_permission/migration.sql
similarity index 80%
rename from prisma/migrations/20250616102233_group_permission/migration.sql
rename to prisma/migrations/20250617063944_group_permission/migration.sql
index 95e93f03..479c100d 100644
--- a/prisma/migrations/20250616102233_group_permission/migration.sql
+++ b/prisma/migrations/20250617063944_group_permission/migration.sql
@@ -5,5 +5,5 @@ CREATE TYPE "DefaultGroupPermissionStrategy" AS ENUM ('ask_every_time', 'inherit
ALTER TABLE "Dataroom" ADD COLUMN "defaultGroupPermission" "DefaultGroupPermissionStrategy" NOT NULL DEFAULT 'ask_every_time';
-- AlterTable
-ALTER TABLE "ViewerGroup" ADD COLUMN "defaultCanDownload" BOOLEAN DEFAULT false,
-ADD COLUMN "defaultCanView" BOOLEAN DEFAULT false;
+ALTER TABLE "ViewerGroup" ADD COLUMN "defaultCanDownload" BOOLEAN NOT NULL DEFAULT false,
+ADD COLUMN "defaultCanView" BOOLEAN NOT NULL DEFAULT false;
diff --git a/prisma/schema/dataroom.prisma b/prisma/schema/dataroom.prisma
index a5633da8..6f36f263 100644
--- a/prisma/schema/dataroom.prisma
+++ b/prisma/schema/dataroom.prisma
@@ -110,8 +110,8 @@ model ViewerGroup {
conversations Conversation[]
// default group permission setting
- defaultCanView Boolean? @default(false)
- defaultCanDownload Boolean? @default(false)
+ defaultCanView Boolean @default(false)
+ defaultCanDownload Boolean @default(false)
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt