gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

delete preview takes into account strong/weak branches

Browse Source
This commit is contained in:
zadam 2022-12-24 13:15:19 +01:00
parent b6f7c604c7
commit 5a2907b670
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/components/tab_manager.js
View File

@ -413,7 +413,7 @@ export default class TabManager extends Component {
return; return;
} }
this.recentlyClosedTabs.push(noteContexts);console.log(this.recentlyClosedTabs); this.recentlyClosedTabs.push(noteContexts);
} }
tabReorderEvent({ntxIdsInOrder}) { tabReorderEvent({ntxIdsInOrder}) {

12
src/routes/api/notes.js
View File

@ -235,15 +235,19 @@ function getDeleteNotesPreview(req) {
const {branchIdsToDelete, deleteAllClones} = req.body; const {branchIdsToDelete, deleteAllClones} = req.body;
const noteIdsToBeDeleted = new Set(); const noteIdsToBeDeleted = new Set();
const branchCountToDelete = {}; // noteId => count (integer) const strongBranchCountToDelete = {}; // noteId => count (integer)
function branchPreviewDeletion(branch) { function branchPreviewDeletion(branch) {
branchCountToDelete[branch.branchId] = branchCountToDelete[branch.branchId] || 0; if (branch.isWeak) {
branchCountToDelete[branch.branchId]++; return;
}
strongBranchCountToDelete[branch.branchId] = strongBranchCountToDelete[branch.branchId] || 0;
strongBranchCountToDelete[branch.branchId]++;
const note = branch.getNote(); const note = branch.getNote();
if (deleteAllClones || note.getParentBranches().length <= branchCountToDelete[branch.branchId]) { if (deleteAllClones || note.getStrongParentBranches().length <= strongBranchCountToDelete[branch.branchId]) {
noteIdsToBeDeleted.add(note.noteId); noteIdsToBeDeleted.add(note.noteId);
for (const childBranch of note.getChildBranches()) { for (const childBranch of note.getChildBranches()) {