Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Update browser extension family sharing UI
Leendert de Borstf4c97c697a46
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemFilterDropdown.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemFilterDropdown.tsxindex db20c3815..8270a9113 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemFilterDropdown.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemFilterDropdown.tsx@@ -2,6 +2,7 @@ import { ItemFilter, isItemTypeFilter, type ItemFilterType } from '@aliasvault/cimport React, { useState } from 'react';import { useTranslation } from 'react-i18next';+import FolderIcon from '@/entrypoints/popup/components/Folders/FolderIcon';import { ITEM_TYPE_OPTIONS } from '@/entrypoints/popup/components/Items/ItemTypeSelector';/**@@ -14,6 +15,8 @@ type ItemFilterDropdownProps = {title: string;/** Count shown next to the title on the trigger. Pass undefined to hide. */count?: number;+ /** Set when the title is a folder name, to prefix it with a folder icon. */+ titleFolder?: { isShared: boolean };/** Currently active selection used to highlight the matching menu row. */activeFilter: ItemFilterSelection;/** Number of items currently in the Recently Deleted page (badge). */@@ -38,6 +41,7 @@ type ItemFilterDropdownProps = {const ItemFilterDropdown: React.FC<ItemFilterDropdownProps> = ({title,count,+ titleFolder,activeFilter,recentlyDeletedCount,showFoldersToggle = false,@@ -76,6 +80,7 @@ const ItemFilterDropdown: React.FC<ItemFilterDropdownProps> = ({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">+ {titleFolder && <FolderIcon isShared={titleFolder.isShared} className="w-4 h-4 self-center text-orange-500 dark:text-orange-400" />}<span className="truncate">{title}</span>{count !== undefined && (<span className="text-sm text-gray-500 dark:text-gray-400 shrink-0">diff --git a/apps/browser-extension/src/entrypoints/popup/components/Sharing/SharedVaultModal.tsx b/apps/browser-extension/src/entrypoints/popup/components/Sharing/SharedVaultModal.tsxnew file mode 100644index 000000000..9e1d9f9f3--- /dev/null+++ b/apps/browser-extension/src/entrypoints/popup/components/Sharing/SharedVaultModal.tsx@@ -0,0 +1,103 @@+import { hasErrorCode, getErrorMessage } from '@aliasvault/client/api/errors/AppErrorCodes';+import { familySharingText } from '@aliasvault/client/sharing/FamilySharingView';+import React, { useEffect, useState } from 'react';+import { useTranslation } from 'react-i18next';++import ModalWrapper from '@/entrypoints/popup/components/Dialogs/ModalWrapper';++import { logFailure } from '@/utils/Diagnostics';++type SharedVaultModalProps = {+ isOpen: boolean;+ onClose: () => void;+ onSave: (name: string) => Promise<void>;+ initialName?: string;+ mode: 'create' | 'rename';+};++/**+ * Modal for creating or renaming a shared vault.+ */+const SharedVaultModal: React.FC<SharedVaultModalProps> = ({ isOpen, onClose, onSave, initialName = '', mode }) => {+ const { t } = useTranslation();+ const [name, setName] = useState(initialName);+ const [isSubmitting, setIsSubmitting] = useState(false);+ const [error, setError] = useState<string | null>(null);+ const trimmedName = name.trim();++ useEffect(() => {+ if (isOpen) {+ setName(initialName);+ setError(null);+ }+ }, [isOpen, initialName]);++ /**+ * Save the name and close.+ */+ const handleSubmit = async (e: React.FormEvent): Promise<void> => {+ e.preventDefault();+ if (!trimmedName || isSubmitting) {+ return;+ }++ setIsSubmitting(true);+ setError(null);++ try {+ await onSave(trimmedName);+ onClose();+ } catch (err) {+ setError(hasErrorCode(err) ? getErrorMessage(err, t('common.errors.unknownErrorTryAgain')) : t('common.errors.unknownErrorTryAgain'));+ logFailure('Error saving shared vault', err);+ } finally {+ setIsSubmitting(false);+ }+ };++ return (+ <ModalWrapper+ isOpen={isOpen}+ onClose={onClose}+ title={mode === 'create' ? familySharingText.createSharedVault : familySharingText.renameVault}+ footer={+ <div className="flex justify-end gap-3">+ <button+ type="button"+ onClick={onClose}+ disabled={isSubmitting}+ className="px-4 py-2 text-sm font-medium text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded hover:bg-gray-50 dark:hover:bg-gray-600 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500 disabled:opacity-50"+ >+ {t('common.cancel')}+ </button>+ <button+ type="submit"+ form="shared-vault-form"+ disabled={isSubmitting || !trimmedName}+ className="px-4 py-2 text-sm font-medium text-white bg-primary-600 hover:bg-primary-700 rounded focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500 disabled:opacity-50"+ >+ {isSubmitting ? t('common.saving') : mode === 'create' ? familySharingText.create : t('common.save')}+ </button>+ </div>+ }+ >+ <form id="shared-vault-form" onSubmit={handleSubmit}>+ <label htmlFor="sharedVaultName" className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">+ {familySharingText.vaultName}+ </label>+ <input+ id="sharedVaultName"+ type="text"+ value={name}+ onChange={(e) => setName(e.target.value)}+ placeholder={familySharingText.vaultNamePlaceholder}+ autoFocus+ className="w-full p-2 border dark:border-gray-600 rounded bg-white dark:bg-gray-700 text-gray-900 dark:text-white placeholder-gray-400 dark:placeholder-gray-500 focus:outline-none focus:ring-1 focus:ring-primary-500 focus:border-primary-500"+ />+ {error && <p className="mt-2 text-sm text-red-600 dark:text-red-400">{error}</p>}+ </form>+ </ModalWrapper>+ );+};++export default SharedVaultModal;diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsxindex d650036cc..2788910e7 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx@@ -879,6 +879,7 @@ const ItemsList: React.FC = () => {<ItemFilterDropdowntitle={getFilterTitle()}count={filteredItems.length}+ titleFolder={filterType === ItemFilter.All && currentFolder && currentFolderName ? { isShared: isSharedFolder(currentFolder, dbContext.sqliteClient?.getPersonalManifestId()) } : undefined}activeFilter={filterType}recentlyDeletedCount={recentlyDeletedCount}showFoldersToggle={!currentFolderId}diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsxindex 17d7e0864..c5fec581b 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx@@ -5,16 +5,17 @@ import { multiManifestRendering } from '@aliasvault/client/sharing/MultiManifestimport { SharingService } from '@aliasvault/client/sharing/SharingService';import React, { useCallback, useEffect, useRef, useState } from 'react';import { useTranslation } from 'react-i18next';+import { useNavigate } from 'react-router-dom';import AlertMessage from '@/entrypoints/popup/components/AlertMessage';import ConfirmDeleteModal from '@/entrypoints/popup/components/Dialogs/ConfirmDeleteModal';import ConfirmPasswordModal from '@/entrypoints/popup/components/Dialogs/ConfirmPasswordModal';import FolderIcon from '@/entrypoints/popup/components/Folders/FolderIcon';-import FolderModal from '@/entrypoints/popup/components/Folders/FolderModal';import { HeaderIcon, HeaderIconType } from '@/entrypoints/popup/components/Icons/HeaderIcons';import LoadingSpinner from '@/entrypoints/popup/components/LoadingSpinner';import PageTitle from '@/entrypoints/popup/components/PageTitle';import ReloadButton from '@/entrypoints/popup/components/ReloadButton';+import SharedVaultModal from '@/entrypoints/popup/components/Sharing/SharedVaultModal';import { useApp } from '@/entrypoints/popup/context/AppContext';import { useDb } from '@/entrypoints/popup/context/DbContext';import { useLoading } from '@/entrypoints/popup/context/LoadingContext';@@ -46,6 +47,7 @@ class BackgroundApiError extends Error {}*/const FamilySharingSettings: React.FC = () => {const { t } = useTranslation();+ const navigate = useNavigate();const app = useApp();const webApi = useWebApi();const { sqliteClient, loadStoredDatabase } = useDb();@@ -57,7 +59,7 @@ const FamilySharingSettings: React.FC = () => {const [error, setError] = useState<string | null>(null);const [notice, setNotice] = useState<string | null>(null);const [busy, setBusy] = useState(false);- const [newVaultNames, setNewVaultNames] = useState<Record<string, string>>({});+ const [pendingVaultCreate, setPendingVaultCreate] = useState<GroupInfo | null>(null);const [vaultNames, setVaultNames] = useState<Record<string, string>>({});const [pendingRemoval, setPendingRemoval] = useState<PendingRemoval | null>(null);const [pendingVaultDelete, setPendingVaultDelete] = useState<PendingVaultDelete | null>(null);@@ -163,18 +165,17 @@ const FamilySharingSettings: React.FC = () => {};/**- * Create another shared manifest for the family.- * @param group - the family to create it for.+ * Create another shared manifest for the family picked in the create modal.+ * @param name - the new vault's name.*/- const createSharedVault = (group: GroupInfo): Promise<void> => {- const name = (newVaultNames[group.groupId] ?? '').trim();- if (name.length === 0) {+ const createSharedVault = (name: string): Promise<void> => {+ const group = pendingVaultCreate;+ if (!group) {return Promise.resolve();}return run(async () => {unwrap(await sendMessage('GROUP_CREATE_VAULT', { groupId: group.groupId, name }));- setNewVaultNames(previous => ({ ...previous, [group.groupId]: '' }));await loadStoredDatabase();}, familySharingText.errors.createVaultFailed);};@@ -328,12 +329,19 @@ const FamilySharingSettings: React.FC = () => {warning={dialog.warning}/>- <FolderModal+ <SharedVaultModal+ isOpen={pendingVaultCreate !== null}+ onClose={() => setPendingVaultCreate(null)}+ onSave={createSharedVault}+ mode="create"+ />++ <SharedVaultModalisOpen={pendingVaultRename !== null}onClose={() => setPendingVaultRename(null)}onSave={renameSharedVault}initialName={pendingVaultRename ? vaultLabel(pendingVaultRename.manifest) : ''}- mode="edit"+ mode="rename"/><ConfirmDeleteModal@@ -452,11 +460,27 @@ const FamilySharingSettings: React.FC = () => {<h3 className="text-md font-semibold text-gray-900 dark:text-white">{familySharingText.sharedVaults}</h3>{group.manifests.map(manifest => {const iHoldKey = holdsManifestKey(manifest, myUserId);+ // The shared manifest's folder exists in this vault once the manifest itself does.+ const folderId = manifest.manifestId.toLowerCase();+ const hasFolder = vaultNames[folderId] !== undefined;return (<div key={manifest.manifestId} className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700 p-3 space-y-2">- <div className="flex items-start justify-between gap-2">- <p className="font-medium text-gray-900 dark:text-white truncate">{vaultLabel(manifest)}</p>+ <div className="flex items-center justify-between gap-2 -mx-1.5 -mt-1.5">+ {hasFolder ? (+ <button onClick={() => navigate(`/items/folder/${folderId}/${folderId}`)} className="flex flex-1 items-center gap-2 min-w-0 px-1.5 py-1 rounded-md hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">+ <FolderIcon isShared className="w-4 h-4 text-orange-500 dark:text-orange-400" />+ <span className="font-medium text-gray-900 dark:text-white truncate">{vaultLabel(manifest)}</span>+ <svg className="w-4 h-4 ml-auto shrink-0 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">+ <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M9 5l7 7-7 7" />+ </svg>+ </button>+ ) : (+ <div className="flex flex-1 items-center gap-2 min-w-0 px-1.5 py-1">+ <FolderIcon isShared className="w-4 h-4 text-orange-500 dark:text-orange-400" />+ <span className="font-medium text-gray-900 dark:text-white truncate">{vaultLabel(manifest)}</span>+ </div>+ )}{/* Deleting a shared manifest is hidden behind a settings gear icon menu. */}{canAdminister && (<div className="relative shrink-0">@@ -573,44 +597,28 @@ const FamilySharingSettings: React.FC = () => {</div>)}- {/* Creating another shared manifest. */}- {(canAdminister || group.manifests.length === 0) && (- <div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700 p-3 space-y-2">- {group.manifests.length === 0 && (- <p className="text-sm text-gray-600 dark:text-gray-400">- {canAdminister ? familySharingText.noSharedVaultAdmin : familySharingText.noSharedVaultMember}- </p>- )}-- {canAdminister && (- <>- <p className="font-medium text-gray-900 dark:text-white">{familySharingText.createSharedVault}</p>- <form- className="flex gap-2"- onSubmit={event => {- event.preventDefault();- createSharedVault(group);- }}- >- <input- type="text"- value={newVaultNames[group.groupId] ?? ''}- onChange={event => setNewVaultNames(previous => ({ ...previous, [group.groupId]: event.target.value }))}- placeholder={familySharingText.vaultNamePlaceholder}- className="flex-1 min-w-0 px-3 py-1.5 text-sm rounded-md border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-700 text-gray-900 dark:text-white"- />- <button- type="submit"- disabled={busy}- className="shrink-0 px-3 py-1.5 text-sm rounded-md bg-primary-500 hover:bg-primary-600 disabled:opacity-50 text-white"- >- {familySharingText.create}- </button>- </form>- </>- )}+ {group.manifests.length === 0 && (+ <div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700 p-3">+ <p className="text-sm text-gray-600 dark:text-gray-400">+ {canAdminister ? familySharingText.noSharedVaultAdmin : familySharingText.noSharedVaultMember}+ </p></div>)}++ {/* Creating another shared manifest. */}+ {canAdminister && (+ <button+ type="button"+ disabled={busy}+ onClick={() => setPendingVaultCreate(group)}+ className="w-full px-4 py-2 border-2 border-dashed border-gray-300 dark:border-gray-600 text-gray-600 dark:text-gray-400 rounded-md hover:border-primary-500 hover:text-primary-600 dark:hover:text-primary-400 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500 transition-colors flex items-center justify-center gap-2 disabled:opacity-50"+ >+ <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">+ <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M12 6v6m0 0v6m0-6h6m-6 0H6" />+ </svg>+ <span className="text-sm font-medium">{familySharingText.createSharedVault}</span>+ </button>+ )}</section>);})}