Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Prefill folder when creating item from folder view (#1404)
Leendert de Borst9208b62baf23
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/credentials/ItemAddEdit.tsx b/apps/browser-extension/src/entrypoints/popup/pages/credentials/ItemAddEdit.tsxindex fa511c862..aec9766df 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/credentials/ItemAddEdit.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/credentials/ItemAddEdit.tsx@@ -85,9 +85,10 @@ const ItemAddEdit: React.FC = () => {const dbContext = useDb();const isEditMode = id !== undefined && id.length > 0;- // Get item type and name from URL parameters (for create mode)+ // Get item type, name, and folder from URL parameters (for create mode)const itemTypeParam = searchParams.get('type') as ItemType | null;const itemNameParam = searchParams.get('name');+ const folderIdParam = searchParams.get('folderId');const { executeVaultMutationAsync } = useVaultMutate();const { setHeaderButtons } = useHeaderButtons();@@ -341,7 +342,7 @@ const ItemAddEdit: React.FC = () => {Id: crypto.randomUUID().toUpperCase(),Name: serviceName,ItemType: effectiveType,- FolderId: null,+ FolderId: folderIdParam || null,Fields: [],CreatedAt: new Date().toISOString(),UpdatedAt: new Date().toISOString()@@ -443,7 +444,7 @@ const ItemAddEdit: React.FC = () => {setLocalLoading(false);setIsInitialLoading(false);}- }, [dbContext?.sqliteClient, id, isEditMode, itemTypeParam, itemNameParam, navigate, setIsInitialLoading, detectService, loadPersistedValues]);+ }, [dbContext?.sqliteClient, id, isEditMode, itemTypeParam, itemNameParam, folderIdParam, navigate, setIsInitialLoading, detectService, loadPersistedValues]);/*** Handle generating alias and populating fields.diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsxindex 780a2ef1a..8d3d3ea4f 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx@@ -152,15 +152,24 @@ const ItemsList: React.FC = () => {/*** Handle add new item.* Navigate to add item page, pre-selecting the item type if filtering by type.+ * Also pre-selects the current folder if we're inside a folder.*/const handleAddItem = useCallback(() : void => {+ const params = new URLSearchParams();+// If filtering by an item type, pre-select that type for the new itemif (isItemTypeFilter(filterType)) {- navigate(`/items/add?type=${filterType}`);- } else {- navigate('/items/add');+ params.set('type', filterType);+ }++ // Pre-select the current folder if we're inside a folder+ if (currentFolderId) {+ params.set('folderId', currentFolderId);}- }, [navigate, filterType]);++ const queryString = params.toString();+ navigate(queryString ? `/items/add?${queryString}` : '/items/add');+ }, [navigate, filterType, currentFolderId]);/*** Handle add new folder.diff --git a/apps/server/AliasVault.Client/Main/Components/Items/FolderSelector.razor b/apps/server/AliasVault.Client/Main/Components/Items/FolderSelector.razorindex 9d03b3cde..32fa5a913 100644--- a/apps/server/AliasVault.Client/Main/Components/Items/FolderSelector.razor+++ b/apps/server/AliasVault.Client/Main/Components/Items/FolderSelector.razor@@ -5,36 +5,24 @@@inject FolderService FolderService@inject IStringLocalizerFactory LocalizerFactory-<div class="p-4 mb-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 sm:p-6 dark:bg-gray-800">- <div class="flex items-center justify-between">- <div class="flex items-center gap-3">- <div class="flex-shrink-0 w-10 h-10 flex items-center justify-center rounded-full bg-gray-100 dark:bg-gray-700">- <svg class="w-5 h-5 text-gray-600 dark:text-gray-400" viewBox="0 0 24 24" fill="currentColor">- <path d="M10 4H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2h-8l-2-2z"/>- </svg>- </div>- <div>- <h4 class="text-sm font-medium text-gray-700 dark:text-gray-300">@Localizer["FolderLabel"]</h4>- <p class="text-sm text-gray-500 dark:text-gray-400">- @if (SelectedFolderId.HasValue)- {- var folder = Folders.FirstOrDefault(f => f.Id == SelectedFolderId.Value);- <span class="text-primary-600 dark:text-primary-400">@folder?.Name</span>- }- else- {- <span>@Localizer["NoFolder"]</span>- }- </p>- </div>- </div>- <button type="button"- @onclick="OpenFolderModal"- @onclick:preventDefault="true"- class="px-3 py-1.5 text-sm font-medium text-primary-600 dark:text-primary-400 hover:text-primary-700 dark:hover:text-primary-300 hover:bg-primary-50 dark:hover:bg-primary-900/20 rounded-md transition-colors">- @Localizer["ChangeFolder"]- </button>- </div>+<div class="flex items-center gap-2 mt-2">+ <svg class="w-4 h-4 text-gray-400 dark:text-gray-500 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">+ <path stroke-linecap="round" stroke-linejoin="round" d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z" />+ </svg>+ <button type="button"+ @onclick="OpenFolderModal"+ @onclick:preventDefault="true"+ class="text-sm text-gray-500 dark:text-gray-400 hover:text-primary-600 dark:hover:text-primary-400 transition-colors">+ @if (SelectedFolderId.HasValue)+ {+ var folder = Folders.FirstOrDefault(f => f.Id == SelectedFolderId.Value);+ <span class="text-primary-600 dark:text-primary-400">@folder?.Name</span>+ }+ else+ {+ <span>@Localizer["NoFolder"]</span>+ }+ </button></div>@* Folder Selection Modal *@diff --git a/apps/server/AliasVault.Client/Main/Components/Widgets/CreateNewIdentityWidget.razor b/apps/server/AliasVault.Client/Main/Components/Widgets/CreateNewIdentityWidget.razorindex d5b8cf21b..e6268888e 100644--- a/apps/server/AliasVault.Client/Main/Components/Widgets/CreateNewIdentityWidget.razor+++ b/apps/server/AliasVault.Client/Main/Components/Widgets/CreateNewIdentityWidget.razor@@ -226,6 +226,13 @@FieldValues = new List<FieldValue>()};+ // Set folder ID if we're in a folder view+ var folderId = GetCurrentFolderIdFromUrl();+ if (folderId.HasValue)+ {+ item.FolderId = folderId.Value;+ }+// Set email with default domainItemService.SetFieldValue(item, FieldKey.LoginEmail, "@" + ItemService.GetDefaultEmailDomain());@@ -268,11 +275,28 @@QuickCreateStateService.ServiceName = Model.ServiceName;QuickCreateStateService.ServiceUrl = Model.ServiceUrl;QuickCreateStateService.ItemType = Model.ItemType;+ QuickCreateStateService.FolderId = GetCurrentFolderIdFromUrl();NavigationManager.NavigateTo("/items/create");ClosePopup();}+ /// <summary>+ /// Extract the folder ID from the current URL if we're in a folder view.+ /// </summary>+ /// <returns>The folder ID if in a folder view, null otherwise.</returns>+ private Guid? GetCurrentFolderIdFromUrl()+ {+ var uri = new Uri(NavigationManager.Uri);+ var path = uri.AbsolutePath;+ if (path.StartsWith("/items/folder/") && Guid.TryParse(path.Replace("/items/folder/", ""), out var folderId))+ {+ return folderId;+ }++ return null;+ }+/// <summary>/// Get the popup title based on the selected item type./// </summary>diff --git a/apps/server/AliasVault.Client/Main/Pages/Items/AddEdit.razor b/apps/server/AliasVault.Client/Main/Pages/Items/AddEdit.razorindex e0b89dcde..6b56fedcc 100644--- a/apps/server/AliasVault.Client/Main/Pages/Items/AddEdit.razor+++ b/apps/server/AliasVault.Client/Main/Pages/Items/AddEdit.razor@@ -41,9 +41,6 @@ elseShowDropdownChanged="@((show) => ShowTypeDropdown = show)"OnRegenerateAlias="@GenerateRandomAlias" />- @* Folder Selector *@- <FolderSelector @bind-SelectedFolderId="Obj.FolderId" />-@* Service/Name Section - Always shown *@<div class="p-4 mb-4 bg-white border-2 border-primary-600 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700 sm:p-6 dark:bg-gray-800"><h3 class="mb-4 text-xl font-semibold dark:text-white">@Localizer["ServiceSectionHeader"]</h3>@@ -51,6 +48,8 @@ else<div class="col-span-6 sm:col-span-3"><EditFormRow Id="service-name" Label="@Localizer["ServiceNameLabel"]" Placeholder="@Localizer["ServiceNamePlaceholder"]" @bind-Value="Obj.ServiceName"></EditFormRow><ValidationMessage For="() => Obj.ServiceName"/>+ @* Folder Selector - below name field *@+ <FolderSelector @bind-SelectedFolderId="Obj.FolderId" /></div>@* URL field - only for Login and Alias types *@@if (ShouldShowField(FieldKey.LoginUrl))@@ -499,6 +498,10 @@ else{await HandleItemTypeChange(QuickCreateStateService.ItemType);}+ if (QuickCreateStateService.FolderId.HasValue)+ {+ Obj.FolderId = QuickCreateStateService.FolderId;+ }// Clear the state after using itQuickCreateStateService.ClearState();diff --git a/apps/server/AliasVault.Client/Resources/Components/Main/Items/FolderSelector.en.resx b/apps/server/AliasVault.Client/Resources/Components/Main/Items/FolderSelector.en.resxindex fdb0c3258..4e9a01bc5 100644--- a/apps/server/AliasVault.Client/Resources/Components/Main/Items/FolderSelector.en.resx+++ b/apps/server/AliasVault.Client/Resources/Components/Main/Items/FolderSelector.en.resx@@ -20,18 +20,10 @@</xsd:element></xsd:schema>- <data name="FolderLabel">- <value>Folder</value>- <comment>Label for the folder section</comment>- </data><data name="NoFolder"><value>No folder</value><comment>Text shown when no folder is selected</comment></data>- <data name="ChangeFolder">- <value>Change</value>- <comment>Button text to change folder</comment>- </data><data name="SelectFolderTitle"><value>Select Folder</value><comment>Title of the folder selection modal</comment>diff --git a/apps/server/AliasVault.Client/Services/QuickCreateStateService.cs b/apps/server/AliasVault.Client/Services/QuickCreateStateService.csindex f7dfd02f5..776da521f 100644--- a/apps/server/AliasVault.Client/Services/QuickCreateStateService.cs+++ b/apps/server/AliasVault.Client/Services/QuickCreateStateService.cs@@ -27,6 +27,11 @@ public class QuickCreateStateService/// </summary>public string? ItemType { get; set; }+ /// <summary>+ /// Gets or sets the folder ID to pre-select when creating a new item.+ /// </summary>+ public Guid? FolderId { get; set; }+/// <summary>/// Clears the stored state./// </summary>@@ -35,5 +40,6 @@ public class QuickCreateStateServiceServiceName = null;ServiceUrl = null;ItemType = null;+ FolderId = null;}}