A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
web: fix wrong version saved on conflict resolve
Abdullah Attac1fa4d340020
diff --git a/apps/web/src/components/diff-viewer/content-toggle.tsx b/apps/web/src/components/diff-viewer/content-toggle.tsxindex be902cb88..e85f61b89 100644--- a/apps/web/src/components/diff-viewer/content-toggle.tsx+++ b/apps/web/src/components/diff-viewer/content-toggle.tsx@@ -26,7 +26,7 @@ type ContentToggle = {onToggle: () => void;label: string;dateEdited: number;- resolveConflict: (options: { saveCopy: boolean }) => void;+ resolveConflict: (saveCopy: boolean) => void;readonly: boolean;sx: FlexProps["sx"];};@@ -50,7 +50,7 @@ function ContentToggle(props: ContentToggle) {<Buttonvariant="accent"mr={2}- onClick={() => resolveConflict({ saveCopy: true })}+ onClick={() => resolveConflict(true)}p={1}px={2}>@@ -61,7 +61,7 @@ function ContentToggle(props: ContentToggle) {variant={isOtherSelected ? "error" : "accent"}onClick={() => {if (isOtherSelected) {- resolveConflict({ saveCopy: false });+ resolveConflict(false);} else {onToggle();}diff --git a/apps/web/src/components/diff-viewer/index.tsx b/apps/web/src/components/diff-viewer/index.tsxindex 64ecaef37..708b6c577 100644--- a/apps/web/src/components/diff-viewer/index.tsx+++ b/apps/web/src/components/diff-viewer/index.tsx@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/-import { useLayoutEffect, useRef, useState } from "react";+import { useCallback, useLayoutEffect, useRef, useState } from "react";import { Flex, Text, Button } from "@theme-ui/components";import { Copy, Restore } from "../icons";import ContentToggle from "./content-toggle";@@ -45,6 +45,24 @@ function DiffViewer(props: DiffViewerProps) {);const root = useRef<HTMLDivElement>(null);+ const onResolveContent = useCallback(+ (saveCopy: boolean) => {+ const toKeep =+ selectedContent === 1 ? session.content?.conflicted : session.content;+ const toCopy =+ selectedContent === 1 ? session.content : session.content?.conflicted;+ if (!toKeep) return;+ resolveConflict({+ note: session.note,+ toKeep,+ toCopy: saveCopy ? toCopy : undefined,+ toKeepDateEdited: toKeep.dateEdited,+ dateResolved: conflictedContent!.dateModified+ });+ },+ [conflictedContent, selectedContent, session.content, session.note]+ );+useLayoutEffect(() => {setConflictedContent((c) => {if (c?.dateEdited === session.content?.conflicted?.dateEdited) return c;@@ -185,15 +203,7 @@ function DiffViewer(props: DiffViewerProps) {isSelected={selectedContent === 0}isOtherSelected={selectedContent === 1}onToggle={() => setSelectedContent((s) => (s === 0 ? -1 : 0))}- resolveConflict={({ saveCopy }) => {- resolveConflict({- note: session.note,- toKeep: content.data,- toCopy: saveCopy ? conflictedContent : undefined,- toKeepDateEdited: content.dateEdited,- dateResolved: conflictedContent.dateModified- });- }}+ resolveConflict={onResolveContent}sx={{borderStyle: "solid",borderWidth: 0,@@ -263,15 +273,7 @@ function DiffViewer(props: DiffViewerProps) {<><ContentTogglereadonly={session.type === "diff"}- resolveConflict={({ saveCopy }) => {- resolveConflict({- note: session.note,- toKeep: conflictedContent.data,- toCopy: saveCopy ? content : undefined,- toKeepDateEdited: conflictedContent.dateEdited,- dateResolved: conflictedContent.dateModified- });- }}+ resolveConflict={onResolveContent}label={session.type === "diff"? "Current version"@@ -326,17 +328,18 @@ async function resolveConflict({dateResolved}: {note: Note;- toKeep: string;+ toKeep: ContentItem;toCopy?: ContentItem;toKeepDateEdited: number;dateResolved?: number;}) {await db.content.add({id: note.contentId,- data: toKeep,- type: "tiptap",dateResolved,- sessionId: `${Date.now()}`+ sessionId: `${Date.now()}`,+ ...(toKeep.locked+ ? { data: toKeep.data, locked: true }+ : { data: toKeep.data, locked: false })});await db.notes.add({