Skip to content

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

Merge branch 'main' into RefreshRootDoc

Ashish Viradiya61663bd143a8
diff --cc components/upload-zone.tsx
index c3163857,44813c74..69377d82
--- a/components/upload-zone.tsx
+++ b/components/upload-zone.tsx
@@@ -108,17 -108,7 +108,6 @@@ export default function UploadZone(
const router = useRouter();
const teamInfo = useTeam();
const { data: session } = useSession();
- const isFreePlan = plan === "free";
- const isTrial = !!trial;
- const queryParams = router.query;
- const searchQuery = queryParams["search"];
- const sortQuery = queryParams["sort"];
- const page = Number(queryParams["page"]) || 1;
- const pageSize = Number(queryParams["limit"]) || 10;
- const paginationParams =
- searchQuery || sortQuery ? `&page=${page}&limit=${pageSize}` : "";
- // const maxSize = isFreePlan && !isTrial ? 30 : 350;
- // const maxNumPages = isFreePlan && !isTrial ? 100 : 500;
-
const { limits, canAddDocuments } = useLimits();
const remainingDocuments = limits?.documents
? limits?.documents - limits?.usage?.documents
diff --cc pages/documents/index.tsx
index b9ecdafa,23d5b243..8acf8f0b
--- a/pages/documents/index.tsx
+++ b/pages/documents/index.tsx
@@@ -1,15 -1,9 +1,10 @@@
+import { useRouter } from "next/router";
+
import { useTeam } from "@/context/team-context";
import { FolderPlusIcon, PlusIcon } from "lucide-react";
- import {
- ChevronLeftIcon,
- ChevronRightIcon,
- ChevronsLeftIcon,
- ChevronsRightIcon,
- } from "lucide-react";
--
+ import { useRouter } from "next/router";
import useDocuments, { useRootFolders } from "@/lib/swr/use-documents";
+ import { handleInvitationStatus } from "@/lib/utils";
import { AddDocumentModal } from "@/components/documents/add-document-modal";
import { DocumentsList } from "@/components/documents/documents-list";
@@@ -19,14 -13,7 +14,6 @@@ import { AddFolderModal } from "@/compo
import AppLayout from "@/components/layouts/app";
import { SearchBoxPersisted } from "@/components/search-box";
import { Button } from "@/components/ui/button";
- import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
- } from "@/components/ui/select";
--import { Separator } from "@/components/ui/separator";
export default function Documents() {
const router = useRouter();
@@@ -34,10 -21,15 +21,16 @@@
const queryParams = router.query;
const currentPage = Number(queryParams["page"]) || 1;
const pageSize = Number(queryParams["limit"]) || 10;
+ const invitation = queryParams["invitation"] as "accepted" | "teamMember";
+
+ // Handle invitation status
+ if (invitation) {
+ handleInvitationStatus(invitation, queryParams, router);
+ }
- const { folders } = useRootFolders();
- const { documents, pagination, isValidating, isFiltered } = useDocuments();
+ const { folders, loading: foldersLoading } = useRootFolders();
+ const { documents, pagination, isValidating, isFiltered, loading } =
+ useDocuments();
const updatePagination = (newPage?: number, newPageSize?: number) => {
const params = new URLSearchParams(window.location.search);