mirror of
https://github.com/rustmailer/bichon.git
synced 2026-08-30 01:44:23 +00:00
fix(web): restore duplicates display in import progress
Reapplies what c067655 reverted: the duplicates counter next to
success/failed and duplicates included in the processed count and
percentage. The server now reports real duplicate counts on every
upload-import path, so the display no longer renders dead zeros.
This commit is contained in:
@@ -9,7 +9,7 @@ import { useMutation, useQuery } from '@tanstack/react-query';
|
||||
import {
|
||||
Upload, FileText, X, CheckCircle2, AlertTriangle,
|
||||
Sparkles, PenLine, ListTree, ChevronsUpDown, Check,
|
||||
Clock, ChevronRight,
|
||||
Clock, ChevronRight, Copy,
|
||||
} from 'lucide-react';
|
||||
|
||||
import { Button } from '@/components/ui/button';
|
||||
@@ -659,16 +659,16 @@ export default function ImportPage() {
|
||||
<div className="space-y-1.5">
|
||||
<div className="flex justify-between text-xs text-muted-foreground">
|
||||
<span>
|
||||
{t('import.processed', { current: progress.success + progress.failed, total: progress.total })}
|
||||
{t('import.processed', { current: progress.success + progress.failed + progress.duplicates, total: progress.total })}
|
||||
</span>
|
||||
<span>
|
||||
{progress.total > 0
|
||||
? Math.round(((progress.success + progress.failed) / progress.total) * 100)
|
||||
? Math.round(((progress.success + progress.failed + progress.duplicates) / progress.total) * 100)
|
||||
: 0}%
|
||||
</span>
|
||||
</div>
|
||||
<Progress
|
||||
value={progress.total > 0 ? ((progress.success + progress.failed) / progress.total) * 100 : 0}
|
||||
value={progress.total > 0 ? ((progress.success + progress.failed + progress.duplicates) / progress.total) * 100 : 0}
|
||||
className="h-2"
|
||||
/>
|
||||
</div>
|
||||
@@ -684,6 +684,12 @@ export default function ImportPage() {
|
||||
<AlertTriangle className="h-3.5 w-3.5 text-amber-600" />
|
||||
{t('import.failedCount', { count: progress.failed })}
|
||||
</span>
|
||||
{progress.duplicates > 0 && (
|
||||
<span className="flex items-center gap-1">
|
||||
<Copy className="h-3.5 w-3.5 text-muted-foreground" />
|
||||
{t('import.duplicateCount', { count: progress.duplicates })}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
|
||||
@@ -739,6 +739,7 @@
|
||||
"detectedFolder": "Detected",
|
||||
"detectedFrom": "Detected from",
|
||||
"dropHere": "Drop .eml / .mbox / .pst files here",
|
||||
"duplicateCount": "{{count}} duplicates skipped",
|
||||
"failed": "Import failed",
|
||||
"failedCount": "{{count}} failed",
|
||||
"failedDetails": "Failed items",
|
||||
|
||||
Reference in New Issue
Block a user