Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Read trash retention days from core models (#2413)
Leendert de Borst69d55c783021
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsxindex 7c13c3ab1..f87e17902 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx@@ -1,5 +1,5 @@-import { TRASH_RETENTION_DAYS } from '@aliasvault/client/constants/Vault';import { scopedKey } from '@aliasvault/client/database/ItemRef';+import { TRASH_RETENTION_DEFAULT_DAYS } from '@aliasvault/models/vault';import React, { useState, useEffect, useCallback } from 'react';import { useTranslation } from 'react-i18next';import { useNavigate } from 'react-router-dom';@@ -21,10 +21,10 @@ import type { Item } from '@aliasvault/models/vault';/*** Calculate days remaining until permanent deletion.* @param deletedAt - ISO timestamp when item was deleted- * @param retentionDays - Number of days to retain (defaults to TRASH_RETENTION_DAYS)+ * @param retentionDays - Number of days to retain (defaults to TRASH_RETENTION_DEFAULT_DAYS)* @returns Number of days remaining, or 0 if already expired*/-const getDaysRemaining = (deletedAt: string, retentionDays: number = TRASH_RETENTION_DAYS): number => {+const getDaysRemaining = (deletedAt: string, retentionDays: number = TRASH_RETENTION_DEFAULT_DAYS): number => {const deletedDate = new Date(deletedAt);const expiryDate = new Date(deletedDate.getTime() + retentionDays * 24 * 60 * 60 * 1000);const now = new Date();@@ -175,19 +175,19 @@ const RecentlyDeleted: React.FC = () => {{items.length === 0 ? (<div className="text-gray-500 dark:text-gray-400 space-y-2 mb-10"><p>{t('recentlyDeleted.noItems')}</p>- <p className="text-sm">{t('recentlyDeleted.noItemsDescription', { days: TRASH_RETENTION_DAYS })}</p>+ <p className="text-sm">{t('recentlyDeleted.noItemsDescription', { days: TRASH_RETENTION_DEFAULT_DAYS })}</p></div>) : (<><p className="text-sm text-gray-500 dark:text-gray-400 mb-4">- {t('recentlyDeleted.description', { days: TRASH_RETENTION_DAYS })}+ {t('recentlyDeleted.description', { days: TRASH_RETENTION_DEFAULT_DAYS })}</p><ul className="space-y-2">{items.map(item => {// eslint-disable-next-line @typescript-eslint/no-explicit-anyconst deletedAt = (item as any).DeletedAt;- const daysRemaining = deletedAt ? getDaysRemaining(deletedAt) : TRASH_RETENTION_DAYS;+ const daysRemaining = deletedAt ? getDaysRemaining(deletedAt) : TRASH_RETENTION_DEFAULT_DAYS;return (<li key={scopedKey(item.ManifestId, item.Id)} className="relative">diff --git a/apps/mobile-app/app/(tabs)/items/deleted.tsx b/apps/mobile-app/app/(tabs)/items/deleted.tsxindex 39d394d6e..93b880593 100644--- a/apps/mobile-app/app/(tabs)/items/deleted.tsx+++ b/apps/mobile-app/app/(tabs)/items/deleted.tsx@@ -1,4 +1,5 @@import { scopedKey, type ItemRef } from '@aliasvault/client/database/ItemRef';+import { TRASH_RETENTION_DEFAULT_DAYS } from '@aliasvault/models/vault';import { useFocusEffect } from 'expo-router';import { useCallback, useState } from 'react';import { useTranslation } from 'react-i18next';@@ -22,7 +23,6 @@ import { ItemIcon } from '@/components/items/ItemIcon';import { ThemedContainer } from '@/components/themed/ThemedContainer';import { ThemedScrollView } from '@/components/themed/ThemedScrollView';import { ThemedText } from '@/components/themed/ThemedText';-import { TRASH_RETENTION_DAYS } from '@/constants/vault';import { useDb } from '@/context/DbContext';import type { ItemWithDeletedAt } from '@aliasvault/client/database/mappers/ItemMapper';@@ -30,10 +30,10 @@ import type { ItemWithDeletedAt } from '@aliasvault/client/database/mappers/Item/*** Calculate days remaining until permanent deletion.* @param deletedAt - ISO timestamp when item was deleted- * @param retentionDays - Number of days to retain (defaults to TRASH_RETENTION_DAYS)+ * @param retentionDays - Number of days to retain (defaults to TRASH_RETENTION_DEFAULT_DAYS)* @returns Number of days remaining, or 0 if already expired*/-const getDaysRemaining = (deletedAt: string, retentionDays: number = TRASH_RETENTION_DAYS): number => {+const getDaysRemaining = (deletedAt: string, retentionDays: number = TRASH_RETENTION_DEFAULT_DAYS): number => {const deletedDate = new Date(deletedAt);const expiryDate = new Date(deletedDate.getTime() + retentionDays * 24 * 60 * 60 * 1000);const now = new Date();@@ -272,7 +272,7 @@ export default function RecentlyDeletedScreen(): React.ReactNode {* Render an item card.*/const renderItem = (item: DisplayItem<ItemWithDeletedAt>): React.ReactElement => {- const daysRemaining = item.DeletedAt ? getDaysRemaining(item.DeletedAt) : TRASH_RETENTION_DAYS;+ const daysRemaining = item.DeletedAt ? getDaysRemaining(item.DeletedAt) : TRASH_RETENTION_DEFAULT_DAYS;return (<View key={scopedKey(item.ManifestId, item.Id)} style={styles.itemCard}>@@ -347,7 +347,7 @@ export default function RecentlyDeletedScreen(): React.ReactNode {</TouchableOpacity></View><ThemedText style={styles.headerText}>- {t('items.recentlyDeleted.description', { days: TRASH_RETENTION_DAYS })}+ {t('items.recentlyDeleted.description', { days: TRASH_RETENTION_DEFAULT_DAYS })}</ThemedText>{items.map(renderItem)}</>@@ -357,7 +357,7 @@ export default function RecentlyDeletedScreen(): React.ReactNode {{t('items.recentlyDeleted.noItems')}</ThemedText><ThemedText style={styles.emptyDescription}>- {t('items.recentlyDeleted.noItemsDescription', { days: TRASH_RETENTION_DAYS })}+ {t('items.recentlyDeleted.noItemsDescription', { days: TRASH_RETENTION_DEFAULT_DAYS })}</ThemedText></View>)}diff --git a/apps/mobile-app/constants/vault.ts b/apps/mobile-app/constants/vault.tsdeleted file mode 100644index e8771c422..000000000--- a/apps/mobile-app/constants/vault.ts+++ /dev/null@@ -1,5 +0,0 @@-/**- * Days a trashed item stays in "Recently Deleted" before the pruner deletes it. Re-exported from the vault registry,- * which also generates the value the Rust pruner uses.- */-export { TRASH_RETENTION_DEFAULT_DAYS as TRASH_RETENTION_DAYS } from '@aliasvault/models/vault';diff --git a/core/client/src/constants/Vault.ts b/core/client/src/constants/Vault.tsdeleted file mode 100644index e8771c422..000000000--- a/core/client/src/constants/Vault.ts+++ /dev/null@@ -1,5 +0,0 @@-/**- * Days a trashed item stays in "Recently Deleted" before the pruner deletes it. Re-exported from the vault registry,- * which also generates the value the Rust pruner uses.- */-export { TRASH_RETENTION_DEFAULT_DAYS as TRASH_RETENTION_DAYS } from '@aliasvault/models/vault';