Resolve relationships for duplicate items, rename contentObject to content in mapping function

app/assets/javascripts/app/services/modelManager.js

@@ -9,7 +9,10 @@ class ModelManager {
     this.itemsPendingRemoval = [];
     this.items = [];
     this._extensions = [];
-    this.acceptableContentTypes = ["Note", "Tag", "Extension", "SN|Editor", "SN|Theme", "SN|Component", "SF|Extension"];
+    this.acceptableContentTypes = [
+      "Note", "Tag", "Extension", "SN|Editor", "SN|Theme",
+      "SN|Component", "SF|Extension", "SN|UserPreferences"
+    ];
   }
 
   resetLocalMemory() {
@@ -120,11 +123,6 @@ class ModelManager {
         continue;
       }
 
-      if(!json_obj.content && !item) {
-        // A new incoming item must have a content field. If not, something has set an invalid state.
-        console.error("Content is missing for new item.", json_obj);
-      }
-
       var unknownContentType = !_.includes(this.acceptableContentTypes, json_obj["content_type"]);
       if(json_obj.deleted == true || unknownContentType) {
         if(item && !unknownContentType) {
@@ -217,6 +215,12 @@ class ModelManager {
     return item;
   }
 
+  createDuplicateItem(itemResponse, sourceItem) {
+    var dup = this.createItem(itemResponse);
+    this.resolveReferencesForItem(dup);
+    return dup;
+  }
+
   addItems(items) {
     items.forEach(function(item){
       if(item.content_type == "Tag") {

app/assets/javascripts/app/services/syncManager.js

@@ -390,7 +390,7 @@ class SyncManager {
         // We want a new uuid for the new item. Note that this won't neccessarily adjust references.
         itemResponse.uuid = null;
 
-        var dup = this.modelManager.createItem(itemResponse);
+        var dup = this.modelManager.createDuplicateItem(itemResponse, item);
         if(!itemResponse.deleted && JSON.stringify(item.structureParams()) !== JSON.stringify(dup.structureParams())) {
           this.modelManager.addItem(dup);
           dup.conflict_of = item.uuid;