Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2026-09-01 19:49:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

web: fix diff viewer crashing the app

Browse Source
This commit is contained in:
Abdullah Atta
2023-12-11 14:41:40 +05:00
parent 288eca41f5
commit 998bbfb75c
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/web/src/components/diff-viewer/index.jsx
View File

@@ -73,10 +73,10 @@ function DiffViewer(props) {
});
}
notesStore.refresh();
await notesStore.refresh();
hashNavigate(`/notes/${conflictedNote.id}/edit`, { replace: true });
const conflictsCount = db.notes.conflicted?.length;
const conflictsCount = await db.notes.conflicted.count();
if (conflictsCount) {
showToast(
"success",
@@ -92,7 +92,7 @@ function DiffViewer(props) {
useEffect(() => {
(async function () {
let note = db.notes.note(noteId);
let note = await db.notes.note(noteId);
if (!note) {
hashNavigate(`/notes/create`, { replace: true });
return;
@@ -101,22 +101,21 @@ function DiffViewer(props) {
await openSession(noteId);
setIsEditorOpen(true);
note = note.data;
setConflictedNote(note);
const content = await db.content.raw(note.contentId);
const content = await db.content.get(note.contentId);
if (!content.conflicted)
return resolveConflict({
toKeep: content.data,
toKeepDateEdited: content.dateEdited
});
setConflictedNote(note);
setLocalContent({ ...content, conflicted: false });
setRemoteContent(content.conflicted);
setHtmlDiff({ before: content.data, after: content.conflicted.data });
})();
}, [noteId, openSession, setIsEditorOpen, resolveConflict]);
}, [noteId]);
if (!conflictedNote || !localContent || !remoteContent) return null;
return (