Skip to content

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

feat: don't auto-open permissions setting if no group exists

Marc Seitz5462b6808003
diff --git a/components/datarooms/dataroom-document-card.tsx b/components/datarooms/dataroom-document-card.tsx
index c56704bf..f00a6034 100644
--- a/components/datarooms/dataroom-document-card.tsx
+++ b/components/datarooms/dataroom-document-card.tsx
@@ -281,7 +281,7 @@ export default function DataroomDocumentCard({
}}
>
<FileSlidersIcon className="mr-2 h-4 w-4" />
- Set Permission
+ Set Group Permissions
</DropdownMenuItem>
<DropdownMenuSeparator />
@@ -346,13 +346,15 @@ export default function DataroomDocumentCard({
open={groupPermissionOpen}
setOpen={setGroupPermissionOpen}
dataroomId={dataroomId}
- uploadedFiles={[{
- documentId: dataroomDocument.id,
- dataroomDocumentId: dataroomDocument.id,
- fileName: dataroomDocument.document.name,
- }]}
+ uploadedFiles={[
+ {
+ documentId: dataroomDocument.id,
+ dataroomDocumentId: dataroomDocument.id,
+ fileName: dataroomDocument.document.name,
+ },
+ ]}
/>
) : null}
</>
);
-}
\ No newline at end of file
+}
diff --git a/components/datarooms/dataroom-items-list.tsx b/components/datarooms/dataroom-items-list.tsx
index 4d5b857d..135fd743 100644
--- a/components/datarooms/dataroom-items-list.tsx
+++ b/components/datarooms/dataroom-items-list.tsx
@@ -31,6 +31,7 @@ import {
DataroomFolderDocument,
DataroomFolderWithCount,
} from "@/lib/swr/use-dataroom";
+import useDataroomGroups from "@/lib/swr/use-dataroom-groups";
import { FolderWithCount } from "@/lib/swr/use-documents";
import { useMediaQuery } from "@/lib/utils/use-media-query";
@@ -69,6 +70,7 @@ export function DataroomItemsList({
folderCount: number;
documentCount: number;
}) {
+ const { viewerGroups } = useDataroomGroups();
const { isMobile } = useMediaQuery();
const [showGroupPermissions, setShowGroupPermissions] = useState(false);
const [uploadedFiles, setUploadedFiles] = useState<
@@ -492,8 +494,11 @@ export function DataroomItemsList({
dataroomDocumentId: string;
}[],
) => {
- setUploadedFiles(files);
- setShowGroupPermissions(true);
+ if (viewerGroups && viewerGroups.length > 0) {
+ setUploadedFiles(files);
+ setShowGroupPermissions(true);
+ }
+ return;
};
return (
@@ -641,4 +646,4 @@ export function DataroomItemsList({
)}
</>
);
-}
\ No newline at end of file
+}
diff --git a/components/datarooms/groups/set-group-permissions-modal.tsx b/components/datarooms/groups/set-group-permissions-modal.tsx
index 64e55ecc..0ce2b03f 100644
--- a/components/datarooms/groups/set-group-permissions-modal.tsx
+++ b/components/datarooms/groups/set-group-permissions-modal.tsx
@@ -57,7 +57,6 @@ export function SetGroupPermissionsModal({
fileName: string;
}[];
}) {
- console.log("uploadedFiles", uploadedFiles);
const teamInfo = useTeam();
const teamId = teamInfo?.currentTeam?.id;
const [selectedFile, setSelectedFile] = useState<{
@@ -79,11 +78,6 @@ export function SetGroupPermissionsModal({
);
}, [selectedFile, uploadedFiles]);
- console.log("currentDocumentId", {
- currentDocumentId,
- currentDataroomDocumentId,
- });
-
const {
viewerGroups,
loading: viewerGroupsLoading,
@@ -429,13 +423,13 @@ export function SetGroupPermissionsModal({
</TableCell>
</TableRow>
))
- ) : !viewerGroupsLoading && viewerGroups?.length === 0 ?(
+ ) : !viewerGroupsLoading && viewerGroups?.length === 0 ? (
<TableRow>
<TableCell colSpan={3} className="w-full text-center">
No groups found
</TableCell>
</TableRow>
- ): null}
+ ) : null}
</TableBody>
</Table>
</div>
diff --git a/components/documents/add-document-modal.tsx b/components/documents/add-document-modal.tsx
index 424039ff..787f58f6 100644
--- a/components/documents/add-document-modal.tsx
+++ b/components/documents/add-document-modal.tsx
@@ -5,7 +5,6 @@ import { FormEvent, useEffect, useState } from "react";
import { useTeam } from "@/context/team-context";
import { PlanEnum } from "@/ee/stripe/constants";
-import { usePlausible } from "next-plausible";
import { parsePageId } from "notion-utils";
import { toast } from "sonner";
import { mutate } from "swr";
@@ -65,7 +64,6 @@ export function AddDocumentModal({
setAddDocumentModalOpen?: (isOpen: boolean) => void;
}) {
const router = useRouter();
- const plausible = usePlausible();
const analytics = useAnalytics();
const [uploading, setUploading] = useState<boolean>(false);
const [isOpen, setIsOpen] = useState<boolean | undefined>(undefined);
@@ -81,9 +79,7 @@ export function AddDocumentModal({
>([]);
const teamInfo = useTeam();
const { canAddDocuments } = useLimits();
- const { plan, trial } = usePlan();
- const isFreePlan = plan === "free";
- const isTrial = !!trial;
+ const { plan, isFree, isTrial } = usePlan();
const teamId = teamInfo?.currentTeam?.id as string;
@@ -229,18 +225,22 @@ export function AddDocumentModal({
if (dataroomResponse?.ok) {
const dataroomDocument =
- (await dataroomResponse.json()) as DataroomDocument;
- setUploadedFiles([
- {
- documentId: document.id,
- dataroomDocumentId: dataroomDocument.id,
- fileName: document.name,
- },
- ]);
- setShowGroupPermissions(true);
+ (await dataroomResponse.json()) as DataroomDocument & {
+ dataroom: { _count: { viewerGroups: number } };
+ };
+
+ if (dataroomDocument.dataroom._count.viewerGroups > 0) {
+ setShowGroupPermissions(true);
+ setUploadedFiles([
+ {
+ documentId: document.id,
+ dataroomDocumentId: dataroomDocument.id,
+ fileName: document.name,
+ },
+ ]);
+ }
}
- plausible("documentUploaded");
analytics.capture("Document Added", {
documentId: document.id,
name: document.name,
@@ -261,8 +261,6 @@ export function AddDocumentModal({
if (!newVersion) {
toast.success("Document uploaded. Redirecting to document page...");
- // track the event
- plausible("documentUploaded");
analytics.capture("Document Added", {
documentId: document.id,
name: document.name,
@@ -279,8 +277,6 @@ export function AddDocumentModal({
// redirect to the document page
router.push("/documents/" + document.id);
} else {
- // track the event
- plausible("documentVersionUploaded");
analytics.capture("Document Added", {
documentId: document.id,
name: document.name,
@@ -378,19 +374,22 @@ export function AddDocumentModal({
if (dataroomResponse?.ok) {
const dataroomDocument =
- (await dataroomResponse.json()) as DataroomDocument;
- setShowGroupPermissions(true);
- setUploadedFiles([
- {
- documentId: document.id,
- dataroomDocumentId: dataroomDocument.id,
- fileName: document.name,
- },
- ]);
+ (await dataroomResponse.json()) as DataroomDocument & {
+ dataroom: { _count: { viewerGroups: number } };
+ };
+
+ if (dataroomDocument.dataroom._count.viewerGroups > 0) {
+ setShowGroupPermissions(true);
+ setUploadedFiles([
+ {
+ documentId: document.id,
+ dataroomDocumentId: dataroomDocument.id,
+ fileName: document.name,
+ },
+ ]);
+ }
}
- plausible("documentUploaded");
- plausible("notionDocumentUploaded");
analytics.capture("Document Added", {
documentId: document.id,
name: document.name,
@@ -413,9 +412,6 @@ export function AddDocumentModal({
"Notion Page processed. Redirecting to document page...",
);
- // track the event
- plausible("documentUploaded");
- plausible("notionDocumentUploaded");
analytics.capture("Document Added", {
documentId: document.id,
name: document.name,
@@ -511,7 +507,7 @@ export function AddDocumentModal({
) : (
<span>
After you upload the document, create a shareable link.{" "}
- {isFreePlan && !isTrial ? (
+ {isFree && !isTrial ? (
<>
Upload larger files and more{" "}
<Link
@@ -644,4 +640,4 @@ export function AddDocumentModal({
)}
</>
);
-}
\ No newline at end of file
+}
diff --git a/pages/api/teams/[teamId]/datarooms/[id]/documents/index.ts b/pages/api/teams/[teamId]/datarooms/[id]/documents/index.ts
index 236cb4a2..4f7188e5 100644
--- a/pages/api/teams/[teamId]/datarooms/[id]/documents/index.ts
+++ b/pages/api/teams/[teamId]/datarooms/[id]/documents/index.ts
@@ -159,6 +159,7 @@ export default async function handle(
orderBy: { createdAt: "desc" },
take: 1,
},
+ _count: { select: { viewerGroups: true } },
},
},
},