Skip to content

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

feat: add additional sorting options for documents (#1273)

JeevaRamanathanea4d23b88d44
diff --git a/components/documents/filters/sort-button.tsx b/components/documents/filters/sort-button.tsx
index 0ebd1db9..9050b715 100644
--- a/components/documents/filters/sort-button.tsx
+++ b/components/documents/filters/sort-button.tsx
@@ -3,11 +3,13 @@ import { useRouter } from "next/router";
import { useEffect, useState } from "react";
import {
+ ArrowDownAZ,
ArrowDownWideNarrowIcon,
CalendarArrowDownIcon,
CheckIcon,
ClockArrowDownIcon,
Eye,
+ Link,
XCircleIcon,
} from "lucide-react";
@@ -28,7 +30,12 @@ export default function SortButton() {
useEffect(() => {
const { sort } = router.query;
- if (sort && ["createdAt", "views", "lastViewed"].includes(sort as string)) {
+ if (
+ sort &&
+ ["name", "createdAt", "views", "lastViewed", "links"].includes(
+ sort as string,
+ )
+ ) {
setSortBy(sort as string);
} else {
setSortBy(null);
@@ -64,6 +71,10 @@ export default function SortButton() {
return "Recently Viewed";
case "views":
return "Number of Views";
+ case "name":
+ return "Name";
+ case "links":
+ return "Number of Links";
default:
return "";
}
@@ -91,6 +102,14 @@ export default function SortButton() {
</DropdownMenuTrigger>
<DropdownMenuContent className="w-48" align="end">
<DropdownMenuLabel>Sort by</DropdownMenuLabel>
+ <DropdownMenuItem
+ onClick={() => setSortBy("name")}
+ disabled={sortBy === "name"}
+ >
+ <ArrowDownAZ className="mr-2 h-4 w-4" />
+ Name
+ {sortBy === "name" && <CheckIcon className="ml-auto h-4 w-4" />}
+ </DropdownMenuItem>
<DropdownMenuItem
onClick={() => setSortBy("createdAt")}
disabled={sortBy === "createdAt"}
@@ -101,18 +120,32 @@ export default function SortButton() {
<CheckIcon className="ml-auto h-4 w-4" />
)}
</DropdownMenuItem>
- <DropdownMenuItem onClick={() => setSortBy("lastViewed")}>
+ <DropdownMenuItem
+ onClick={() => setSortBy("lastViewed")}
+ disabled={sortBy === "lastViewed"}
+ >
<ClockArrowDownIcon className="mr-2 h-4 w-4" />
Recently Viewed
{sortBy === "lastViewed" && (
<CheckIcon className="ml-auto h-4 w-4" />
)}
</DropdownMenuItem>
- <DropdownMenuItem onClick={() => setSortBy("views")}>
+ <DropdownMenuItem
+ onClick={() => setSortBy("views")}
+ disabled={sortBy === "views"}
+ >
<Eye className="mr-2 h-4 w-4" />
Number of Views
{sortBy === "views" && <CheckIcon className="ml-auto h-4 w-4" />}
</DropdownMenuItem>
+ <DropdownMenuItem
+ onClick={() => setSortBy("links")}
+ disabled={sortBy === "links"}
+ >
+ <Link className="mr-2 h-4 w-4" />
+ Number of Links
+ {sortBy === "links" && <CheckIcon className="ml-auto h-4 w-4" />}
+ </DropdownMenuItem>
{sortBy !== null && (
<DropdownMenuItem
onClick={resetSort}
diff --git a/components/search-box.tsx b/components/search-box.tsx
index 0381868d..de643850 100644
--- a/components/search-box.tsx
+++ b/components/search-box.tsx
@@ -121,10 +121,6 @@ export function SearchBoxPersisted({
const [value, setValue] = useState(queryParams[urlParam] ?? "");
const [debouncedValue, setDebouncedValue] = useState(value);
- console.log("queryParams", queryParams);
- console.log("debouncedValue", debouncedValue);
- console.log("value", value);
-
// Set URL param when debounced value changes
useEffect(() => {
if (queryParams[urlParam] ?? "" !== debouncedValue)
@@ -140,7 +136,6 @@ export function SearchBoxPersisted({
);
} else {
queryParams[urlParam] = debouncedValue;
- console.log("queryParams", queryParams);
router.push(
{
pathname: router.pathname,
diff --git a/pages/api/teams/[teamId]/documents/index.ts b/pages/api/teams/[teamId]/documents/index.ts
index ec0969c1..440367b7 100644
--- a/pages/api/teams/[teamId]/documents/index.ts
+++ b/pages/api/teams/[teamId]/documents/index.ts
@@ -56,6 +56,12 @@ export default async function handle(
case "views":
orderBy = { views: { _count: "desc" } };
break;
+ case "name":
+ orderBy = { name: "asc" };
+ break;
+ case "links":
+ orderBy = { links: { _count: "desc" } };
+ break;
default:
orderBy = { createdAt: "desc" };
}
@@ -103,6 +109,12 @@ export default async function handle(
});
}
+ if (sort === "name") {
+ sortedDocuments = documents.sort((a, b) =>
+ a.name.toLowerCase().localeCompare(b.name.toLowerCase()),
+ );
+ }
+
return res.status(200).json(sortedDocuments);
} catch (error) {
errorhandler(error, res);