fix: content comparison

Author: farnabaz

src/app/src/utils/database.ts

@@ -35,7 +35,7 @@ export function isEqual(document1: DatabasePageItem, document2: DatabasePageItem
     }
   }
 
-  if (JSON.stringify(documentData1) !== JSON.stringify(documentData2)) {
+  if (!isDeepEqual(refineDocumentData(documentData1), refineDocumentData(documentData2))) {
     return false
   }
 
@@ -49,3 +49,34 @@ export function isEqual(document1: DatabasePageItem, document2: DatabasePageItem
 
   return true
 }
+
+function refineDocumentData(doc: Record<string, unknown>) {
+  if (doc.seo) {
+    const seo = doc.seo as Record<string, unknown>
+    doc.seo = {
+      ...seo,
+      title: seo.title || doc.title,
+      description: seo.description || doc.description,
+    }
+  }
+  // documents with same id are being compared, so it is safe to remove `path` and `__hash__`
+  Reflect.deleteProperty(doc, '__hash__')
+  Reflect.deleteProperty(doc, 'path')
+  return doc
+}
+
+function isDeepEqual(obj1: Record<string, unknown>, obj2: Record<string, unknown>) {
+  if (typeof obj1 !== 'object' || typeof obj2 !== 'object') return obj1 === obj2
+
+  const keys1 = Object.keys(obj1).filter(k => obj1[k] != null)
+  const keys2 = Object.keys(obj2).filter(k => obj2[k] != null)
+
+  if (keys1.length !== keys2.length) return false
+
+  for (const key of keys1) {
+    if (!keys2.includes(key)) continue // Ignore missing null/undefined fields
+    if (!isDeepEqual(obj1[key] as Record<string, unknown>, obj2[key] as Record<string, unknown>)) return false
+  }
+
+  return true
+}

src/app/src/utils/draft.ts

@@ -2,7 +2,7 @@ import type { DatabaseItem, MediaItem, DatabasePageItem, DraftItem, BaseItem, Co
 import { DraftStatus, ContentFileExtension, TreeRootId } from '../types'
 import { isEqual } from './database'
 import { studioFlags } from '../composables/useStudio'
-import { generateContentFromDocument } from './content'
+import { generateContentFromDocument, generateDocumentFromContent } from './content'
 import { fromBase64ToUTF8 } from '../utils/string'
 
 export async function checkConflict(draftItem: DraftItem<DatabaseItem | MediaItem>): Promise<ContentConflict | undefined> {
@@ -28,6 +28,11 @@ export async function checkConflict(draftItem: DraftItem<DatabaseItem | MediaIte
 
   const localContent = await generateContentFromDocument(draftItem.original as DatabaseItem) as string
   const githubContent = fromBase64ToUTF8(draftItem.githubFile.content)
+  const githubDocument = await generateDocumentFromContent(draftItem.id, githubContent) as DatabaseItem
+
+  if (isEqual(draftItem.original as DatabasePageItem, githubDocument as DatabasePageItem)) {
+    return
+  }
 
   if (localContent.trim() === githubContent.trim()) {
     return