Skip to content

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

Add edit folder functions (#1404)

Leendert de Borst25e53181a917
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 1fa0b9fc8..780a2ef1a 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
@@ -110,7 +110,9 @@ const ItemsList: React.FC = () => {
const [showFilterMenu, setShowFilterMenu] = useState(false);
const [showFolderModal, setShowFolderModal] = useState(false);
const [showDeleteFolderModal, setShowDeleteFolderModal] = useState(false);
+ const [showEditFolderModal, setShowEditFolderModal] = useState(false);
const [recentlyDeletedCount, setRecentlyDeletedCount] = useState(0);
+ const [folderRefreshKey, setFolderRefreshKey] = useState(0);
const { setIsInitialLoading } = useLoading();
// Derive current folder from URL params
@@ -118,13 +120,15 @@ const ItemsList: React.FC = () => {
// Get current folder name from database
const currentFolderName = useMemo(() => {
+ // folderRefreshKey is included in deps to force re-computation when folder is renamed
+ void folderRefreshKey;
if (!currentFolderId || !dbContext?.sqliteClient) {
return null;
}
const folders = dbContext.sqliteClient.folders.getAll();
const folder = folders.find((f: { Id: string; Name: string }) => f.Id === currentFolderId);
return folder?.Name ?? null;
- }, [currentFolderId, dbContext?.sqliteClient]);
+ }, [currentFolderId, dbContext?.sqliteClient, folderRefreshKey]);
/**
* Loading state with minimum duration for more fluid UX.
@@ -227,6 +231,25 @@ const ItemsList: React.FC = () => {
navigate('/items');
}, [dbContext, currentFolderId, executeVaultMutationAsync, navigate]);
+ /**
+ * Handle edit/rename folder.
+ */
+ const handleEditFolder = useCallback(async (newName: string) : Promise<void> => {
+ if (!dbContext?.sqliteClient || !currentFolderId) {
+ return;
+ }
+
+ await executeVaultMutationAsync(async () => {
+ await dbContext.sqliteClient!.folders.update(currentFolderId, newName);
+ });
+
+ // Trigger re-computation of currentFolderName
+ setFolderRefreshKey(prev => prev + 1);
+
+ // Close modal
+ setShowEditFolderModal(false);
+ }, [dbContext, currentFolderId, executeVaultMutationAsync]);
+
/**
* Retrieve latest vault and refresh the items list.
*/
@@ -457,10 +480,10 @@ const ItemsList: React.FC = () => {
return (
<div>
<div className="flex justify-between items-center gap-2 mb-4">
- <div className="relative min-w-0 flex-1">
+ <div className="relative min-w-0 flex-1 flex items-center gap-2">
<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 max-w-full"
+ 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>
@@ -480,6 +503,30 @@ const ItemsList: React.FC = () => {
<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">
+ <button
+ onClick={() => setShowEditFolderModal(true)}
+ title={t('items.editFolder')}
+ className="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"
+ >
+ <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+ <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" />
+ </svg>
+ </button>
+ <button
+ onClick={() => setShowDeleteFolderModal(true)}
+ title={t('items.deleteFolder')}
+ className="p-1.5 text-gray-400 hover:text-red-500 dark:text-gray-500 dark:hover:text-red-400 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors"
+ >
+ <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+ <polyline points="3 6 5 6 21 6" />
+ <path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2" />
+ </svg>
+ </button>
+ </div>
+ )}
{showFilterMenu && (
<>
<div
@@ -710,20 +757,6 @@ const ItemsList: React.FC = () => {
</ul>
)}
- {/* Delete folder button (only show when inside a folder) */}
- {currentFolderId && !searchTerm && (
- <button
- onClick={() => setShowDeleteFolderModal(true)}
- className="w-full mt-4 p-3 flex items-center gap-2 text-left text-red-600 dark:text-red-400 bg-gray-50 dark:bg-gray-800/50 border border-gray-200 dark:border-gray-700 rounded-lg hover:bg-red-50 dark:hover:bg-red-900/20 hover:border-red-300 dark:hover:border-red-700 transition-colors"
- >
- <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
- <polyline points="3 6 5 6 21 6" />
- <path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2" />
- </svg>
- <span>{t('items.deleteFolder')}</span>
- </button>
- )}
-
{/* Recently Deleted link (only show at root level when not searching and not filtering) */}
{!currentFolderId && !searchTerm && filterType === 'all' && (
<button
@@ -755,7 +788,7 @@ const ItemsList: React.FC = () => {
</>
)}
- {/* Folder Modal */}
+ {/* Create Folder Modal */}
<FolderModal
isOpen={showFolderModal}
onClose={() => setShowFolderModal(false)}
@@ -763,13 +796,21 @@ const ItemsList: React.FC = () => {
mode="create"
/>
+ {/* Edit Folder Modal */}
+ <FolderModal
+ isOpen={showEditFolderModal}
+ onClose={() => setShowEditFolderModal(false)}
+ onSave={handleEditFolder}
+ initialName={currentFolderName || ''}
+ mode="edit"
+ />
+
{/* Delete Folder Modal */}
<DeleteFolderModal
isOpen={showDeleteFolderModal}
onClose={() => setShowDeleteFolderModal(false)}
onDeleteFolderOnly={handleDeleteFolderOnly}
onDeleteFolderAndContents={handleDeleteFolderAndContents}
- folderName={currentFolderName || ''}
itemCount={filteredItems.length}
/>
</div>
diff --git a/apps/server/AliasVault.Client/Main/Pages/Items/Home.razor b/apps/server/AliasVault.Client/Main/Pages/Items/Home.razor
index 696a2b8cd..f2b0cdbe7 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Items/Home.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Items/Home.razor
@@ -30,6 +30,11 @@
</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">
+ <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+ <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" />
+ </svg>
+ </button>
<button @onclick="ShowDeleteFolderModal" title="@Localizer["DeleteFolder"]" class="p-1.5 text-gray-400 hover:text-red-500 dark:text-gray-500 dark:hover:text-red-400 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors">
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<polyline points="3 6 5 6 21 6" />
@@ -259,13 +264,21 @@ else
}
}
-@* Folder Modal *@
+@* Create Folder Modal *@
<FolderModal
IsOpen="@ShowFolderModal"
OnClose="CloseFolderModal"
OnSave="CreateFolderAsync"
Mode="create" />
+@* Edit Folder Modal *@
+<FolderModal
+ IsOpen="@ShowEditFolderModalVisible"
+ OnClose="CloseEditFolderModal"
+ OnSave="EditFolderAsync"
+ InitialName="@CurrentFolderName"
+ Mode="edit" />
+
@* Delete Folder Modal *@
<DeleteFolderModal
IsOpen="@ShowDeleteFolderModalVisible"
@@ -324,6 +337,11 @@ else
/// </summary>
private bool ShowDeleteFolderModalVisible { get; set; }
+ /// <summary>
+ /// Gets or sets whether the edit folder modal is shown.
+ /// </summary>
+ private bool ShowEditFolderModalVisible { get; set; }
+
/// <summary>
/// Gets or sets the search term.
/// </summary>
@@ -604,6 +622,48 @@ else
}
}
+ /// <summary>
+ /// Show the edit folder modal.
+ /// </summary>
+ private void ShowEditFolderModal()
+ {
+ ShowEditFolderModalVisible = true;
+ StateHasChanged();
+ }
+
+ /// <summary>
+ /// Close the edit folder modal.
+ /// </summary>
+ private void CloseEditFolderModal()
+ {
+ ShowEditFolderModalVisible = false;
+ StateHasChanged();
+ }
+
+ /// <summary>
+ /// Edit the current folder's name.
+ /// </summary>
+ private async Task EditFolderAsync(string newName)
+ {
+ if (FolderId.HasValue)
+ {
+ var success = await FolderService.UpdateAsync(FolderId.Value, newName);
+ if (success)
+ {
+ // Update the current folder name to reflect the change
+ CurrentFolderName = newName;
+
+ // Reload folders to update the name in the list
+ Folders = await FolderService.GetAllWithCountsAsync();
+ StateHasChanged();
+ }
+ else
+ {
+ GlobalNotificationService.AddErrorMessage(SharedLocalizer["ErrorGeneric"], true);
+ }
+ }
+ }
+
/// <summary>
/// Show the delete folder modal.
/// </summary>
diff --git a/apps/server/AliasVault.Client/Resources/Pages/Main/Items/Home.en.resx b/apps/server/AliasVault.Client/Resources/Pages/Main/Items/Home.en.resx
index 3ce84c125..7ebf42b0f 100644
--- a/apps/server/AliasVault.Client/Resources/Pages/Main/Items/Home.en.resx
+++ b/apps/server/AliasVault.Client/Resources/Pages/Main/Items/Home.en.resx
@@ -206,6 +206,10 @@
<value>New Folder</value>
<comment>Button text for creating a new folder</comment>
</data>
+ <data name="EditFolder" xml:space="preserve">
+ <value>Edit Folder</value>
+ <comment>Button text for editing a folder</comment>
+ </data>
<data name="DeleteFolder" xml:space="preserve">
<value>Delete Folder</value>
<comment>Button text for deleting a folder</comment>
diff --git a/apps/server/AliasVault.Client/wwwroot/css/tailwind.css b/apps/server/AliasVault.Client/wwwroot/css/tailwind.css
index 609615498..cc6ad28e7 100644
--- a/apps/server/AliasVault.Client/wwwroot/css/tailwind.css
+++ b/apps/server/AliasVault.Client/wwwroot/css/tailwind.css
@@ -2909,6 +2909,11 @@ video {
color: rgb(21 128 61 / var(--tw-text-opacity));
}
+.hover\:text-orange-500:hover {
+ --tw-text-opacity: 1;
+ color: rgb(249 115 22 / var(--tw-text-opacity));
+}
+
.hover\:underline:hover {
text-decoration-line: underline;
}