rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Skip data that might be corrupted

Browse Source
This commit is contained in:
Mo Bitar
2017-11-03 22:18:11 -05:00
parent 9923dacde7
commit 341c5d7dd7
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/javascripts/app/services/modelManager.js
View File

@@ -102,6 +102,12 @@ class ModelManager {
// first loop should add and process items // first loop should add and process items
for (var json_obj of items) { for (var json_obj of items) {
if((!json_obj.content_type || !json_obj.content) && !json_obj.deleted) {
// An item that is not deleted should never have empty content
console.error("Server response item is corrupt:", json_obj);
continue;
}
json_obj = _.omit(json_obj, omitFields || []) json_obj = _.omit(json_obj, omitFields || [])
var item = this.findItem(json_obj.uuid); var item = this.findItem(json_obj.uuid);
@@ -109,16 +115,16 @@ class ModelManager {
item.updateFromJSON(json_obj); item.updateFromJSON(json_obj);
} }
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.");
}
if(this.itemsPendingRemoval.includes(json_obj.uuid)) { if(this.itemsPendingRemoval.includes(json_obj.uuid)) {
_.pull(this.itemsPendingRemoval, json_obj.uuid); _.pull(this.itemsPendingRemoval, json_obj.uuid);
continue; 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);
}
if(json_obj.deleted == true || !_.includes(this.acceptableContentTypes, json_obj["content_type"])) { if(json_obj.deleted == true || !_.includes(this.acceptableContentTypes, json_obj["content_type"])) {
if(item) { if(item) {
allModels.push(item); allModels.push(item);