Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Always show filter dropdown with link to recently deleted items, even when vault is empty (#1587)

Leendert de Borstc1a802f6ff91
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
index 06b27ba64..d25cec83b 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
@@ -533,35 +533,28 @@ const ItemsList: React.FC = () => {
<div>
<div className="flex justify-between items-center gap-2 mb-4">
<div className="relative min-w-0 flex-1 flex items-center gap-2">
- {/* When all items are in folders at root level, show simple title without dropdown */}
- {hasItemsInFoldersOnly && !currentFolderId ? (
- <h2 className="text-gray-900 dark:text-white text-xl min-w-0">
- <span className="truncate">{t('items.title')}</span>
+ <button
+ onClick={() => setShowFilterMenu(!showFilterMenu)}
+ className="flex items-center gap-1 text-gray-900 dark:text-white text-xl hover:text-gray-700 dark:hover:text-gray-300 focus:outline-none min-w-0"
+ >
+ <h2 className="flex items-baseline gap-1.5 min-w-0 overflow-hidden">
+ <span className="truncate">{getFilterTitle()}</span>
+ <span className="text-sm text-gray-500 dark:text-gray-400 shrink-0">
+ ({filteredItems.length})
+ </span>
</h2>
- ) : (
- <button
- onClick={() => setShowFilterMenu(!showFilterMenu)}
- className="flex items-center gap-1 text-gray-900 dark:text-white text-xl hover:text-gray-700 dark:hover:text-gray-300 focus:outline-none min-w-0"
+ <svg
+ className="w-4 h-4 mt-1 shrink-0"
+ viewBox="0 0 24 24"
+ fill="none"
+ stroke="currentColor"
+ strokeWidth="2"
+ strokeLinecap="round"
+ strokeLinejoin="round"
>
- <h2 className="flex items-baseline gap-1.5 min-w-0 overflow-hidden">
- <span className="truncate">{getFilterTitle()}</span>
- <span className="text-sm text-gray-500 dark:text-gray-400 shrink-0">
- ({filteredItems.length})
- </span>
- </h2>
- <svg
- className="w-4 h-4 mt-1 shrink-0"
- viewBox="0 0 24 24"
- fill="none"
- stroke="currentColor"
- strokeWidth="2"
- strokeLinecap="round"
- strokeLinejoin="round"
- >
- <polyline points="6 9 12 15 18 9" />
- </svg>
- </button>
- )}
+ <polyline points="6 9 12 15 18 9" />
+ </svg>
+ </button>
{/* Edit and Delete buttons when inside a folder */}
{currentFolderId && (
<div className="flex items-center gap-1 shrink-0">
@@ -586,7 +579,7 @@ const ItemsList: React.FC = () => {
</button>
</div>
)}
- {showFilterMenu && !(hasItemsInFoldersOnly && !currentFolderId) && (
+ {showFilterMenu && (
<>
<div
className="fixed inset-0 z-10"
diff --git a/apps/mobile-app/app/(tabs)/items/index.tsx b/apps/mobile-app/app/(tabs)/items/index.tsx
index 410190854..ee2d7af84 100644
--- a/apps/mobile-app/app/(tabs)/items/index.tsx
+++ b/apps/mobile-app/app/(tabs)/items/index.tsx
@@ -415,17 +415,6 @@ export default function ItemsScreen(): React.ReactNode {
*/
headerTitle: (): React.ReactNode => {
if (Platform.OS === 'android') {
- // When all items are in folders, show simple title without dropdown
- if (hasItemsInFoldersOnly) {
- return (
- <AndroidHeader
- title={t('items.title')}
- subtitle=""
- onTitlePress={undefined}
- isDropdownOpen={false}
- />
- );
- }
return (
<AndroidHeader
title={getFilterTitle()}
@@ -454,7 +443,7 @@ export default function ItemsScreen(): React.ReactNode {
return null;
},
});
- }, [navigation, t, getFilterTitle, filteredItems.length, showFilterMenu, hasItemsInFoldersOnly, colors.text]);
+ }, [navigation, t, getFilterTitle, filteredItems.length, showFilterMenu, colors.text]);
/**
* Delete an item (move to trash).
@@ -750,7 +739,7 @@ export default function ItemsScreen(): React.ReactNode {
* Render the filter menu as an absolute overlay.
*/
const renderFilterOverlay = (): React.ReactNode => {
- if (!showFilterMenu || hasItemsInFoldersOnly) {
+ if (!showFilterMenu) {
return null;
}
@@ -889,34 +878,23 @@ export default function ItemsScreen(): React.ReactNode {
{/* Large header with logo (iOS only) */}
{Platform.OS === 'ios' && (
<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>
- )}
+ <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.sortButton}
diff --git a/apps/server/AliasVault.Client/Main/Pages/Items/Home.razor b/apps/server/AliasVault.Client/Main/Pages/Items/Home.razor
index 612607720..0552bf901 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Items/Home.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Items/Home.razor
@@ -19,24 +19,15 @@
Description="@Localizer["PageDescription"]">
<TitleActions>
<div class="relative flex items-center gap-2">
- @if (IsInFolder || HasRootItems)
- {
- <button @onclick="ToggleFilterDropdown" id="filterButton" class="flex items-center gap-2 text-gray-900 dark:text-white hover:text-gray-700 dark:hover:text-gray-300 focus:outline-none">
- <h1 class="flex items-baseline gap-1.5 text-xl font-semibold tracking-tight text-gray-900 dark:text-white sm:text-2xl">
- <span>@GetFilterTitle()</span>
- <span class="text-base text-gray-500 dark:text-gray-400">(@TotalFilteredItems)</span>
- </h1>
- <svg class="w-5 h-5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
- <polyline points="6 9 12 15 18 9" />
- </svg>
- </button>
- }
- else
- {
- <h1 class="text-xl font-semibold tracking-tight text-gray-900 dark:text-white sm:text-2xl">
- @GetFilterTitle()
+ <button @onclick="ToggleFilterDropdown" id="filterButton" class="flex items-center gap-2 text-gray-900 dark:text-white hover:text-gray-700 dark:hover:text-gray-300 focus:outline-none">
+ <h1 class="flex items-baseline gap-1.5 text-xl font-semibold tracking-tight text-gray-900 dark:text-white sm:text-2xl">
+ <span>@GetFilterTitle()</span>
+ <span class="text-base text-gray-500 dark:text-gray-400">(@TotalFilteredItems)</span>
</h1>
- }
+ <svg class="w-5 h-5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+ <polyline points="6 9 12 15 18 9" />
+ </svg>
+ </button>
@if (IsInFolder)
{
<button @onclick="ShowEditFolderModal" title="@Localizer["EditFolder"]" class="p-1.5 text-gray-400 hover:text-orange-500 dark:text-gray-500 dark:hover:text-orange-400 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors">