Skip to content

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

Simplify virtual folder management flow (#2159)

Leendert de Borstf56765209823
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Folders/DeleteFolderModal.tsx b/apps/browser-extension/src/entrypoints/popup/components/Folders/DeleteFolderModal.tsx
index 425ff57b5..6b23fac6a 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Folders/DeleteFolderModal.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Folders/DeleteFolderModal.tsx
@@ -9,7 +9,6 @@ type DeleteFolderModalProps = {
onDeleteFolderOnly: () => Promise<void>;
onDeleteFolderAndContents: () => Promise<void>;
itemCount: number;
- virtualFolder?: boolean;
};
/**
@@ -20,8 +19,7 @@ const DeleteFolderModal: React.FC<DeleteFolderModalProps> = ({
onClose,
onDeleteFolderOnly,
onDeleteFolderAndContents,
- itemCount,
- virtualFolder = false
+ itemCount
}) => {
const { t } = useTranslation();
const [isSubmitting, setIsSubmitting] = useState(false);
@@ -84,69 +82,60 @@ const DeleteFolderModal: React.FC<DeleteFolderModalProps> = ({
}
>
<div className="space-y-4">
- {/* A virtual folder (today: a shared manifest): no delete options, only the hint */}
- {virtualFolder && (
- <p className="pt-2 text-sm text-gray-600 dark:text-gray-400">
- {t('items.deleteSharedFolderHint')}
- </p>
- )}
-
{/* Option buttons */}
- {!virtualFolder && (
- <div className="space-y-3 pt-2">
- {/* Delete folder only - move items to root */}
+ <div className="space-y-3 pt-2">
+ {/* Delete folder only - move items to root */}
+ <button
+ type="button"
+ onClick={handleDeleteFolderOnly}
+ disabled={isSubmitting}
+ className="w-full p-3 text-left border border-gray-300 dark:border-gray-600 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-700 transition-colors disabled:opacity-50"
+ >
+ <div className="flex items-start gap-3">
+ <div className="mt-0.5 text-orange-500">
+ <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+ <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z" />
+ <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M9 14l2 2 4-4" />
+ </svg>
+ </div>
+ <div>
+ <p className="font-medium text-gray-900 dark:text-white">
+ {t('items.deleteFolderKeepItems')}
+ </p>
+ <p className="text-sm text-gray-500 dark:text-gray-400">
+ {t('items.deleteFolderKeepItemsDescription')}
+ </p>
+ </div>
+ </div>
+ </button>
+
+ {/* Delete folder and contents */}
+ {itemCount > 0 && (
<button
type="button"
- onClick={handleDeleteFolderOnly}
+ onClick={handleDeleteFolderAndContents}
disabled={isSubmitting}
- className="w-full p-3 text-left border border-gray-300 dark:border-gray-600 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-700 transition-colors disabled:opacity-50"
+ className="w-full p-3 text-left border border-red-300 dark:border-red-700 rounded-lg hover:bg-red-50 dark:hover:bg-red-900/20 transition-colors disabled:opacity-50"
>
<div className="flex items-start gap-3">
- <div className="mt-0.5 text-orange-500">
+ <div className="mt-0.5 text-red-500">
<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
- <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z" />
- <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M9 14l2 2 4-4" />
+ <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>
</div>
<div>
- <p className="font-medium text-gray-900 dark:text-white">
- {t('items.deleteFolderKeepItems')}
+ <p className="font-medium text-red-600 dark:text-red-400">
+ {t('items.deleteFolderAndItems')}
</p>
<p className="text-sm text-gray-500 dark:text-gray-400">
- {t('items.deleteFolderKeepItemsDescription')}
+ {t('items.deleteFolderAndItemsDescription', { count: itemCount })}
</p>
</div>
</div>
</button>
-
- {/* Delete folder and contents */}
- {itemCount > 0 && (
- <button
- type="button"
- onClick={handleDeleteFolderAndContents}
- disabled={isSubmitting}
- className="w-full p-3 text-left border border-red-300 dark:border-red-700 rounded-lg hover:bg-red-50 dark:hover:bg-red-900/20 transition-colors disabled:opacity-50"
- >
- <div className="flex items-start gap-3">
- <div className="mt-0.5 text-red-500">
- <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>
- </div>
- <div>
- <p className="font-medium text-red-600 dark:text-red-400">
- {t('items.deleteFolderAndItems')}
- </p>
- <p className="text-sm text-gray-500 dark:text-gray-400">
- {t('items.deleteFolderAndItemsDescription', { count: itemCount })}
- </p>
- </div>
- </div>
- </button>
- )}
- </div>
- )}
+ )}
+ </div>
</div>
</ModalWrapper>
);
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 00ee986f8..7036e6ea0 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
@@ -1177,7 +1177,6 @@ const ItemsList: React.FC = () => {
onDeleteFolderOnly={handleDeleteFolderOnly}
onDeleteFolderAndContents={handleDeleteFolderAndContents}
itemCount={totalItemCountInFolderTree}
- virtualFolder={currentFolderIsVirtual}
/>
</div>
);
diff --git a/apps/browser-extension/src/i18n/locales/en.json b/apps/browser-extension/src/i18n/locales/en.json
index b9ae2e5e1..be1b228fc 100644
--- a/apps/browser-extension/src/i18n/locales/en.json
+++ b/apps/browser-extension/src/i18n/locales/en.json
@@ -236,7 +236,6 @@
"deleteFolderKeepItemsDescription": "Items will be moved to the parent folder.",
"deleteFolderAndItems": "Delete folder and all items",
"deleteFolderAndItemsDescription": "{{count}} item(s) will be moved to Recently Deleted.",
- "deleteSharedFolderHint": "This folder is shared with your family and cannot be deleted here. Leave it, or change who has access to it, in Family Sharing.",
"filters": {
"folders": "Folders",
"totp": "2FA Codes"
diff --git a/apps/browser-extension/src/platform/ExtensionPlatform.ts b/apps/browser-extension/src/platform/ExtensionPlatform.ts
index 0f08c855e..3733e1085 100644
--- a/apps/browser-extension/src/platform/ExtensionPlatform.ts
+++ b/apps/browser-extension/src/platform/ExtensionPlatform.ts
@@ -45,7 +45,6 @@ function detectClientName(): 'chrome' | 'firefox' | 'edge' | 'safari' | 'browser
*/
const TRANSLATION_KEYS: Record<TranslatableMessage, string> = {
[TranslatableMessage.ClientOutdated]: 'common.errors.browserExtensionOutdated',
- [TranslatableMessage.SharedFolderDeleteRefused]: 'items.deleteSharedFolderHint',
[TranslatableMessage.VaultUpgradeRequired]: 'content.vaultUpgradeRequired',
};
diff --git a/apps/mobile-app/i18n/locales/en.json b/apps/mobile-app/i18n/locales/en.json
index e9d76726d..564f70d6a 100644
--- a/apps/mobile-app/i18n/locales/en.json
+++ b/apps/mobile-app/i18n/locales/en.json
@@ -626,7 +626,6 @@
"deleteFolderKeepItemsDescription": "Items will be moved to the parent folder.",
"deleteFolderAndItems": "Delete folder and all items",
"deleteFolderAndItemsDescription": "{{count}} item(s) will be moved to Recently Deleted.",
- "deleteSharedFolderHint": "This folder is shared with your family and cannot be deleted here. Leave it, or change who has access to it, in Family Sharing.",
"emptyFolderHint": "This folder is empty. To move items to this folder, edit the item and select this folder.",
"selectFolder": "Select Folder"
},
diff --git a/apps/mobile-app/platform/MobilePlatform.ts b/apps/mobile-app/platform/MobilePlatform.ts
index a89ffe6eb..a17508913 100644
--- a/apps/mobile-app/platform/MobilePlatform.ts
+++ b/apps/mobile-app/platform/MobilePlatform.ts
@@ -12,7 +12,6 @@ import { MobileAppIdentity } from '@/utils/AppInfo';
*/
const TRANSLATION_KEYS: Record<TranslatableMessage, string> = {
[TranslatableMessage.ClientOutdated]: 'vault.errors.appOutdated',
- [TranslatableMessage.SharedFolderDeleteRefused]: 'items.folders.deleteSharedFolderHint',
[TranslatableMessage.VaultUpgradeRequired]: 'vault.errors.vaultOutdated',
};
diff --git a/core/client/src/database/repositories/FolderRepository.ts b/core/client/src/database/repositories/FolderRepository.ts
index 4bc61dc1b..49f5d9243 100644
--- a/core/client/src/database/repositories/FolderRepository.ts
+++ b/core/client/src/database/repositories/FolderRepository.ts
@@ -1,5 +1,3 @@
-import { getPlatform } from '../../platform/ClientPlatform';
-import { TranslatableMessage } from '../../platform/TranslatableMessage';
import { multiManifestRendering } from '../../sharing/MultiManifestRendering';
import { BaseRepository } from '../BaseRepository';
import { FolderQueries } from '../queries/FolderQueries';
@@ -90,7 +88,7 @@ export class FolderRepository extends BaseRepository {
* @returns The number of rows updated
*/
public async update(ref: FolderRef, name: string): Promise<number> {
- await this.assertNotVirtual(ref);
+ this.assertNotVirtual(ref);
return this.withTransaction(() => this.run(this.execute(FolderQueries.UPDATE_NAME, [name, this.now(), ref.Id, ref.ManifestId])));
}
@@ -125,7 +123,7 @@ export class FolderRepository extends BaseRepository {
* @returns The number of rows updated
*/
public async delete(ref: FolderRef): Promise<number> {
- await this.assertNotVirtual(ref);
+ this.assertNotVirtual(ref);
return this.withTransaction(() => this.run(this.deleteKeepingContents(ref)));
}
@@ -166,7 +164,7 @@ export class FolderRepository extends BaseRepository {
* @returns The number of items trashed
*/
public async deleteWithContents(ref: FolderRef): Promise<number> {
- await this.assertNotVirtual(ref);
+ this.assertNotVirtual(ref);
return this.withTransaction(() => this.run(this.deleteFolderTree(ref)));
}
@@ -196,12 +194,12 @@ export class FolderRepository extends BaseRepository {
/**
* Refuse to change or delete a virtual folder (see {@link multiManifestRendering}): the vault stores no row for
- * one, setting are managed elsewhere (e.g. shared manifest settings).
+ * one, settings are managed elsewhere (e.g. shared manifest settings).
* @param ref - The folder about to be changed
*/
- private async assertNotVirtual(ref: FolderRef): Promise<void> {
+ private assertNotVirtual(ref: FolderRef): void {
if (multiManifestRendering.isVirtualFolder(ref)) {
- throw new Error(await getPlatform().translate(TranslatableMessage.SharedFolderDeleteRefused));
+ throw new Error(`FolderRepository: folder ${ref.Id} is virtual and cannot be changed or deleted; refusing the write.`);
}
}
}
diff --git a/core/client/src/platform/TranslatableMessage.ts b/core/client/src/platform/TranslatableMessage.ts
index 2c1991280..27652d0bc 100644
--- a/core/client/src/platform/TranslatableMessage.ts
+++ b/core/client/src/platform/TranslatableMessage.ts
@@ -7,9 +7,6 @@ export enum TranslatableMessage {
/** The local vault is newer than what this client understands; the app must be updated. */
ClientOutdated = 'client-outdated',
- /** The folder a shared vault is shown as cannot be deleted from the folder list. */
- SharedFolderDeleteRefused = 'shared-folder-delete-refused',
-
/** The vault still has to walk the sqlite-blob upgrade chain before the manifest migration can run. */
VaultUpgradeRequired = 'vault-upgrade-required',
}