From 2790a4e46edd779caa2e83e77643362b8c806d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= Date: Mon, 5 Jan 2026 10:41:36 +0100 Subject: [PATCH] Put back default email using current user context in bulk document exports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Émile Ré --- .../components/documents/BulkExportDialog.tsx | 4 ++-- .../organizations/documents/DocumentsPage.tsx | 22 ++++--------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/apps/console/src/components/documents/BulkExportDialog.tsx b/apps/console/src/components/documents/BulkExportDialog.tsx index 54495558d..061a92bec 100644 --- a/apps/console/src/components/documents/BulkExportDialog.tsx +++ b/apps/console/src/components/documents/BulkExportDialog.tsx @@ -37,7 +37,7 @@ type Props = { children: ReactNode; onExport: (options: BulkExportFormData) => void; isLoading?: boolean; - defaultEmail?: string; + defaultEmail: string; selectedCount: number; }; @@ -47,7 +47,7 @@ export type BulkExportDialogRef = { }; export const BulkExportDialog = forwardRef( - ({ children, onExport, isLoading = false, defaultEmail = "", selectedCount }, ref) => { + ({ children, onExport, isLoading = false, defaultEmail, selectedCount }, ref) => { const { __ } = useTranslate(); const dialogRef = useDialogRef(); diff --git a/apps/console/src/pages/organizations/documents/DocumentsPage.tsx b/apps/console/src/pages/organizations/documents/DocumentsPage.tsx index 2d6c59c8b..bca617beb 100644 --- a/apps/console/src/pages/organizations/documents/DocumentsPage.tsx +++ b/apps/console/src/pages/organizations/documents/DocumentsPage.tsx @@ -28,7 +28,7 @@ import { usePreloadedQuery, type PreloadedQuery, } from "react-relay"; -import { useRef } from "react"; +import { use, useRef } from "react"; import { graphql } from "relay-runtime"; import type { DocumentGraphListQuery } from "/__generated__/core/DocumentGraphListQuery.graphql"; import { @@ -55,6 +55,7 @@ import { BulkExportDialog, type BulkExportDialogRef, } from "/components/documents/BulkExportDialog"; +import { CurrentUser } from "/providers/CurrentUser.tsx"; const documentsFragment = graphql` fragment DocumentsPageListFragment on Organization @@ -99,16 +100,6 @@ type Props = { queryRef: PreloadedQuery; }; -// const UserEmailQuery = graphql` -// query DocumentsPageUserEmailQuery { -// viewer { -// user { -// email -// } -// } -// } -// `; - export default function DocumentsPage(props: Props) { const { __ } = useTranslate(); @@ -117,12 +108,7 @@ export default function DocumentsPage(props: Props) { props.queryRef, ).organization; - // FIXME - // const userEmailData = useLazyLoadQuery( - // UserEmailQuery, - // {} - // ); - // const defaultEmail = userEmailData.viewer.user.email; + const { email: defaultEmail } = use(CurrentUser) const pagination = usePaginationFragment( documentsFragment, organization as DocumentsPageListFragment$key, @@ -303,7 +289,7 @@ export default function DocumentsPage(props: Props) { ref={bulkExportDialogRef} onExport={handleBulkExport} isLoading={isBulkExporting} - // defaultEmail={defaultEmail} + defaultEmail={defaultEmail} selectedCount={selection.length} >