Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-23 15:09:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: recursive conflicts

Browse Source
This commit is contained in:
thecodrr
2021-12-31 09:55:12 +05:00
parent 82e61ae524
commit 304f68c345
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
apps/web/src/components/diff-viewer/index.js
View File

@@ -52,23 +52,24 @@ function DiffViewer(props) {
const [htmlDiff, setHtmlDiff] = useState({});
const resolveConflict = useCallback(
async ({ toKeep, toCopy, toKeepDateEdited, dateResolved }) => {
async ({ toKeep, toCopy, toKeepDateModified, dateResolved }) => {
if (!conflictedNote) return;
const toKeepContent = {
data: toKeep,
type: "tiny",
dateEdited: toKeepDateEdited,
dateResolved,
persistDateEdited: true,
};
await db.notes.add({
id: conflictedNote.id,
content: toKeepContent,
conflicted: false,
});
await db.content.add({
id: conflictedNote.contentId,
data: toKeep,
type: "tiny",
dateModified: toKeepDateModified,
dateResolved,
conflicted: false,
sessionId: Date.now(),
});
if (toCopy) {
const toCopyContent = {
data: toCopy,
@@ -115,7 +116,7 @@ function DiffViewer(props) {
if (!content.conflicted)
return resolveConflict({
toKeep: content.data,
dateEdited: content.dateEdited,
toKeepDateModified: content.dateModified,
});
content.conflicted = await db.content.insertPlaceholders(
@@ -279,8 +280,8 @@ function DiffViewer(props) {
resolveConflict({
toKeep: remoteContent.data,
toCopy: saveCopy ? localContent.data : null,
toKeepDateEdited: localContent.dateEdited,
dateResolved: remoteContent.dateEdited,
toKeepDateModified: localContent.dateModified,
dateResolved: remoteContent.dateModified,
});
}}
sx={{
@@ -321,8 +322,8 @@ function DiffViewer(props) {
resolveConflict({
toKeep: localContent.data,
toCopy: saveCopy ? remoteContent.data : null,
toKeepDateEdited: remoteContent.dateEdited,
dateResolved: remoteContent.dateEdited,
toKeepDateModified: remoteContent.dateModified,
dateResolved: remoteContent.dateModified,
});
}}
label="Incoming note"