Add label for getDiffProp comparison

getodk · Oct 24, 2023 · fe03ef4 · fe03ef4
1 parent 9d1bbd7
commit fe03ef4
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/lib/data/entity.js b/lib/data/entity.js
@@ -373,11 +373,9 @@ const getWithConflictDetails = (defs) => {
     if (v.version > 1) { // v.root is false here - can use either
       const conflict = v.version !== (v.baseVersion + 1);
 
-      v.baseDiff = getDiffProp(v.dataReceived, defMap.get(v.baseVersion).data);
-      if ('label' in v.dataReceived && v.dataReceived.label !== defMap.get(v.baseVersion).label) v.baseDiff.push('label');
+      v.baseDiff = getDiffProp(v.dataReceived, { ...defMap.get(v.baseVersion).data, label: defMap.get(v.baseVersion).label });
 
-      v.serverDiff = getDiffProp(v.dataReceived, defMap.get(v.version - 1).data);
-      if ('label' in v.dataReceived && v.dataReceived.label !== defMap.get(v.version - 1).label) v.serverDiff.push('label');
+      v.serverDiff = getDiffProp(v.dataReceived, { ...defMap.get(v.version - 1).data, label: defMap.get(v.version - 1).label });
 
       if (conflict) {
         v.conflict = v.conflictingProp && v.conflictingProp.length > 0 ? ConflictType.HARD : ConflictType.SOFT;