From 4485d1673d41f8f66090e87ad17df12e9e81e89c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20P=C3=B6ttker?= <bjoern@poettker-holtrup.de>
Date: Sun, 10 May 2026 06:52:26 +0200
Subject: [PATCH] refactor: simplify MailImportWizard success view and adjust
 InboxDetailPage dropdown styling

---
 .../src/components/MailImportWizard.tsx       | 68 +++++++++----------
 .../src/pages/InboxDetailPage.tsx             |  2 +-
 2 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/paperless-frontend/src/components/MailImportWizard.tsx b/paperless-frontend/src/components/MailImportWizard.tsx
index 55921d1..d44dac8 100644
--- a/paperless-frontend/src/components/MailImportWizard.tsx
+++ b/paperless-frontend/src/components/MailImportWizard.tsx
@@ -1,7 +1,7 @@
 import { useState, useEffect } from 'react';
 import {
   Modal, Steps, Button, Table, Radio, Select, Input, DatePicker,
-  Space, Row, Col, Typography, message, Spin, Result, Alert, Tag
+  Space, Row, Col, Typography, message, Spin, Alert, Tag
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import { emailImportApi, type AttachmentImportData } from '../api/email-import';
@@ -637,49 +637,25 @@ export default function MailImportWizard({ visible, onClose, email, attachments
   };
 
   // --- Step 3: Abschluss Render ---
-  const renderStep3 = () => {
-    if (importSuccess) {
-      return (
-        <Result
-          status="success"
-          title="Import Erfolgreich!"
-          subTitle="Die Dokumente wurden erfolgreich nach Paperless importiert und die Belegnummern verbucht."
-          extra={[
-            <Button type="primary" key="close" onClick={onClose}>
-              Schließen
-            </Button>,
-            ...importData.filter(i => i.type !== 'IGNORE').map(item => (
-               <Button key={`print-${item.virtualId}`} icon={<PrinterOutlined />} onClick={() => printDocument(item.virtualId, item.attachmentId)}>
-                 Drucken: {item.fileName}
-               </Button>
-            ))
-          ]}
-        />
-      );
-    }
-    
-    // Summary view before import
+  const renderDocumentList = (showPrint: boolean) => {
     const mainDocs = importData.filter(i => i.type === 'MAIN');
     const attachmentsToImport = importData.filter(i => i.type === 'ATTACHMENT');
-
     return (
-      <div>
+      <>
         {mainDocs.length === 0 && (
           <Alert type="warning" message="Keine Hauptdokumente zum Importieren ausgewählt." style={{ marginBottom: 16 }} />
         )}
-
         {mainDocs.map(main => {
           const mainAttachments = attachmentsToImport.filter(a => a.parentVirtualId === main.virtualId);
           const num = belegnummern[main.virtualId] || '000000';
           const yr = barcodes[main.virtualId]?.jahr || dayjs(email.Date).format('YYYY');
           const datum = eingangsdaten[main.virtualId];
           const belegnr = `${yr}-${String(num).padStart(6, '0')}`;
-
           return (
             <div key={main.virtualId} style={{ marginBottom: 24, padding: 16, border: '1px solid #f0f0f0', borderRadius: 8 }}>
               <Text strong style={{ fontSize: 16, marginBottom: 12, display: 'block' }}>{main.fileName}</Text>
               <Row gutter={24} align="middle">
-                <Col span={20}>
+                <Col span={showPrint ? 20 : 24}>
                   <Space size={24}>
                     <Text type="secondary">
                       Eingangsdatum: <Text strong>{datum?.format('DD.MM.YYYY') ?? '—'}</Text>
@@ -701,16 +677,17 @@ export default function MailImportWizard({ visible, onClose, email, attachments
                     </div>
                   )}
                 </Col>
-                <Col span={4} style={{ textAlign: 'right' }}>
-                  <Button icon={<PrinterOutlined />} onClick={() => printDocument(main.virtualId, main.attachmentId)}>
-                    Drucken
-                  </Button>
-                </Col>
+                {showPrint && (
+                  <Col span={4} style={{ textAlign: 'right' }}>
+                    <Button icon={<PrinterOutlined />} onClick={() => printDocument(main.virtualId, main.attachmentId)}>
+                      Drucken
+                    </Button>
+                  </Col>
+                )}
               </Row>
             </div>
           );
         })}
-
         {attachmentsToImport.filter(a => !mainDocs.find(m => m.virtualId === a.parentVirtualId)).map(orphan => (
           <div key={orphan.virtualId} style={{ marginBottom: 12 }}>
             <Alert
@@ -720,10 +697,27 @@ export default function MailImportWizard({ visible, onClose, email, attachments
             />
           </div>
         ))}
-      </div>
+      </>
     );
   };
 
+  const renderStep3 = () => {
+    if (importSuccess) {
+      return (
+        <div>
+          <Alert
+            type="success"
+            message="Import erfolgreich!"
+            description="Die Dokumente wurden nach Paperless importiert und die Belegnummern verbucht."
+            style={{ marginBottom: 24 }}
+          />
+          {renderDocumentList(true)}
+        </div>
+      );
+    }
+    return renderDocumentList(false);
+  };
+
   return (
     <Modal
       title="Paperless Import-Wizard"
@@ -731,7 +725,9 @@ export default function MailImportWizard({ visible, onClose, email, attachments
       onCancel={onClose}
       width={1000}
       footer={
-        importSuccess ? null : (
+        importSuccess ? (
+          <Button type="primary" onClick={onClose}>Schließen</Button>
+        ) : (
           <Space>
             {currentStep > 0 && <Button onClick={handleBack}>Zurück</Button>}
             {currentStep < 2 && <Button type="primary" onClick={nextStep} loading={loading}>Weiter</Button>}
diff --git a/paperless-frontend/src/pages/InboxDetailPage.tsx b/paperless-frontend/src/pages/InboxDetailPage.tsx
index e6be406..48ef39c 100644
--- a/paperless-frontend/src/pages/InboxDetailPage.tsx
+++ b/paperless-frontend/src/pages/InboxDetailPage.tsx
@@ -1119,7 +1119,7 @@ export default function InboxDetailPage() {
           <SourceTag source={file.source} />
         </Space>
         <Dropdown.Button
-          style={{ marginLeft: 'auto' }}
+          style={{ marginLeft: 'auto', width: 'auto' }}
           type="primary"
           icon={<DownOutlined />}
           onClick={() => { if (canProcess) setWizardOpen(true); }}