Skip to content

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

Fix viewer sidebar tree not respecting document/folder reorder (#2133)

Marc Seitz3f009afdc5d2
diff --git a/components/datarooms/folders/utils.ts b/components/datarooms/folders/utils.ts
index 2a36880d..63cc6536 100644
--- a/components/datarooms/folders/utils.ts
+++ b/components/datarooms/folders/utils.ts
@@ -61,6 +61,7 @@ type DataroomDocumentWithVersion = {
folderId: string | null;
id: string;
name: string;
+ orderIndex: number | null;
hierarchicalIndex: string | null;
versions: {
id: string;
@@ -76,6 +77,7 @@ type DataroomFolderWithDocumentsNew = DataroomFolder & {
folderId: string | null;
id: string;
name: string;
+ orderIndex: number | null;
hierarchicalIndex: string | null;
}[];
};
diff --git a/components/datarooms/folders/view-tree.tsx b/components/datarooms/folders/view-tree.tsx
index 605d39fc..59ecab63 100644
--- a/components/datarooms/folders/view-tree.tsx
+++ b/components/datarooms/folders/view-tree.tsx
@@ -11,6 +11,7 @@ import {
HIERARCHICAL_DISPLAY_STYLE,
getHierarchicalDisplayName,
} from "@/lib/utils/hierarchical-display";
+import { sortByIndexThenName } from "@/lib/utils/sort-items-by-index-name";
import { FileTree } from "@/components/ui/nextra-filetree";
import { useViewerSurfaceTheme } from "@/components/view/viewer/viewer-surface-theme";
@@ -46,6 +47,7 @@ type DataroomDocumentWithVersion = {
folderId: string | null;
id: string;
name: string;
+ orderIndex: number | null;
hierarchicalIndex: string | null;
versions: {
id: string;
@@ -61,6 +63,7 @@ type DataroomFolderWithDocuments = DataroomFolder & {
folderId: string | null;
id: string;
name: string;
+ orderIndex: number | null;
hierarchicalIndex: string | null;
}[];
};
@@ -86,6 +89,10 @@ function findFolderPath(
return null;
}
+type MixedViewItem =
+ | (DataroomFolderWithDocuments & { itemType: "folder" })
+ | (DataroomFolderWithDocuments["documents"][0] & { itemType: "document" });
+
const FolderComponent = memo(
({
folder,
@@ -102,49 +109,53 @@ const FolderComponent = memo(
}) => {
const router = useRouter();
- // Get hierarchical display name for the folder
const folderDisplayName = getHierarchicalDisplayName(
folder.name,
folder.hierarchicalIndex,
dataroomIndexEnabled || false,
);
- // Memoize the rendering of the current folder's documents
- const documents = useMemo(
- () =>
- folder.documents.map((doc) => (
- <ViewerDocumentFileItem
- key={doc.id}
- document={{
- ...doc,
- versions: [], // Not needed for display
- }}
- dataroomIndexEnabled={dataroomIndexEnabled}
- />
- )),
- [folder.documents, dataroomIndexEnabled],
- );
+ const mixedItems = useMemo(() => {
+ const allItems: MixedViewItem[] = [
+ ...(folder.childFolders || []).map((f) => ({
+ ...f,
+ itemType: "folder" as const,
+ })),
+ ...(folder.documents || []).map((d) => ({
+ ...d,
+ itemType: "document" as const,
+ })),
+ ];
+ return sortByIndexThenName(allItems);
+ }, [folder.childFolders, folder.documents]);
- // Recursively render child folders if they exist
- const childFolders = useMemo(
+ const renderedItems = useMemo(
() =>
- folder.childFolders.map((childFolder) => (
- <FolderComponent
- key={childFolder.id}
- folder={childFolder}
- folderId={folderId}
- setFolderId={setFolderId}
- folderPath={folderPath}
- dataroomIndexEnabled={dataroomIndexEnabled}
- />
- )),
- [
- folder.childFolders,
- folderId,
- setFolderId,
- folderPath,
- dataroomIndexEnabled,
- ],
+ mixedItems.map((item: MixedViewItem) => {
+ if (item.itemType === "folder") {
+ return (
+ <FolderComponent
+ key={item.id}
+ folder={item}
+ folderId={folderId}
+ setFolderId={setFolderId}
+ folderPath={folderPath}
+ dataroomIndexEnabled={dataroomIndexEnabled}
+ />
+ );
+ }
+ return (
+ <ViewerDocumentFileItem
+ key={item.id}
+ document={{
+ ...item,
+ versions: [],
+ }}
+ dataroomIndexEnabled={dataroomIndexEnabled}
+ />
+ );
+ }),
+ [mixedItems, folderId, setFolderId, folderPath, dataroomIndexEnabled],
);
const isActive = folder.id === folderId;
@@ -167,8 +178,7 @@ const FolderComponent = memo(
childActive={isChildActive}
onToggle={() => setFolderId(folder.id)}
>
- {childFolders}
- {documents}
+ {renderedItems}
</FileTree.Folder>
</div>
);
diff --git a/package-lock.json b/package-lock.json
index 54963d14..5a50e352 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1625,36 +1625,6 @@
"node": ">=20.0.0"
}
},
- "node_modules/@aws-sdk/xml-builder/node_modules/fast-xml-parser": {
- "version": "4.5.4",
- "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.4.tgz",
- "integrity": "sha512-jE8ugADnYOBsu1uaoayVl1tVKAMNOXyjwvv2U6udEA2ORBhDooJDWoGxTkhd4Qn4yh59JVVt/pKXtjPwx9OguQ==",
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/NaturalIntelligence"
- }
- ],
- "license": "MIT",
- "dependencies": {
- "strnum": "^1.0.5"
- },
- "bin": {
- "fxparser": "src/cli/cli.js"
- }
- },
- "node_modules/@aws-sdk/xml-builder/node_modules/strnum": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.1.2.tgz",
- "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==",
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/NaturalIntelligence"
- }
- ],
- "license": "MIT"
- },
"node_modules/@aws/lambda-invoke-store": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/@aws/lambda-invoke-store/-/lambda-invoke-store-0.2.3.tgz",
@@ -15011,6 +14981,41 @@
],
"license": "BSD-3-Clause"
},
+ "node_modules/fast-xml-builder": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.4.tgz",
+ "integrity": "sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/NaturalIntelligence"
+ }
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "path-expression-matcher": "^1.1.3"
+ }
+ },
+ "node_modules/fast-xml-parser": {
+ "version": "5.5.8",
+ "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.8.tgz",
+ "integrity": "sha512-Z7Fh2nVQSb2d+poDViM063ix2ZGt9jmY1nWhPfHBOK2Hgnb/OW3P4Et3P/81SEej0J7QbWtJqxO05h8QYfK7LQ==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/NaturalIntelligence"
+ }
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "fast-xml-builder": "^1.1.4",
+ "path-expression-matcher": "^1.2.0",
+ "strnum": "^2.2.0"
+ },
+ "bin": {
+ "fxparser": "src/cli/cli.js"
+ }
+ },
"node_modules/fastq": {
"version": "1.20.1",
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
@@ -20735,6 +20740,21 @@
"node": ">=8"
}
},
+ "node_modules/path-expression-matcher": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.2.0.tgz",
+ "integrity": "sha512-DwmPWeFn+tq7TiyJ2CxezCAirXjFxvaiD03npak3cRjlP9+OjTmSy1EpIrEbh+l6JgUundniloMLDQ/6VTdhLQ==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/NaturalIntelligence"
+ }
+ ],
+ "license": "MIT",
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
"node_modules/path-is-absolute": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -24554,6 +24574,18 @@
"node": ">=12.*"
}
},
+ "node_modules/strnum": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.2.tgz",
+ "integrity": "sha512-DnR90I+jtXNSTXWdwrEy9FakW7UX+qUZg28gj5fk2vxxl7uS/3bpI4fjFYVmdK9etptYBPNkpahuQnEwhwECqA==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/NaturalIntelligence"
+ }
+ ],
+ "license": "MIT"
+ },
"node_modules/stubborn-fs": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/stubborn-fs/-/stubborn-fs-2.0.0.tgz",
diff --git a/pages/room_ppreview_demo.tsx b/pages/room_ppreview_demo.tsx
index 2d7f23a1..c27a743c 100644
--- a/pages/room_ppreview_demo.tsx
+++ b/pages/room_ppreview_demo.tsx
@@ -131,6 +131,7 @@ export default function ViewPage() {
name: "Q4 Report.pdf",
dataroomDocumentId: "1",
folderId: null,
+ orderIndex: null,
hierarchicalIndex: null,
versions: [
{