Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Update logo picker UI in browser extension (#2159)
Leendert de Borstbbe9a29088bc
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemLogoPicker.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemLogoPicker.tsxindex 5734bbe6c..e877dd6dc 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemLogoPicker.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemLogoPicker.tsx@@ -12,6 +12,7 @@ type ItemLogoPickerProps = {item: Item;pendingSelection?: LogoSelection;faviconSource?: string | null;+ websiteSource?: string | null;isFetching?: boolean;onSelect: (selection: LogoSelection) => void;onFetchFromWebsite: () => void;@@ -20,7 +21,7 @@ type ItemLogoPickerProps = {/*** The item's icon on the edit screen: shows what the item will look like and opens the picker.*/-const ItemLogoPicker: React.FC<ItemLogoPickerProps> = ({ item, pendingSelection, faviconSource, isFetching = false, onSelect, onFetchFromWebsite }) => {+const ItemLogoPicker: React.FC<ItemLogoPickerProps> = ({ item, pendingSelection, faviconSource, websiteSource, isFetching = false, onSelect, onFetchFromWebsite }) => {const { t } = useTranslation();const [isPickerOpen, setIsPickerOpen] = useState(false);@@ -53,7 +54,9 @@ const ItemLogoPicker: React.FC<ItemLogoPickerProps> = ({ item, pendingSelection,<LogoPickerModalisOpen={isPickerOpen}onClose={() => setIsPickerOpen(false)}+ item={item}currentLogo={effectiveLogo}+ websiteSource={websiteSource}onSelect={onSelect}onFetchFromWebsite={onFetchFromWebsite}/>diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/LogoPickerModal.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/LogoPickerModal.tsxindex 0df18eaba..361a55931 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Items/LogoPickerModal.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/LogoPickerModal.tsx@@ -1,3 +1,4 @@+import { logoSourceTranslationKey } from '@aliasvault/client/items/ItemLogoView';import { AppIconSvgs, getAllAppIconKeys } from '@aliasvault/models/icons';import { LogoKinds } from '@aliasvault/models/vault';import React, { useCallback } from 'react';@@ -5,12 +6,16 @@ import { useTranslation } from 'react-i18next';import ModalWrapper from '@/entrypoints/popup/components/Dialogs/ModalWrapper';-import type { LogoSelection, ItemLogo } from '@aliasvault/models/vault';+import ItemIconComponent from './ItemIcon';++import type { Item, LogoSelection, ItemLogo } from '@aliasvault/models/vault';type LogoPickerModalProps = {isOpen: boolean;onClose: () => void;+ item: Item;currentLogo?: ItemLogo;+ websiteSource?: string | null;onSelect: (selection: LogoSelection) => void;onFetchFromWebsite: () => void;};@@ -18,28 +23,42 @@ type LogoPickerModalProps = {/*** Lets the user change an item's icon.*/-const LogoPickerModal: React.FC<LogoPickerModalProps> = ({ isOpen, onClose, currentLogo, onSelect, onFetchFromWebsite }) => {+const LogoPickerModal: React.FC<LogoPickerModalProps> = ({ isOpen, onClose, item, currentLogo, websiteSource, onSelect, onFetchFromWebsite }) => {const { t } = useTranslation();/*** Apply a choice and close: the item's save is what actually writes it.*/const choose = useCallback((selection: LogoSelection): void => {- onSelect(selection);+ if (selection.Kind === LogoKinds.Favicon) {+ onFetchFromWebsite();+ } else {+ onSelect(selection);+ }onClose();- }, [onSelect, onClose]);+ }, [onFetchFromWebsite, onSelect, onClose]);/**- * Start the favicon fetch from the website.+ * Describe a logo: a library icon by its name, any other by where it comes from.*/- const fetchFromWebsite = useCallback((): void => {- onFetchFromWebsite();- onClose();- }, [onFetchFromWebsite, onClose]);+ const describe = (logo: ItemLogo | undefined): string => {+ return logo?.Kind === LogoKinds.Builtin ? t(`items.logo.builtin.${logo.Source}`) : t(logoSourceTranslationKey(logo), { domain: logo?.Source });+ };return (<ModalWrapper isOpen={isOpen} onClose={onClose} title={t('items.logo.chooseLogo')} maxWidth="max-w-md"><div className="space-y-4">+ {/* What the item shows now; a click below replaces it once the item is saved. */}+ <div className="flex items-center gap-3 px-3 py-2 rounded-lg border border-gray-200 dark:border-gray-600">+ <div className="flex items-center justify-center w-10 h-10 flex-shrink-0 rounded-md bg-gray-100 dark:bg-gray-700">+ <ItemIconComponent item={{ ...item, LogoInfo: currentLogo }} className="w-7 h-7" />+ </div>+ <div className="min-w-0">+ <div className="text-xs uppercase tracking-wide text-gray-500 dark:text-gray-400">{t('items.logo.currentLogo')}</div>+ <div className="text-sm text-gray-900 dark:text-white truncate">{describe(currentLogo)}</div>+ </div>+ </div>+<div><h3 className="text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">{t('items.logo.builtinLogos')}</h3><div className="grid grid-cols-5 gap-2">@@ -49,11 +68,7 @@ const LogoPickerModal: React.FC<LogoPickerModalProps> = ({ isOpen, onClose, currtype="button"title={t(`items.logo.builtin.${key}`)}onClick={() => choose({ Kind: LogoKinds.Builtin, Source: key })}- className={`flex items-center justify-center p-2 rounded-lg border transition-colors hover:bg-primary-50 dark:hover:bg-primary-900/30 hover:border-primary-500 dark:hover:border-primary-500 ${- currentLogo?.Kind === LogoKinds.Builtin && currentLogo.Source === key- ? 'border-primary-500 bg-primary-50 dark:bg-primary-900/30'- : 'border-gray-200 dark:border-gray-600'- }`}+ className="flex items-center justify-center p-2 rounded-lg border border-gray-200 dark:border-gray-600 transition-colors hover:bg-primary-50 dark:hover:bg-primary-900/30 hover:border-primary-500 dark:hover:border-primary-500"><div className="w-7 h-7" dangerouslySetInnerHTML={{ __html: AppIconSvgs[key] }} /></button>@@ -61,14 +76,24 @@ const LogoPickerModal: React.FC<LogoPickerModalProps> = ({ isOpen, onClose, curr</div></div>- {/* Fetching is also how an item goes back to the website's icon after a built-in one was picked. */}- <button- type="button"- onClick={fetchFromWebsite}- className="w-full px-4 py-2 text-sm rounded-lg border border-gray-200 dark:border-gray-600 text-gray-700 dark:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors"- >- {currentLogo?.Kind === LogoKinds.Favicon ? t('items.logo.refetchFromWebsite') : t('items.logo.fetchFromWebsite')}- </button>+ {/* Only offered when the URL field names a website; fetching is also how an item goes back to the website's icon after a built-in one was picked. */}+ {websiteSource && (+ <button+ type="button"+ onClick={() => choose({ Kind: LogoKinds.Favicon })}+ className="w-full flex items-center gap-3 px-3 py-2 text-left rounded-lg border border-gray-200 dark:border-gray-600 transition-colors hover:bg-primary-50 dark:hover:bg-primary-900/30 hover:border-primary-500 dark:hover:border-primary-500"+ >+ <svg className="w-5 h-5 flex-shrink-0 text-primary-600 dark:text-primary-400" fill="none" viewBox="0 0 24 24" strokeWidth="1.5" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" d="M12 21a9 9 0 100-18 9 9 0 000 18zm0 0a8.95 8.95 0 003.2-9 8.95 8.95 0 00-3.2-9m0 18a8.95 8.95 0 01-3.2-9A8.95 8.95 0 0112 3m-8.7 6h17.4M3.3 15h17.4" /></svg>+ <span className="min-w-0">+ <span className="block text-sm text-gray-900 dark:text-white">+ {currentLogo?.Kind === LogoKinds.Favicon ? t('items.logo.refetchFromWebsite') : t('items.logo.fetchFromWebsite')}+ </span>+ <span className="block text-xs text-gray-500 dark:text-gray-400 truncate">+ {t('items.logo.sourceFavicon', { domain: websiteSource })}+ </span>+ </span>+ </button>+ )}</div></ModalWrapper>);diff --git a/apps/browser-extension/src/entrypoints/popup/hooks/useItemLogo.ts b/apps/browser-extension/src/entrypoints/popup/hooks/useItemLogo.tsindex cca3174af..87ff57ed2 100644--- a/apps/browser-extension/src/entrypoints/popup/hooks/useItemLogo.ts+++ b/apps/browser-extension/src/entrypoints/popup/hooks/useItemLogo.ts@@ -25,6 +25,7 @@ type UseItemLogoResult = {logoSelection: LogoSelection | undefined;isFetchingLogo: boolean;resolvedFaviconSource: string | null;+ websiteSource: string | null;selectLogo: (selection: LogoSelection) => void;fetchLogoFromWebsite: () => Promise<void>;};@@ -42,6 +43,7 @@ const useItemLogo = ({ url, currentLogoKind, isReady, isExistingItem, onLogoByteconst [logoSelection, setLogoSelection] = useState<LogoSelection | undefined>(undefined);const [isFetchingLogo, setIsFetchingLogo] = useState(false);const [resolvedFaviconSource, setResolvedFaviconSource] = useState<string | null>(null);+ const [websiteSource, setWebsiteSource] = useState<string | null>(null);const resolvedSourceRef = useRef<string | null>(null);const requestIdRef = useRef(0);@@ -125,6 +127,7 @@ const useItemLogo = ({ url, currentLogoKind, isReady, isExistingItem, onLogoByteif (cancelled) {return;}+ setWebsiteSource(source);if (!hasInitialisedRef.current) {hasInitialisedRef.current = true;@@ -161,7 +164,7 @@ const useItemLogo = ({ url, currentLogoKind, isReady, isExistingItem, onLogoByte*/const fetchLogoFromWebsite = useCallback((): Promise<void> => resolveFromWebsite(true), [resolveFromWebsite]);- return { logoSelection, isFetchingLogo, resolvedFaviconSource, selectLogo, fetchLogoFromWebsite };+ return { logoSelection, isFetchingLogo, resolvedFaviconSource, websiteSource, selectLogo, fetchLogoFromWebsite };};export default useItemLogo;diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsxindex 68f099335..718b59acf 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx@@ -687,7 +687,7 @@ const ItemAddEdit: React.FC = () => {/** The item's favicon: a pick from the built-in catalog, or the website's own favicon extracted from the URL.*/- const { logoSelection, isFetchingLogo, resolvedFaviconSource, selectLogo, fetchLogoFromWebsite } = useItemLogo({+ const { logoSelection, isFetchingLogo, resolvedFaviconSource, websiteSource, selectLogo, fetchLogoFromWebsite } = useItemLogo({url: fieldValues['login.url'],currentLogoKind: item?.LogoInfo?.Kind,isReady: !localLoading && item !== null,@@ -1421,6 +1421,7 @@ const ItemAddEdit: React.FC = () => {item={item}pendingSelection={logoSelection}faviconSource={resolvedFaviconSource}+ websiteSource={websiteSource}isFetching={isFetchingLogo}onSelect={selectLogo}onFetchFromWebsite={() => void fetchLogoFromWebsite()}diff --git a/apps/browser-extension/src/i18n/locales/en.json b/apps/browser-extension/src/i18n/locales/en.jsonindex be1b228fc..1c7e4e602 100644--- a/apps/browser-extension/src/i18n/locales/en.json+++ b/apps/browser-extension/src/i18n/locales/en.json@@ -291,7 +291,8 @@},"logo": {"chooseLogo": "Choose icon",- "builtinLogos": "Built-in icons",+ "currentLogo": "Current icon",+ "builtinLogos": "Icon library","fetchFromWebsite": "Fetch icon from website","refetchFromWebsite": "(Re)fetch icon from website","sourceFavicon": "From {{domain}}",