fix: mail filter as dropdown like contacts (sort + saved filters), remove inline custom components

This commit is contained in:
Agent Zero
2026-07-30 13:03:11 +02:00
parent a9a9476e9f
commit c30a48cf63
+33 -30
View File
@@ -18,10 +18,9 @@ import { MailDetail } from '@/components/mail/MailDetail';
import { MailComposeForm, type ComposeMode } from '@/components/mail/MailComposeForm'; import { MailComposeForm, type ComposeMode } from '@/components/mail/MailComposeForm';
import { useWindowStore } from '@/store/windowStore'; import { useWindowStore } from '@/store/windowStore';
import { usePluginToolbarStore } from '@/store/pluginToolbarStore'; import { usePluginToolbarStore } from '@/store/pluginToolbarStore';
import { ArrowRight, Check, ChevronLeft, ExternalLink, Loader2, Plus, Redo2, Trash2, TrendingUp, Undo2 } from 'lucide-react'; import { ArrowRight, ArrowUpDown, Bookmark, Check, ChevronLeft, ExternalLink, Loader2, Plus, Redo2, Trash2, TrendingUp, Undo2 } from 'lucide-react';
import { SavedFilterBar } from '@/components/common/SavedFilterBar';
import { TagSelector } from '@/components/tags/TagSelector';
import type { Tag } from '@/api/tags'; import type { Tag } from '@/api/tags';
import { useSavedFilters } from '@/api/savedFilters';
import { import {
fetchAccounts, fetchAccounts,
fetchFolders, fetchFolders,
@@ -87,6 +86,7 @@ export function MailPage() {
const [sortOrder, setSortOrder] = useState<'asc' | 'desc'>('desc'); const [sortOrder, setSortOrder] = useState<'asc' | 'desc'>('desc');
const [isSyncing, setIsSyncing] = useState(false); const [isSyncing, setIsSyncing] = useState(false);
const [selectedTags, setSelectedTags] = useState<Tag[]>([]); const [selectedTags, setSelectedTags] = useState<Tag[]>([]);
const { data: savedFilters } = useSavedFilters('mail');
// Ref to track the current folder ID for async callbacks (prevents race conditions) // Ref to track the current folder ID for async callbacks (prevents race conditions)
const selectedFolderIdRef = useRef<string | null>(null); const selectedFolderIdRef = useRef<string | null>(null);
@@ -594,41 +594,44 @@ export function MailPage() {
onSearch: handleSearch, onSearch: handleSearch,
onClick: () => {}, onClick: () => {},
}, },
// FilterPanel — SavedFilterBar + TagSelector // Filter dropdown — sort + saved filters (like Contacts)
{ {
id: 'filter-panel', id: 'filter-sort',
plugin: 'mail', plugin: 'mail',
label: 'Filter', label: 'Sortieren',
type: 'custom' as const, type: 'dropdown' as const,
group: 'filter', group: 'filter',
customComponent: ( icon: <ArrowUpDown className="w-3.5 h-3.5" strokeWidth={2} />,
<SavedFilterBar menuWidth: '200px',
entityType="mail" menuOptions: [
currentFilters={{ search: searchQuery, sortBy, sortOrder, folderId: selectedFolderId }} { value: 'date-desc', label: 'Datum ↓ (neueste zuerst)', active: sortBy === 'date' && sortOrder === 'desc', onClick: () => { setSortBy('date'); setSortOrder('desc'); } },
onApplyFilter={(criteria) => { { value: 'date-asc', label: 'Datum ↑ (älteste zuerst)', active: sortBy === 'date' && sortOrder === 'asc', onClick: () => { setSortBy('date'); setSortOrder('asc'); } },
if (criteria.search !== undefined) handleSearch(criteria.search); { value: 'from-asc', label: 'Absender A-Z', active: sortBy === 'from' && sortOrder === 'asc', onClick: () => { setSortBy('from'); setSortOrder('asc'); } },
if (criteria.sortBy) setSortBy(criteria.sortBy as 'date' | 'from' | 'subject'); { value: 'from-desc', label: 'Absender Z-A', active: sortBy === 'from' && sortOrder === 'desc', onClick: () => { setSortBy('from'); setSortOrder('desc'); } },
if (criteria.sortOrder) setSortOrder(criteria.sortOrder as 'asc' | 'desc'); { value: 'subject-asc', label: 'Betreff A-Z', active: sortBy === 'subject' && sortOrder === 'asc', onClick: () => { setSortBy('subject'); setSortOrder('asc'); } },
}} { value: 'subject-desc', label: 'Betreff Z-A', active: sortBy === 'subject' && sortOrder === 'desc', onClick: () => { setSortBy('subject'); setSortOrder('desc'); } },
/> ],
),
onClick: () => {}, onClick: () => {},
}, },
{ {
id: 'tag-filter', id: 'filter-saved',
plugin: 'mail', plugin: 'mail',
label: 'Tags', label: 'Gespeicherte Filter',
type: 'custom' as const, type: 'dropdown' as const,
group: 'filter', group: 'filter',
customComponent: ( icon: <Bookmark className="w-3.5 h-3.5" strokeWidth={2} />,
<TagSelector menuWidth: '220px',
entityType="file" menuOptions: (savedFilters || []).length > 0
entityId={selectedMail?.id ?? ''} ? savedFilters.map((f: any) => ({
selectedTags={selectedTags} value: f.id,
onChange={setSelectedTags} label: f.name,
placeholder={t('tags.selectPlaceholder', 'Tags filtern...')} onClick: () => {
/> if (f.filter_criteria?.search !== undefined) handleSearch(f.filter_criteria.search);
), if (f.filter_criteria?.sortBy) setSortBy(f.filter_criteria.sortBy);
if (f.filter_criteria?.sortOrder) setSortOrder(f.filter_criteria.sortOrder);
},
}))
: [{ value: 'none', label: 'Keine gespeicherten Filter', disabled: true, onClick: () => {} }],
onClick: () => {}, onClick: () => {},
}, },
{ {