Skip to content

Voice-to-text dictation app with local (Nvidia Parakeet/Whisper) and cloud models (BYOK). Privacy-first and available cross-platform.

feat(folders): cascade delete notes with confirmation dialog

Gabriel Steindbe1b6ac239b
diff --git a/src/components/notes/PersonalNotesView.tsx b/src/components/notes/PersonalNotesView.tsx
index 9c1e75c86..9a0300df5 100644
--- a/src/components/notes/PersonalNotesView.tsx
+++ b/src/components/notes/PersonalNotesView.tsx
@@ -21,7 +21,15 @@ import {
DropdownMenuItem,
DropdownMenuSeparator,
} from "../ui/dropdown-menu";
-import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from "../ui/dialog";
+import {
+ ConfirmDialog,
+ Dialog,
+ DialogContent,
+ DialogHeader,
+ DialogTitle,
+ DialogFooter,
+} from "../ui/dialog";
+import { useDialogs } from "../../hooks/useDialogs";
import {
Select,
SelectTrigger,
@@ -166,6 +174,25 @@ export default function PersonalNotesView({
handleDeleteFolder,
} = useFolderManagement();
+ const { confirmDialog, showConfirmDialog, hideConfirmDialog } = useDialogs();
+
+ const requestDeleteFolder = useCallback(
+ (folder: { id: number; name: string }) => {
+ const count = folderCounts[folder.id] ?? 0;
+ showConfirmDialog({
+ title: t("notes.folders.deleteTitle"),
+ description:
+ count > 0
+ ? t("notes.folders.deleteDescription", { name: folder.name, count })
+ : t("notes.folders.deleteDescriptionEmpty", { name: folder.name }),
+ confirmText: t("notes.folders.deleteConfirm"),
+ variant: "destructive",
+ onConfirm: () => handleDeleteFolder(folder.id),
+ });
+ },
+ [folderCounts, handleDeleteFolder, showConfirmDialog, t]
+ );
+
const activeNote = notes.find((n) => n.id === activeNoteId) ?? null;
// Derive folder name and calendar event name for the metadata chips
@@ -748,7 +775,7 @@ export default function PersonalNotesView({
<DropdownMenuItem
onClick={(e) => {
e.stopPropagation();
- handleDeleteFolder(folder.id);
+ requestDeleteFolder(folder);
}}
className="text-xs gap-2 rounded-md px-2 py-1 text-destructive focus:text-destructive focus:bg-destructive/10"
>
@@ -1239,6 +1266,17 @@ export default function PersonalNotesView({
</DialogFooter>
</DialogContent>
</Dialog>
+
+ <ConfirmDialog
+ open={confirmDialog.open}
+ onOpenChange={(open) => !open && hideConfirmDialog()}
+ title={confirmDialog.title}
+ description={confirmDialog.description}
+ confirmText={confirmDialog.confirmText}
+ cancelText={confirmDialog.cancelText}
+ onConfirm={confirmDialog.onConfirm}
+ variant={confirmDialog.variant}
+ />
</div>
);
}
diff --git a/src/helpers/database.js b/src/helpers/database.js
index 286aba431..45992a006 100644
--- a/src/helpers/database.js
+++ b/src/helpers/database.js
@@ -899,20 +899,21 @@ class DatabaseManager {
const folder = this.db.prepare("SELECT * FROM folders WHERE id = ?").get(id);
if (!folder) return { success: false, error: "Folder not found" };
if (folder.is_default) return { success: false, error: "Cannot delete default folders" };
- const personal = this.db
- .prepare("SELECT id FROM folders WHERE name = 'Personal' AND is_default = 1")
- .get();
- const reassignNotes = this.db.prepare("UPDATE notes SET folder_id = ? WHERE folder_id = ?");
- const tombstone = this.db.prepare(
+ const noteIds = this.db
+ .prepare("SELECT id FROM notes WHERE folder_id = ?")
+ .all(id)
+ .map((row) => row.id);
+ const hardDeleteNotes = this.db.prepare("DELETE FROM notes WHERE folder_id = ?");
+ const tombstoneFolder = this.db.prepare(
"UPDATE folders SET deleted_at = datetime('now'), sync_status = 'pending', name = '__deleted_' || id || '_' || name WHERE id = ?"
);
- const hardDelete = this.db.prepare("DELETE FROM folders WHERE id = ?");
+ const hardDeleteFolder = this.db.prepare("DELETE FROM folders WHERE id = ?");
this.db.transaction(() => {
- if (personal) reassignNotes.run(personal.id, id);
- if (folder.cloud_id) tombstone.run(id);
- else hardDelete.run(id);
+ hardDeleteNotes.run(id);
+ if (folder.cloud_id) tombstoneFolder.run(id);
+ else hardDeleteFolder.run(id);
})();
- return { success: true, id };
+ return { success: true, id, noteIds };
} catch (error) {
debugLogger.error("Error deleting folder", { error: error.message }, "notes");
throw error;
diff --git a/src/helpers/ipcHandlers.js b/src/helpers/ipcHandlers.js
index e13511cc8..18a372cd7 100644
--- a/src/helpers/ipcHandlers.js
+++ b/src/helpers/ipcHandlers.js
@@ -972,11 +972,14 @@ class IPCHandlers {
const folderName = this._noteFilesEnabled ? this._getFolderName(id) : null;
const result = this.databaseManager.deleteFolder(id);
if (result?.success) {
+ for (const noteId of result.noteIds ?? []) {
+ this._asyncVectorDelete(noteId);
+ }
setImmediate(() => {
this.broadcastToWindows("folder-deleted", { id });
if (this._noteFilesEnabled && folderName) {
const markdownMirror = require("./markdownMirror");
- markdownMirror.deleteFolder(folderName, "Personal");
+ markdownMirror.deleteFolder(folderName);
}
});
}
diff --git a/src/helpers/markdownMirror.js b/src/helpers/markdownMirror.js
index e1ac47d1a..f1d6bc15f 100644
--- a/src/helpers/markdownMirror.js
+++ b/src/helpers/markdownMirror.js
@@ -159,18 +159,12 @@ class MarkdownMirror {
}
}
- deleteFolder(folderName, targetName) {
+ deleteFolder(folderName) {
if (!this._basePath) return;
try {
- const srcDir = path.join(this._basePath, folderName);
- const destDir = path.join(this._basePath, targetName || "Personal");
- fs.mkdirSync(destDir, { recursive: true });
- if (fs.existsSync(srcDir)) {
- const files = fs.readdirSync(srcDir);
- for (const file of files) {
- fs.renameSync(path.join(srcDir, file), path.join(destDir, file));
- }
- fs.rmdirSync(srcDir);
+ const dir = path.join(this._basePath, folderName);
+ if (fs.existsSync(dir)) {
+ fs.rmSync(dir, { recursive: true, force: true });
}
} catch (err) {
debugLogger.error(
diff --git a/src/locales/de/translation.json b/src/locales/de/translation.json
index 73cc47562..7bbb74e59 100644
--- a/src/locales/de/translation.json
+++ b/src/locales/de/translation.json
@@ -1720,7 +1720,11 @@
"folderName": "Ordnername",
"couldNotCreate": "Ordner konnte nicht erstellt werden",
"couldNotRename": "Ordner konnte nicht umbenannt werden",
- "couldNotDelete": "Ordner konnte nicht gelöscht werden"
+ "couldNotDelete": "Ordner konnte nicht gelöscht werden",
+ "deleteTitle": "Ordner löschen?",
+ "deleteDescription": "Dadurch werden \"{{name}}\" und {{count}} enthaltene Notiz(en) dauerhaft gelöscht. Diese Aktion kann nicht rückgängig gemacht werden.",
+ "deleteDescriptionEmpty": "Dadurch wird \"{{name}}\" dauerhaft gelöscht. Diese Aktion kann nicht rückgängig gemacht werden.",
+ "deleteConfirm": "Ordner und Notizen löschen"
},
"list": {
"title": "Notizen",
diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
index 789f738a0..6305cb0eb 100644
--- a/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@@ -1877,7 +1877,11 @@
"folderName": "Folder name",
"couldNotCreate": "Couldn't create folder",
"couldNotRename": "Couldn't rename folder",
- "couldNotDelete": "Couldn't delete folder"
+ "couldNotDelete": "Couldn't delete folder",
+ "deleteTitle": "Delete folder?",
+ "deleteDescription": "This will permanently delete \"{{name}}\" and its {{count}} note(s). This cannot be undone.",
+ "deleteDescriptionEmpty": "This will permanently delete \"{{name}}\". This cannot be undone.",
+ "deleteConfirm": "Delete folder and notes"
},
"list": {
"title": "Notes",
diff --git a/src/locales/es/translation.json b/src/locales/es/translation.json
index c8280eebe..a864e4648 100644
--- a/src/locales/es/translation.json
+++ b/src/locales/es/translation.json
@@ -1768,7 +1768,11 @@
"folderName": "Nombre de la carpeta",
"couldNotCreate": "No se pudo crear la carpeta",
"couldNotRename": "No se pudo renombrar la carpeta",
- "couldNotDelete": "No se pudo eliminar la carpeta"
+ "couldNotDelete": "No se pudo eliminar la carpeta",
+ "deleteTitle": "¿Eliminar carpeta?",
+ "deleteDescription": "Esto eliminará permanentemente \"{{name}}\" y sus {{count}} nota(s). Esta acción no se puede deshacer.",
+ "deleteDescriptionEmpty": "Esto eliminará permanentemente \"{{name}}\". Esta acción no se puede deshacer.",
+ "deleteConfirm": "Eliminar carpeta y notas"
},
"list": {
"title": "Notas",
diff --git a/src/locales/fr/translation.json b/src/locales/fr/translation.json
index caef4ff6c..c37f735e0 100644
--- a/src/locales/fr/translation.json
+++ b/src/locales/fr/translation.json
@@ -1829,7 +1829,11 @@
"folderName": "Nom du dossier",
"couldNotCreate": "Impossible de créer le dossier",
"couldNotRename": "Impossible de renommer le dossier",
- "couldNotDelete": "Impossible de supprimer le dossier"
+ "couldNotDelete": "Impossible de supprimer le dossier",
+ "deleteTitle": "Supprimer le dossier ?",
+ "deleteDescription": "Cette action supprimera définitivement \"{{name}}\" et ses {{count}} note(s). Cette action est irréversible.",
+ "deleteDescriptionEmpty": "Cette action supprimera définitivement \"{{name}}\". Cette action est irréversible.",
+ "deleteConfirm": "Supprimer le dossier et les notes"
},
"list": {
"title": "Notes",
diff --git a/src/locales/it/translation.json b/src/locales/it/translation.json
index a4b0fc9e6..2be44e591 100644
--- a/src/locales/it/translation.json
+++ b/src/locales/it/translation.json
@@ -1720,7 +1720,11 @@
"folderName": "Nome cartella",
"couldNotCreate": "Impossibile creare la cartella",
"couldNotRename": "Impossibile rinominare la cartella",
- "couldNotDelete": "Impossibile eliminare la cartella"
+ "couldNotDelete": "Impossibile eliminare la cartella",
+ "deleteTitle": "Eliminare la cartella?",
+ "deleteDescription": "Questa azione eliminerà definitivamente \"{{name}}\" e le sue {{count}} nota/e. Questa operazione non può essere annullata.",
+ "deleteDescriptionEmpty": "Questa azione eliminerà definitivamente \"{{name}}\". Questa operazione non può essere annullata.",
+ "deleteConfirm": "Elimina cartella e note"
},
"list": {
"title": "Note",
diff --git a/src/locales/ja/translation.json b/src/locales/ja/translation.json
index 0a349ee7d..7f8609551 100644
--- a/src/locales/ja/translation.json
+++ b/src/locales/ja/translation.json
@@ -1737,7 +1737,11 @@
"folderName": "フォルダ名",
"couldNotCreate": "フォルダを作成できませんでした",
"couldNotRename": "フォルダの名前を変更できませんでした",
- "couldNotDelete": "フォルダを削除できませんでした"
+ "couldNotDelete": "フォルダを削除できませんでした",
+ "deleteTitle": "フォルダを削除しますか?",
+ "deleteDescription": "「{{name}}」と {{count}} 件のノートを完全に削除します。この操作は取り消せません。",
+ "deleteDescriptionEmpty": "「{{name}}」を完全に削除します。この操作は取り消せません。",
+ "deleteConfirm": "フォルダとノートを削除"
},
"list": {
"title": "ノート",
diff --git a/src/locales/pt/translation.json b/src/locales/pt/translation.json
index 3a0826762..39f0475b5 100644
--- a/src/locales/pt/translation.json
+++ b/src/locales/pt/translation.json
@@ -1720,7 +1720,11 @@
"folderName": "Nome da pasta",
"couldNotCreate": "Não foi possível criar a pasta",
"couldNotRename": "Não foi possível renomear a pasta",
- "couldNotDelete": "Não foi possível excluir a pasta"
+ "couldNotDelete": "Não foi possível excluir a pasta",
+ "deleteTitle": "Excluir pasta?",
+ "deleteDescription": "Isso excluirá permanentemente \"{{name}}\" e suas {{count}} nota(s). Esta ação não pode ser desfeita.",
+ "deleteDescriptionEmpty": "Isso excluirá permanentemente \"{{name}}\". Esta ação não pode ser desfeita.",
+ "deleteConfirm": "Excluir pasta e notas"
},
"list": {
"title": "Notas",
diff --git a/src/locales/ru/translation.json b/src/locales/ru/translation.json
index bf98cd266..c19bbced0 100644
--- a/src/locales/ru/translation.json
+++ b/src/locales/ru/translation.json
@@ -1720,7 +1720,11 @@
"folderName": "Название папки",
"couldNotCreate": "Не удалось создать папку",
"couldNotRename": "Не удалось переименовать папку",
- "couldNotDelete": "Не удалось удалить папку"
+ "couldNotDelete": "Не удалось удалить папку",
+ "deleteTitle": "Удалить папку?",
+ "deleteDescription": "Это навсегда удалит «{{name}}» и {{count}} заметок в ней. Это действие нельзя отменить.",
+ "deleteDescriptionEmpty": "Это навсегда удалит «{{name}}». Это действие нельзя отменить.",
+ "deleteConfirm": "Удалить папку и заметки"
},
"list": {
"title": "Заметки",
diff --git a/src/locales/zh-CN/translation.json b/src/locales/zh-CN/translation.json
index 421dca61c..8ddba7635 100644
--- a/src/locales/zh-CN/translation.json
+++ b/src/locales/zh-CN/translation.json
@@ -1715,7 +1715,11 @@
"folderName": "文件夹名称",
"couldNotCreate": "无法创建文件夹",
"couldNotRename": "无法重命名文件夹",
- "couldNotDelete": "无法删除文件夹"
+ "couldNotDelete": "无法删除文件夹",
+ "deleteTitle": "删除文件夹?",
+ "deleteDescription": "这将永久删除「{{name}}」及其 {{count}} 条笔记。此操作无法撤销。",
+ "deleteDescriptionEmpty": "这将永久删除「{{name}}」。此操作无法撤销。",
+ "deleteConfirm": "删除文件夹和笔记"
},
"list": {
"title": "笔记",
diff --git a/src/locales/zh-TW/translation.json b/src/locales/zh-TW/translation.json
index 9a9d68929..592c03f52 100644
--- a/src/locales/zh-TW/translation.json
+++ b/src/locales/zh-TW/translation.json
@@ -1715,7 +1715,11 @@
"folderName": "資料夾名稱",
"couldNotCreate": "無法建立資料夾",
"couldNotRename": "無法重新命名資料夾",
- "couldNotDelete": "無法刪除資料夾"
+ "couldNotDelete": "無法刪除資料夾",
+ "deleteTitle": "刪除資料夾?",
+ "deleteDescription": "這將永久刪除「{{name}}」及其 {{count}} 則筆記。此操作無法復原。",
+ "deleteDescriptionEmpty": "這將永久刪除「{{name}}」。此操作無法復原。",
+ "deleteConfirm": "刪除資料夾和筆記"
},
"list": {
"title": "筆記",