Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Add item sorting options to browser extension and mobile app (#1102)
Leendert de Borst76a7939c2afd
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsxindex 81aaf8dfc..06b27ba64 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx@@ -19,6 +19,7 @@ import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';import { useVaultSync } from '@/entrypoints/popup/hooks/useVaultSync';import { PopoutUtility } from '@/entrypoints/popup/utils/PopoutUtility';+import type { CredentialSortOrder } from '@/utils/db/repositories/SettingsRepository';import type { Item, ItemType } from '@/utils/dist/core/models/vault';import { ItemTypes } from '@/utils/dist/core/models/vault';@@ -36,6 +37,15 @@ type FilterType = 'all' | 'passkeys' | 'attachments' | ItemType;const FILTER_STORAGE_KEY = 'items-filter';const FILTER_EXPIRY_MS = 5 * 60 * 1000; // 5 minutes+/**+ * Sort order options with their translation keys+ */+const SORT_OPTIONS: { value: CredentialSortOrder; labelKey: string }[] = [+ { value: 'OldestFirst', labelKey: 'items.sort.oldestFirst' },+ { value: 'NewestFirst', labelKey: 'items.sort.newestFirst' },+ { value: 'Alphabetical', labelKey: 'items.sort.alphabetical' },+];+/*** Get stored filter from localStorage if not expired*/@@ -113,6 +123,8 @@ const ItemsList: React.FC = () => {const [showEditFolderModal, setShowEditFolderModal] = useState(false);const [recentlyDeletedCount, setRecentlyDeletedCount] = useState(0);const [folderRefreshKey, setFolderRefreshKey] = useState(0);+ const [sortOrder, setSortOrder] = useState<CredentialSortOrder>('OldestFirst');+ const [showSortMenu, setShowSortMenu] = useState(false);const { setIsInitialLoading } = useLoading();// Derive current folder from URL params@@ -342,6 +354,9 @@ const ItemsList: React.FC = () => {// Also get recently deleted countconst deletedCount = dbContext.sqliteClient?.items.getRecentlyDeletedCount() ?? 0;setRecentlyDeletedCount(deletedCount);+ // Load sort order from settings+ const savedSortOrder = dbContext.sqliteClient?.settings.getCredentialsSortOrder() ?? 'OldestFirst';+ setSortOrder(savedSortOrder);setIsLoading(false);setIsInitialLoading(false);}@@ -476,6 +491,28 @@ const ItemsList: React.FC = () => {return false;});+ /**+ * Sort the filtered items based on the current sort order.+ */+ const sortedItems = useMemo(() => {+ const itemsCopy = [...filteredItems];+ switch (sortOrder) {+ case 'NewestFirst':+ return itemsCopy.sort((a, b) =>+ new Date(b.CreatedAt || 0).getTime() - new Date(a.CreatedAt || 0).getTime()+ );+ case 'Alphabetical':+ return itemsCopy.sort((a, b) =>+ (a.Name || '').localeCompare(b.Name || '')+ );+ case 'OldestFirst':+ default:+ return itemsCopy.sort((a, b) =>+ new Date(a.CreatedAt || 0).getTime() - new Date(b.CreatedAt || 0).getTime()+ );+ }+ }, [filteredItems, sortOrder]);+const folders = getFoldersWithCounts();/**@@ -553,9 +590,11 @@ const ItemsList: React.FC = () => {<><divclassName="fixed inset-0 z-10"- onClick={() => setShowFilterMenu(false)}+ onClick={() => {+ setShowFilterMenu(false);+ }}/>- <div className="absolute left-0 top-full mt-1 w-56 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg shadow-lg z-20">+ <div className="absolute left-0 top-full mt-1 w-56 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg shadow-xl ring-1 ring-black/5 dark:ring-white/10 z-20"><div className="py-1">{/* All items filter */}<button@@ -642,7 +681,62 @@ const ItemsList: React.FC = () => {</>)}</div>- <ReloadButton onClick={syncVaultAndRefresh} />+ <div className="flex items-center gap-1">+ {/* Sort button */}+ <div className="relative">+ <button+ onClick={() => setShowSortMenu(!showSortMenu)}+ className="p-1.5 text-gray-400 hover:text-gray-600 dark:text-gray-500 dark:hover:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors"+ title={t('items.sort.title')}+ >+ <svg className="w-5 h-5" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">+ <line x1="4" y1="6" x2="16" y2="6" />+ <line x1="4" y1="12" x2="12" y2="12" />+ <line x1="4" y1="18" x2="8" y2="18" />+ <polyline points="15 15 18 18 21 15" />+ <line x1="18" y1="12" x2="18" y2="18" />+ </svg>+ </button>+ {showSortMenu && (+ <>+ <div+ className="fixed inset-0 z-10"+ onClick={() => setShowSortMenu(false)}+ />+ <div className="absolute right-0 top-full mt-1 w-48 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg shadow-xl ring-1 ring-black/5 dark:ring-white/10 z-20">+ <div className="py-1">+ {SORT_OPTIONS.map((option) => (+ <button+ key={option.value}+ onClick={async () => {+ setSortOrder(option.value);+ setShowSortMenu(false);+ // Save to settings and trigger vault sync+ await executeVaultMutationAsync(async () => {+ dbContext.sqliteClient?.settings.setCredentialsSortOrder(option.value);+ });+ }}+ className={`w-full text-left px-4 py-2 text-sm hover:bg-gray-100 dark:hover:bg-gray-700 flex items-center gap-2 ${+ sortOrder === option.value ? 'text-orange-600 dark:text-orange-400' : 'text-gray-700 dark:text-gray-300'+ }`}+ >+ {sortOrder === option.value ? (+ <svg className="w-4 h-4" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">+ <polyline points="20 6 9 17 4 12" />+ </svg>+ ) : (+ <span className="w-4" />+ )}+ <span>{t(option.labelKey)}</span>+ </button>+ ))}+ </div>+ </div>+ </>+ )}+ </div>+ <ReloadButton onClick={syncVaultAndRefresh} />+ </div></div>{items.length > 0 ? (@@ -801,9 +895,9 @@ const ItemsList: React.FC = () => {)}{/* Items */}- {filteredItems.length > 0 && (+ {sortedItems.length > 0 && (<ul id="items-list" className="space-y-2">- {filteredItems.map(item => (+ {sortedItems.map(item => (<ItemCardkey={item.Id}item={item}diff --git a/apps/browser-extension/src/i18n/locales/en.json b/apps/browser-extension/src/i18n/locales/en.jsonindex 97d3344b4..41364208b 100644--- a/apps/browser-extension/src/i18n/locales/en.json+++ b/apps/browser-extension/src/i18n/locales/en.json@@ -205,6 +205,12 @@"all": "(All) Items","passkeys": "Passkeys"},+ "sort": {+ "title": "Sort by",+ "oldestFirst": "Oldest first",+ "newestFirst": "Newest first",+ "alphabetical": "Alphabetical (A-Z)"+ },"deleteItemTitle": "Delete Item","deleteItemConfirm": "Are you sure you want to delete this item?","viewHistory": "View history",diff --git a/apps/browser-extension/src/utils/db/repositories/SettingsRepository.ts b/apps/browser-extension/src/utils/db/repositories/SettingsRepository.tsindex b14cd0e86..5c3ab799a 100644--- a/apps/browser-extension/src/utils/db/repositories/SettingsRepository.ts+++ b/apps/browser-extension/src/utils/db/repositories/SettingsRepository.ts@@ -2,6 +2,12 @@ import type { EncryptionKey, PasswordSettings, TotpCode, Attachment } from '@/utimport { BaseRepository } from '../BaseRepository';+/**+ * Sort order options for credentials list.+ * Values must match the C# CredentialSortOrder enum in the Blazor client for cross-platform sync.+ */+export type CredentialSortOrder = 'OldestFirst' | 'NewestFirst' | 'Alphabetical';+/*** SQL query constants for Settings and related operations.*/@@ -189,4 +195,55 @@ export class SettingsRepository extends BaseRepository {// Fall back to browser language (first two characters)return navigator.language.substring(0, 2);}++ /**+ * Get the credentials sort order preference.+ * Uses the same key the other clients use for cross-platform sync.+ * @returns The sort order preference+ */+ public getCredentialsSortOrder(): CredentialSortOrder {+ const value = this.getSetting('CredentialsSortOrder', 'OldestFirst');+ // Validate the value is a valid sort order+ if (value === 'OldestFirst' || value === 'NewestFirst' || value === 'Alphabetical') {+ return value;+ }+ return 'OldestFirst';+ }++ /**+ * Update or insert a setting.+ * @param key - The setting key+ * @param value - The setting value+ */+ public updateSetting(key: string, value: string): void {+ const now = this.now();++ // Check if setting exists+ const results = this.client.executeQuery<{ count: number }>(+ `SELECT COUNT(*) as count FROM Settings WHERE Key = ?`,+ [key]+ );+ const exists = results[0]?.count > 0;++ if (exists) {+ this.client.executeUpdate(+ `UPDATE Settings SET Value = ?, UpdatedAt = ? WHERE Key = ?`,+ [value, now, key]+ );+ } else {+ this.client.executeUpdate(+ `INSERT INTO Settings (Key, Value, CreatedAt, UpdatedAt, IsDeleted) VALUES (?, ?, ?, ?, ?)`,+ [key, value, now, now, 0]+ );+ }+ }++ /**+ * Set the credentials sort order preference.+ * Uses the same key the other clients use for cross-platform sync.+ * @param order - The sort order to set+ */+ public setCredentialsSortOrder(order: CredentialSortOrder): void {+ this.updateSetting('CredentialsSortOrder', order);+ }}diff --git a/apps/mobile-app/app/(tabs)/items/index.tsx b/apps/mobile-app/app/(tabs)/items/index.tsxindex 4a4faa39b..8c6936165 100644--- a/apps/mobile-app/app/(tabs)/items/index.tsx+++ b/apps/mobile-app/app/(tabs)/items/index.tsx@@ -9,6 +9,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';import Toast from 'react-native-toast-message';import type { Folder } from '@/utils/db/repositories/FolderRepository';+import type { CredentialSortOrder } from '@/utils/db/repositories/SettingsRepository';import type { Item, ItemType } from '@/utils/dist/core/models/vault';import { getFieldValue, FieldKey, ItemTypes } from '@/utils/dist/core/models/vault';import emitter from '@/utils/EventEmitter';@@ -65,6 +66,15 @@ const ITEM_TYPE_OPTIONS: ItemTypeOption[] = [{ type: ItemTypes.Note, titleKey: 'itemTypes.note.title', iconName: 'description' },];+/**+ * Sort order options with their translation keys.+ */+const SORT_OPTIONS: { value: CredentialSortOrder; labelKey: string }[] = [+ { value: 'OldestFirst', labelKey: 'items.sort.oldestFirst' },+ { value: 'NewestFirst', labelKey: 'items.sort.newestFirst' },+ { value: 'Alphabetical', labelKey: 'items.sort.alphabetical' },+];+/*** Items screen - main vault items list.*/@@ -90,6 +100,8 @@ export default function ItemsScreen(): React.ReactNode {const [searchQuery, setSearchQuery] = useState('');const [filterType, setFilterType] = useState<FilterType>('all');const [showFilterMenu, setShowFilterMenu] = useState(false);+ const [sortOrder, setSortOrder] = useState<CredentialSortOrder>('OldestFirst');+ const [showSortMenu, setShowSortMenu] = useState(false);// Recently deleted count stateconst [recentlyDeletedCount, setRecentlyDeletedCount] = useState(0);@@ -223,19 +235,43 @@ export default function ItemsScreen(): React.ReactNode {});}, [itemsList, searchQuery, filterType]);+ /**+ * Sort the filtered items based on the current sort order.+ */+ const sortedItems = useMemo(() => {+ const itemsCopy = [...filteredItems];+ switch (sortOrder) {+ case 'NewestFirst':+ return itemsCopy.sort((a, b) =>+ new Date(b.CreatedAt || 0).getTime() - new Date(a.CreatedAt || 0).getTime()+ );+ case 'Alphabetical':+ return itemsCopy.sort((a, b) =>+ (a.Name || '').localeCompare(b.Name || '')+ );+ case 'OldestFirst':+ default:+ return itemsCopy.sort((a, b) =>+ new Date(a.CreatedAt || 0).getTime() - new Date(b.CreatedAt || 0).getTime()+ );+ }+ }, [filteredItems, sortOrder]);+/*** Load items (credentials), folders, and recently deleted count.*/const loadItems = useCallback(async (): Promise<void> => {try {- const [items, loadedFolders, deletedCount] = await Promise.all([+ const [items, loadedFolders, deletedCount, savedSortOrder] = await Promise.all([dbContext.sqliteClient!.items.getAll(),dbContext.sqliteClient!.folders.getAll(),- dbContext.sqliteClient!.items.getRecentlyDeletedCount()+ dbContext.sqliteClient!.items.getRecentlyDeletedCount(),+ dbContext.sqliteClient!.settings.getCredentialsSortOrder()]);setItemsList(items);setFolders(loadedFolders);setRecentlyDeletedCount(deletedCount);+ setSortOrder(savedSortOrder);setIsLoadingItems(false);} catch (err) {console.error('Error loading items:', err);@@ -409,8 +445,24 @@ export default function ItemsScreen(): React.ReactNode {}return <Text>{t('items.title')}</Text>;},+ /**+ * Sort button in the header (Android only, iOS uses inline button).+ */+ headerRight: (): React.ReactNode => {+ if (Platform.OS === 'android') {+ return (+ <TouchableOpacity+ style={{ padding: 8, marginRight: 8 }}+ onPress={() => setShowSortMenu(prev => !prev)}+ >+ <MaterialIcons name="sort" size={24} color={colors.text} />+ </TouchableOpacity>+ );+ }+ return null;+ },});- }, [navigation, t, getFilterTitle, filteredItems.length, showFilterMenu, hasItemsInFoldersOnly]);+ }, [navigation, t, getFilterTitle, filteredItems.length, showFilterMenu, hasItemsInFoldersOnly, colors.text]);/*** Delete an item (move to trash).@@ -474,13 +526,23 @@ export default function ItemsScreen(): React.ReactNode {paddingHorizontal: 14,paddingTop: Platform.OS === 'ios' ? 42 : 8,},+ // Header row styles+ headerRow: {+ alignItems: 'center',+ flexDirection: 'row',+ justifyContent: 'space-between',+ marginBottom: 16,+ },// Filter button stylesfilterButton: {alignItems: 'center',flexDirection: 'row',- marginBottom: 16,+ flex: 1,gap: 8,},+ sortButton: {+ padding: 8,+ },filterButtonText: {color: colors.text,fontSize: 28,@@ -518,6 +580,32 @@ export default function ItemsScreen(): React.ReactNode {top: 0,zIndex: 1000,},+ // Sort menu styles+ sortMenuOverlay: {+ backgroundColor: colors.accentBackground,+ borderColor: colors.accentBorder,+ borderRadius: 8,+ borderWidth: 1,+ elevation: 8,+ overflow: 'hidden',+ position: 'absolute',+ right: 14,+ shadowColor: colors.black,+ shadowOffset: { width: 0, height: 2 },+ shadowOpacity: 0.25,+ shadowRadius: 4,+ top: Platform.OS === 'ios' ? insets.top + 112 : 8,+ width: 200,+ zIndex: 1001,+ },+ sortMenuBackdrop: {+ bottom: 0,+ left: 0,+ position: 'absolute',+ right: 0,+ top: 0,+ zIndex: 1000,+ },filterMenuItem: {paddingHorizontal: 16,paddingVertical: 12,@@ -834,34 +922,47 @@ export default function ItemsScreen(): React.ReactNode {<ThemedView>{/* Large header with logo (iOS only) */}{Platform.OS === 'ios' && (- hasItemsInFoldersOnly ? (- /* When all items are in folders, show simple title without dropdown */- <View style={styles.filterButton}>- <Logo width={40} height={40} />- <ThemedText style={styles.filterButtonText}>- {t('items.title')}- </ThemedText>- </View>- ) : (- /* Normal filter dropdown when there are items at root */+ <View style={styles.headerRow}>+ {hasItemsInFoldersOnly ? (+ /* When all items are in folders, show simple title without dropdown */+ <View style={styles.filterButton}>+ <Logo width={40} height={40} />+ <ThemedText style={styles.filterButtonText}>+ {t('items.title')}+ </ThemedText>+ </View>+ ) : (+ /* Normal filter dropdown when there are items at root */+ <TouchableOpacity+ style={styles.filterButton}+ onPress={() => setShowFilterMenu(!showFilterMenu)}+ >+ <Logo width={40} height={40} />+ <ThemedText style={styles.filterButtonText}>+ {getFilterTitle()}+ </ThemedText>+ <ThemedText style={styles.filterCount}>+ ({filteredItems.length})+ </ThemedText>+ <MaterialIcons+ name={showFilterMenu ? "keyboard-arrow-up" : "keyboard-arrow-down"}+ size={28}+ color={colors.text}+ />+ </TouchableOpacity>+ )}+ {/* Sort button */}<TouchableOpacity- style={styles.filterButton}- onPress={() => setShowFilterMenu(!showFilterMenu)}+ style={styles.sortButton}+ onPress={() => setShowSortMenu(!showSortMenu)}>- <Logo width={40} height={40} />- <ThemedText style={styles.filterButtonText}>- {getFilterTitle()}- </ThemedText>- <ThemedText style={styles.filterCount}>- ({filteredItems.length})- </ThemedText><MaterialIcons- name={showFilterMenu ? "keyboard-arrow-up" : "keyboard-arrow-down"}- size={28}- color={colors.text}+ name="sort"+ size={24}+ color={colors.textMuted}/></TouchableOpacity>- )+ </View>)}{/* Search input */}@@ -1042,7 +1143,7 @@ export default function ItemsScreen(): React.ReactNode {<Animated.FlatListref={flatListRef}testID="items-list"- data={isLoadingItems ? Array(4).fill(null) : filteredItems}+ data={isLoadingItems ? Array(4).fill(null) : sortedItems}keyExtractor={(itm, index) => itm?.Id ?? `skeleton-${index}`}keyboardShouldPersistTaps='handled'onScroll={Animated.event(@@ -1080,6 +1181,53 @@ export default function ItemsScreen(): React.ReactNode {{/* Filter menu overlay */}{renderFilterOverlay()}+ {/* Sort menu overlay */}+ {showSortMenu && (+ <>+ <TouchableOpacity+ style={styles.sortMenuBackdrop}+ activeOpacity={1}+ onPress={() => setShowSortMenu(false)}+ />+ <ThemedView style={styles.sortMenuOverlay}>+ {SORT_OPTIONS.map((option) => (+ <TouchableOpacity+ key={option.value}+ style={[+ styles.filterMenuItem,+ styles.filterMenuItemWithIcon+ ]}+ onPress={async () => {+ setSortOrder(option.value);+ setShowSortMenu(false);+ // Save to settings and trigger vault sync+ await executeVaultMutation(async () => {+ await dbContext.sqliteClient?.settings.setCredentialsSortOrder(option.value);+ });+ }}+ >+ {sortOrder === option.value ? (+ <MaterialIcons+ name="check"+ size={18}+ color={colors.primary}+ style={styles.filterMenuItemIcon}+ />+ ) : (+ <View style={styles.filterMenuItemIcon} />+ )}+ <ThemedText style={[+ styles.filterMenuItemText,+ sortOrder === option.value && styles.filterMenuItemTextActive+ ]}>+ {t(option.labelKey)}+ </ThemedText>+ </TouchableOpacity>+ ))}+ </ThemedView>+ </>+ )}+{/* Create folder modal */}<FolderModalisOpen={showFolderModal}diff --git a/apps/mobile-app/i18n/locales/en.json b/apps/mobile-app/i18n/locales/en.jsonindex 01ab6b54b..6062231e7 100644--- a/apps/mobile-app/i18n/locales/en.json+++ b/apps/mobile-app/i18n/locales/en.json@@ -440,6 +440,12 @@"passkeys": "Passkeys","attachments": "Attachments"},+ "sort": {+ "title": "Sort by",+ "oldestFirst": "Oldest first",+ "newestFirst": "Newest first",+ "alphabetical": "Alphabetical (A-Z)"+ },"totpCode": "TOTP Code","attachments": "Attachments","deleteAttachment": "Delete",diff --git a/apps/mobile-app/utils/db/repositories/SettingsRepository.ts b/apps/mobile-app/utils/db/repositories/SettingsRepository.tsindex b060b4cd7..5120bb57d 100644--- a/apps/mobile-app/utils/db/repositories/SettingsRepository.ts+++ b/apps/mobile-app/utils/db/repositories/SettingsRepository.ts@@ -2,6 +2,12 @@ import type { EncryptionKey, PasswordSettings, TotpCode, Attachment } from '@/utimport { BaseRepository } from '../BaseRepository';+/**+ * Sort order options for credentials list.+ * Values must match the C# CredentialSortOrder enum in the Blazor client for cross-platform sync.+ */+export type CredentialSortOrder = 'OldestFirst' | 'NewestFirst' | 'Alphabetical';+/*** SQL query constants for Settings and related operations.*/@@ -206,4 +212,27 @@ export class SettingsRepository extends BaseRepository {}});}++ /**+ * Get the credentials sort order preference.+ * Uses the same key the other clients use for cross-platform sync.+ * @returns The sort order preference+ */+ public async getCredentialsSortOrder(): Promise<CredentialSortOrder> {+ const value = await this.getSetting('CredentialsSortOrder', 'OldestFirst');+ // Validate the value is a valid sort order+ if (value === 'OldestFirst' || value === 'NewestFirst' || value === 'Alphabetical') {+ return value;+ }+ return 'OldestFirst';+ }++ /**+ * Set the credentials sort order preference.+ * Uses the same key the other clients use for cross-platform sync.+ * @param order - The sort order to set+ */+ public async setCredentialsSortOrder(order: CredentialSortOrder): Promise<void> {+ await this.updateSetting('CredentialsSortOrder', order);+ }}