Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions components/datarooms/groups/group-permissions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ import {
import { toast } from "sonner";
import { useDebounce } from "use-debounce";

import { useDataroomFoldersTree } from "@/lib/swr/use-dataroom";
import { cn } from "@/lib/utils";

import CloudDownloadOff from "@/components/shared/icons/cloud-download-off";
import { Button } from "@/components/ui/button";
import {
Expand All @@ -35,9 +38,6 @@ import {
} from "@/components/ui/table";
import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";

import { useDataroomFoldersTree } from "@/lib/swr/use-dataroom";
import { cn } from "@/lib/utils";

// Update the FileOrFolder type to include permissions
type FileOrFolder = {
id: string;
Expand Down Expand Up @@ -453,11 +453,13 @@ export default function ExpandableTable({

// Ensure all parent folders are viewable if the item is being set to viewable
// and downloadable if the item is being set to downloadable
if (updatedPermissions.view) {
if (updatedPermissions.view || updatedPermissions.download) {
parents.forEach((parent) => {
changes[parent.id] = {
view: true, // Always enable view for parent folders
download: parent.permissions.download, // Maintain existing download permission
view: true, // Always enable view for parent folders if child is viewable
download: updatedPermissions.download
? true
: parent.permissions.download, // Always enable download for parent folders if child is downloadable
itemType: parent.itemType,
};
});
Expand Down
106 changes: 105 additions & 1 deletion components/view/dataroom/folder-card.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,91 @@
import { useState } from "react";

import { DataroomFolder } from "@prisma/client";
import { FolderIcon } from "lucide-react";
import { Download, FolderIcon, MoreVerticalIcon } from "lucide-react";
import { toast } from "sonner";

import { timeAgo } from "@/lib/utils";

import { Button } from "@/components/ui/button";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuLabel,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";

type FolderCardProps = {
folder: DataroomFolder;
dataroomId: string;
setFolderId: (id: string) => void;
isPreview: boolean;
linkId: string;
viewId?: string;
allowDownload: boolean;
};
export default function FolderCard({
folder,
dataroomId,
setFolderId,
isPreview,
linkId,
viewId,
allowDownload,
}: FolderCardProps) {
const [open, setOpen] = useState(false);
const downloadDocument = async () => {
if (!allowDownload) {
toast.error("Downloading folders is not allowed.");
return;
}
if (isPreview) {
toast.error("You cannot download dataroom folders in preview mode.");
return;
}

toast.promise(
fetch(`/api/links/download/dataroom-folder`, {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({
folderId: folder.id,
dataroomId,
viewId,
linkId,
}),
}),
{
loading: "Downloading dataroom folder...",
success: async (response) => {
if (!response.ok) {
throw new Error("Failed to fetch download URL");
}

const { downloadUrl } = await response.json();

const link = document.createElement("a");
link.href = downloadUrl;
link.rel = "noopener noreferrer";
document.body.appendChild(link);
link.click();

setTimeout(() => {
document.body.removeChild(link);
}, 100);

return `${folder.name} downloaded successfully.`;
},
error: (error) => {
console.error("Error downloading folder:", error);
return error.message || "An error occurred while downloading file.";
},
},
);
};

return (
<li className="group/row relative flex items-center justify-between rounded-lg border-0 p-3 ring-1 ring-gray-400 transition-all hover:bg-secondary hover:ring-gray-500 dark:bg-secondary dark:ring-gray-500 hover:dark:ring-gray-400 sm:p-4">
<div className="flex min-w-0 shrink items-center space-x-2 sm:space-x-4">
Expand All @@ -37,6 +110,37 @@ export default function FolderCard({
</div>
</div>
</div>
{allowDownload ? (
<div className="z-10">
<DropdownMenu open={open} onOpenChange={setOpen}>
<DropdownMenuTrigger asChild>
<Button
variant="ghost"
size="icon"
className="h-8 w-8 p-0 text-gray-500 ring-1 ring-gray-100 hover:bg-gray-200 group-hover/row:text-foreground group-hover/row:ring-gray-300"
aria-label="Open menu"
>
<MoreVerticalIcon className="h-4 w-4" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuLabel>Actions</DropdownMenuLabel>
<DropdownMenuItem
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
downloadDocument();
setOpen(false);
}}
disabled={isPreview}
>
<Download className="h-4 w-4" />
Download
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div>
) : null}
</li>
);
}
35 changes: 31 additions & 4 deletions components/view/viewer/dataroom-viewer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ import { DocumentUploadModal } from "../dataroom/document-upload-modal";
import FolderCard from "../dataroom/folder-card";
import DataroomNav from "../dataroom/nav-dataroom";

type FolderOrDocument = DataroomFolder | DataroomDocument;
type FolderOrDocument =
| (DataroomFolder & { allowDownload: boolean })
| DataroomDocument;

export type DocumentVersion = {
id: string;
Expand Down Expand Up @@ -127,7 +129,28 @@ export default function DataroomViewer({
const mixedItems: FolderOrDocument[] = [
...(folders || [])
.filter((folder) => folder.parentId === folderId)
.map((folder) => ({ ...folder, itemType: "folder" })),
.map((folder) => {
const folderDocuments = documents.filter(
(doc) => doc.folderId === folder.id,
);
const allDocumentsCanDownload =
folderDocuments.length > 0 &&
folderDocuments.every((doc) => {
const accessControl = accessControls.find(
(access) => access.itemId === doc.dataroomDocumentId,
);
return (
(accessControl?.canDownload ?? true) &&
doc.versions[0].type !== "notion"
);
});

return {
...folder,
itemType: "folder",
allowDownload: allowDownload && allDocumentsCanDownload,
};
}),
...(documents || [])
.filter((doc) => doc.folderId === folderId)
.map((doc) => {
Expand All @@ -145,7 +168,7 @@ export default function DataroomViewer({
}),
];
return mixedItems.sort((a, b) => (a.orderIndex || 0) - (b.orderIndex || 0));
}, [folders, documents, folderId, accessControls]);
}, [folders, documents, folderId, accessControls, allowDownload]);

const renderItem = (item: FolderOrDocument) => {
if ("versions" in item) {
Expand All @@ -167,6 +190,10 @@ export default function DataroomViewer({
folder={item}
dataroomId={dataroom?.id}
setFolderId={setFolderId}
isPreview={!!isPreview}
linkId={linkId}
viewId={viewId}
allowDownload={item.allowDownload}
/>
);
};
Expand Down Expand Up @@ -296,4 +323,4 @@ export default function DataroomViewer({
</div>
</>
);
}
}
22 changes: 4 additions & 18 deletions pages/api/links/download/bulk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,24 +161,6 @@ export default async function handle(
]),
);

// Helper function to add a file to the structure
// const addFileToStructure = (
// path: string,
// fileName: string,
// fileKey: string,
// ) => {
// const folderInfo = folderMap.get(path) || { name: "Root", id: null };
// if (!folderStructure[path]) {
// folderStructure[path] = {
// name: folderInfo.name,
// path: path,
// files: [],
// };
// }
// folderStructure[path].files.push({ name: fileName, key: fileKey });
// fileKeys.push(fileKey);
// };

const addFileToStructure = (
path: string,
fileName: string,
Expand Down Expand Up @@ -252,6 +234,10 @@ export default async function handle(
}
});

if (fileKeys.length === 0) {
return res.status(404).json({ error: "No files to download" });
}

const client = getLambdaClient();

const params = {
Expand Down
Loading