Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
refactor: cleanup startexport component
Marc Seitz301b3936e60f
diff --git a/components/datarooms/export-visits-modal.tsx b/components/datarooms/export-visits-modal.tsxindex 0c56f626..55997755 100644--- a/components/datarooms/export-visits-modal.tsx+++ b/components/datarooms/export-visits-modal.tsx@@ -1,4 +1,4 @@-import { useEffect, useRef, useState } from "react";+import { useCallback, useEffect, useRef, useState } from "react";import { useSession } from "next-auth/react";import { toast } from "sonner";@@ -11,22 +11,22 @@ interface ExportStatus {}interface ExportVisitsModalProps {+ teamId: string;dataroomId: string;dataroomName: string;- teamId: string;groupId?: string;groupName?: string;- isVisible: boolean;+ // Remove isVisible - if component is rendered, it should startonClose: () => void;}export function ExportVisitsModal({+ teamId,dataroomId,dataroomName,- teamId,groupId,groupName,- isVisible,+ // Remove isVisible parameteronClose,}: ExportVisitsModalProps) {const { data: session } = useSession();@@ -44,13 +44,7 @@ export function ExportVisitsModal({};}, []);- // Start export when component becomes visible- useEffect(() => {- if (isVisible) {- startExport();- }- }, [isVisible, startExport]);- const startExport = async () => {+ const startExport = useCallback(async () => {try {// Show modal immediatelysetShowModal(true);@@ -172,7 +166,12 @@ export function ExportVisitsModal({);onClose();}- };+ }, [teamId, dataroomId, groupId, dataroomName, groupName, onClose]);++ // Start export immediately when component mounts+ useEffect(() => {+ startExport();+ }, [startExport]);// Send export via emailconst sendExportEmail = async () => {@@ -208,11 +207,6 @@ export function ExportVisitsModal({};// Don't render anything if not visible and no modal to show- if (!isVisible && !showModal) {- return null;- }-- // Only show modal if it should be visibleif (!showModal) {return null;}diff --git a/components/documents/document-header.tsx b/components/documents/document-header.tsxindex 62d4ae69..5dcee722 100644--- a/components/documents/document-header.tsx+++ b/components/documents/document-header.tsx@@ -967,12 +967,13 @@ export default function DocumentHeader({/>) : null}- <ExportVisitsModal- document={prismaDocument}- teamId={teamId}- isVisible={exportModalOpen}- onClose={() => setExportModalOpen(false)}- />+ {exportModalOpen && (+ <ExportVisitsModal+ document={prismaDocument}+ teamId={teamId}+ onClose={() => setExportModalOpen(false)}+ />+ )}</header>);}diff --git a/components/documents/export-visits-modal.tsx b/components/documents/export-visits-modal.tsxindex 2900fd2a..665f216c 100644--- a/components/documents/export-visits-modal.tsx+++ b/components/documents/export-visits-modal.tsx@@ -1,4 +1,4 @@-import { useEffect, useRef, useState } from "react";+import { useCallback, useEffect, useRef, useState } from "react";import { Document } from "@prisma/client";import { useSession } from "next-auth/react";@@ -14,14 +14,14 @@ interface ExportStatus {interface ExportVisitsModalProps {document: Document;teamId: string;- isVisible: boolean;+ // Remove isVisible - if component is rendered, it should startonClose: () => void;}export function ExportVisitsModal({document,teamId,- isVisible,+ // Remove isVisible parameteronClose,}: ExportVisitsModalProps) {const { data: session } = useSession();@@ -39,14 +39,7 @@ export function ExportVisitsModal({};}, []);- // Start export when component becomes visible- useEffect(() => {- if (isVisible) {- startExport();- }- }, [isVisible]);-- const startExport = async () => {+ const startExport = useCallback(async () => {try {// Show modal immediatelysetShowModal(true);@@ -168,7 +161,12 @@ export function ExportVisitsModal({);onClose();}- };+ }, [document.id, teamId, onClose]);++ // Start export immediately when component mounts+ useEffect(() => {+ startExport();+ }, [startExport]);// Send export via emailconst sendExportEmail = async () => {@@ -204,11 +202,6 @@ export function ExportVisitsModal({};// Don't render anything if not visible and no modal to show- if (!isVisible && !showModal) {- return null;- }-- // Only show modal if it should be visibleif (!showModal) {return null;}diff --git a/components/visitors/dataroom-visitors-table.tsx b/components/visitors/dataroom-visitors-table.tsxindex 411f6d1d..4b1fbca3 100644--- a/components/visitors/dataroom-visitors-table.tsx+++ b/components/visitors/dataroom-visitors-table.tsx@@ -272,14 +272,13 @@ export default function DataroomVisitorsTable({</Table></div>- {dataroom && teamId && (+ {dataroom && teamId && exportModalOpen && (<ExportVisitsModaldataroomId={dataroomId}dataroomName={dataroom.name}teamId={teamId}groupId={groupId}groupName={name}- isVisible={exportModalOpen}onClose={() => setExportModalOpen(false)}/>)}