mirror of
https://github.com/zadam/trilium.git
synced 2025-10-30 02:59:03 +01:00
fix(react/dialogs): delete notes not properly reporting state
This commit is contained in:
parent
5cd7e4707a
commit
b25e9cdee6
@ -58,7 +58,7 @@ function DeleteNotesDialogComponent() {
|
|||||||
setBrokenRelations(response.brokenRelations);
|
setBrokenRelations(response.brokenRelations);
|
||||||
setNoteIdsToBeDeleted(response.noteIdsToBeDeleted);
|
setNoteIdsToBeDeleted(response.noteIdsToBeDeleted);
|
||||||
});
|
});
|
||||||
}, [ opts ]);
|
}, [ opts, deleteAllClones ]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Modal
|
<Modal
|
||||||
@ -113,17 +113,25 @@ function DeletedNotes({ noteIdsToBeDeleted }: { noteIdsToBeDeleted: DeleteNotesP
|
|||||||
});
|
});
|
||||||
}, [noteIdsToBeDeleted]);
|
}, [noteIdsToBeDeleted]);
|
||||||
|
|
||||||
return (
|
if (noteIdsToBeDeleted.length) {
|
||||||
<div className="delete-notes-list-wrapper">
|
return (
|
||||||
<h4>{t("delete_notes.notes_to_be_deleted", { notesCount: noteIdsToBeDeleted.length })}</h4>
|
<div className="delete-notes-list-wrapper">
|
||||||
|
<h4>{t("delete_notes.notes_to_be_deleted", { notesCount: noteIdsToBeDeleted.length })}</h4>
|
||||||
|
|
||||||
<ul className="delete-notes-list" style={{ maxHeight: "200px", overflow: "auto" }}>
|
<ul className="delete-notes-list" style={{ maxHeight: "200px", overflow: "auto" }}>
|
||||||
{noteLinks.map((link, index) => (
|
{noteLinks.map((link, index) => (
|
||||||
<li key={index} dangerouslySetInnerHTML={{ __html: link }} />
|
<li key={index} dangerouslySetInnerHTML={{ __html: link }} />
|
||||||
))}
|
))}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
} else {
|
||||||
|
return (
|
||||||
|
<Alert type="info">
|
||||||
|
{t("delete_notes.no_note_to_delete")}
|
||||||
|
</Alert>
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function BrokenRelations({ brokenRelations }: { brokenRelations: DeleteNotesPreview["brokenRelations"] }) {
|
function BrokenRelations({ brokenRelations }: { brokenRelations: DeleteNotesPreview["brokenRelations"] }) {
|
||||||
@ -161,11 +169,7 @@ function BrokenRelations({ brokenRelations }: { brokenRelations: DeleteNotesPrev
|
|||||||
</Alert>
|
</Alert>
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
return (
|
return <></>;
|
||||||
<Alert type="info">
|
|
||||||
{t("delete_notes.no_note_to_delete")}
|
|
||||||
</Alert>
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user