Skip to content

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

Remove regenerate alias button from item type switcher (#2287)

Leendert de Borsta9b3eaca8679
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemTypeSelector.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemTypeSelector.tsx
index b37c38670..6b8ed06fb 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemTypeSelector.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemTypeSelector.tsx
@@ -57,11 +57,9 @@ const ITEM_TYPE_OPTIONS: ItemTypeOption[] = [
type ItemTypeSelectorProps = {
selectedType: ItemType;
- isEditMode: boolean;
showDropdown: boolean;
onDropdownToggle: (show: boolean) => void;
onTypeChange: (type: ItemType) => void;
- onRegenerateAlias?: () => void;
};
/**
@@ -70,11 +68,9 @@ type ItemTypeSelectorProps = {
*/
const ItemTypeSelector: React.FC<ItemTypeSelectorProps> = ({
selectedType,
- isEditMode,
showDropdown,
onDropdownToggle,
- onTypeChange,
- onRegenerateAlias
+ onTypeChange
}) => {
const { t } = useTranslation();
@@ -97,19 +93,6 @@ const ItemTypeSelector: React.FC<ItemTypeSelectorProps> = ({
{selectedTypeOption ? t(selectedTypeOption.titleKey) : ''}
</span>
</span>
- {selectedType === ItemTypes.Alias && !isEditMode && onRegenerateAlias && (
- <button
- type="button"
- onClick={onRegenerateAlias}
- className="relative flex-shrink-0 -my-1 p-1.5 text-primary-600 dark:text-primary-400 hover:text-primary-800 dark:hover:text-primary-300 hover:bg-primary-300 dark:hover:bg-primary-900/40 rounded transition-colors"
- title={t('itemTypes.regenerateAlias')}
- >
- <svg className='w-4 h-4' viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
- <path d="M23 4v6h-6"/>
- <path d="M20.49 15a9 9 0 1 1-2.12-9.36L23 10"/>
- </svg>
- </button>
- )}
<span className="relative flex-1 flex items-center justify-end gap-1 min-w-0 pointer-events-none peer-hover:opacity-80 transition-opacity">
<span className="text-xs text-primary-600/80 dark:text-primary-400/80 truncate">
{t('itemTypes.typeLabel')}
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx
index e08ffe0b9..d2e5ec6cd 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx
@@ -1366,11 +1366,9 @@ const ItemAddEdit: React.FC = () => {
{/* Item Type Selector */}
<ItemTypeSelector
selectedType={item.ItemType}
- isEditMode={isEditMode}
showDropdown={showTypeDropdown}
onDropdownToggle={setShowTypeDropdown}
onTypeChange={handleTypeChange}
- onRegenerateAlias={aliasFieldsShownByDefault && !isEditMode ? handleGenerateAlias : undefined}
/>
{/* Item Name and Primary fields block */}
diff --git a/apps/browser-extension/src/i18n/locales/en.json b/apps/browser-extension/src/i18n/locales/en.json
index 55d1b6894..5a51d41a4 100644
--- a/apps/browser-extension/src/i18n/locales/en.json
+++ b/apps/browser-extension/src/i18n/locales/en.json
@@ -282,7 +282,6 @@
"typeLabel": "Item Type",
"creating": "Creating",
"editing": "Editing",
- "regenerateAlias": "Regenerate alias",
"addCustomField": "Add custom field",
"fieldLabel": "Field Label",
"enterFieldName": "Enter field name",
diff --git a/apps/mobile-app/components/items/ItemTypeSelector.tsx b/apps/mobile-app/components/items/ItemTypeSelector.tsx
index c9daac37e..1e732edf6 100644
--- a/apps/mobile-app/components/items/ItemTypeSelector.tsx
+++ b/apps/mobile-app/components/items/ItemTypeSelector.tsx
@@ -48,9 +48,7 @@ const ITEM_TYPE_OPTIONS: ItemTypeOption[] = [
type ItemTypeSelectorProps = {
selectedType: ItemType;
- isEditMode: boolean;
onTypeChange: (type: ItemType) => void;
- onRegenerateAlias?: () => void;
};
/**
@@ -59,9 +57,7 @@ type ItemTypeSelectorProps = {
*/
export const ItemTypeSelector: React.FC<ItemTypeSelectorProps> = ({
selectedType,
- isEditMode,
onTypeChange,
- onRegenerateAlias,
}) => {
const { t } = useTranslation();
const colors = useColors();
@@ -132,13 +128,6 @@ export const ItemTypeSelector: React.FC<ItemTypeSelectorProps> = ({
color: colors.primary,
fontWeight: '600',
},
- regenerateButton: {
- backgroundColor: colors.primary + '20',
- borderRadius: 6,
- marginLeft: 8,
- padding: 8,
- marginVertical: -6,
- },
valueContainer: {
flexDirection: 'row',
alignItems: 'center',
@@ -156,47 +145,36 @@ export const ItemTypeSelector: React.FC<ItemTypeSelectorProps> = ({
});
return (
- <View style={styles.container}>
+ <>
<RobustPressable
onPress={() => setShowDropdown(true)}
- style={styles.valueContainer}
+ style={styles.container}
>
- {selectedTypeOption && (
+ <View style={styles.valueContainer}>
+ {selectedTypeOption && (
+ <MaterialIcons
+ name={selectedTypeOption.icon}
+ size={20}
+ color={colors.primary}
+ style={styles.valueIcon}
+ />
+ )}
+ <ThemedText style={styles.valueText} numberOfLines={1}>
+ {selectedTypeOption ? t(selectedTypeOption.titleKey) : ''}
+ </ThemedText>
+ </View>
+
+ <View style={styles.labelContainer}>
+ <ThemedText style={styles.labelText} numberOfLines={1}>
+ {t('itemTypes.typeLabel')}
+ </ThemedText>
<MaterialIcons
- name={selectedTypeOption.icon}
- size={20}
+ name="keyboard-arrow-down"
+ size={24}
color={colors.primary}
- style={styles.valueIcon}
+ style={styles.dropdownIcon}
/>
- )}
- <ThemedText style={styles.valueText} numberOfLines={1}>
- {selectedTypeOption ? t(selectedTypeOption.titleKey) : ''}
- </ThemedText>
- </RobustPressable>
-
- {/* Regenerate alias button - only for Alias type in create mode */}
- {selectedType === ItemTypes.Alias && !isEditMode && onRegenerateAlias && (
- <RobustPressable
- onPress={onRegenerateAlias}
- style={styles.regenerateButton}
- >
- <MaterialIcons name="refresh" size={20} color={colors.primary} />
- </RobustPressable>
- )}
-
- <RobustPressable
- onPress={() => setShowDropdown(true)}
- style={styles.labelContainer}
- >
- <ThemedText style={styles.labelText} numberOfLines={1}>
- {t('itemTypes.typeLabel')}
- </ThemedText>
- <MaterialIcons
- name="keyboard-arrow-down"
- size={24}
- color={colors.primary}
- style={styles.dropdownIcon}
- />
+ </View>
</RobustPressable>
{/* Type Dropdown Modal */}
@@ -252,7 +230,7 @@ export const ItemTypeSelector: React.FC<ItemTypeSelectorProps> = ({
</View>
</TouchableWithoutFeedback>
</Modal>
- </View>
+ </>
);
};
diff --git a/apps/server/AliasVault.Client/Main/Components/Items/ItemTypeSelector.razor b/apps/server/AliasVault.Client/Main/Components/Items/ItemTypeSelector.razor
index 084af7083..a9fa0543e 100644
--- a/apps/server/AliasVault.Client/Main/Components/Items/ItemTypeSelector.razor
+++ b/apps/server/AliasVault.Client/Main/Components/Items/ItemTypeSelector.razor
@@ -20,19 +20,6 @@
@GetTypeDisplayName(SelectedType)
</span>
</div>
- @if (SelectedType == ItemType.Alias && !IsEditMode && OnRegenerateAlias.HasDelegate)
- {
- <button type="button"
- @onclick="HandleRegenerate"
- @onclick:preventDefault="true"
- class="relative flex-shrink-0 -my-1 p-1.5 text-primary-600 dark:text-primary-400 hover:text-primary-800 dark:hover:text-primary-300 hover:bg-primary-300 dark:hover:bg-primary-900/40 rounded transition-colors"
- title="@Localizer["RegenerateAlias"]">
- <svg class="w-4 h-4" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
- <path d="M23 4v6h-6"/>
- <path d="M20.49 15a9 9 0 1 1-2.12-9.36L23 10"/>
- </svg>
- </button>
- }
<div class="relative flex-1 flex items-center justify-end gap-1 min-w-0 pointer-events-none peer-hover:opacity-80 transition-opacity">
<span class="text-xs text-primary-600/80 dark:text-primary-400/80 truncate">
@SharedLocalizer["ItemTypeLabel"]
@@ -90,12 +77,6 @@
[Parameter]
public EventCallback<string> SelectedTypeChanged { get; set; }
- /// <summary>
- /// Whether we are in edit mode (disables type switching).
- /// </summary>
- [Parameter]
- public bool IsEditMode { get; set; }
-
/// <summary>
/// Whether the dropdown is currently shown.
/// </summary>
@@ -108,12 +89,6 @@
[Parameter]
public EventCallback<bool> ShowDropdownChanged { get; set; }
- /// <summary>
- /// Callback when regenerate alias button is clicked.
- /// </summary>
- [Parameter]
- public EventCallback OnRegenerateAlias { get; set; }
-
private async Task ToggleDropdown()
{
ShowDropdown = !ShowDropdown;
@@ -136,11 +111,6 @@
await CloseDropdown();
}
- private async Task HandleRegenerate()
- {
- await OnRegenerateAlias.InvokeAsync();
- }
-
private string GetTypeDisplayName(string itemType)
{
return itemType switch
diff --git a/apps/server/AliasVault.Client/Main/Pages/Items/AddEdit.razor b/apps/server/AliasVault.Client/Main/Pages/Items/AddEdit.razor
index 72f6d734f..63bdcfa47 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Items/AddEdit.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Items/AddEdit.razor
@@ -37,10 +37,8 @@ else
<ItemTypeSelector
SelectedType="@Obj.ItemType"
SelectedTypeChanged="HandleItemTypeChange"
- IsEditMode="@EditMode"
ShowDropdown="@ShowTypeDropdown"
- ShowDropdownChanged="@((show) => ShowTypeDropdown = show)"
- OnRegenerateAlias="@GenerateRandomAlias" />
+ ShowDropdownChanged="@((show) => ShowTypeDropdown = show)" />
@* 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">
diff --git a/apps/server/AliasVault.Client/Resources/Components/Main/Items/ItemTypeSelector.en.resx b/apps/server/AliasVault.Client/Resources/Components/Main/Items/ItemTypeSelector.en.resx
index 6ad9dd209..ffb86c6e5 100644
--- a/apps/server/AliasVault.Client/Resources/Components/Main/Items/ItemTypeSelector.en.resx
+++ b/apps/server/AliasVault.Client/Resources/Components/Main/Items/ItemTypeSelector.en.resx
@@ -47,10 +47,4 @@
<value>Editing</value>
<comment>Status text when editing an existing item</comment>
</data>
-
- <!-- Buttons -->
- <data name="RegenerateAlias">
- <value>Regenerate Alias</value>
- <comment>Tooltip for regenerate alias button</comment>
- </data>
</root>