Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-31 13:09:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge all Model JSON @Object parsers into a reviveFromJson()

Browse source
This commit is contained in:
djmaze 2020-10-18 19:46:47 +02:00
parent 76648f04ae
commit 15e07a73e9
18 changed files with 378 additions and 411 deletions
Download patch file Download diff file Expand all files Collapse all files

44
dev/Model/Filter.js
View file

@ -207,19 +207,24 @@ class FilterModel extends AbstractModel {
this.actionValueFourth(AccountStore.getEmailAddresses().join(', '));
}
parse(json) {
let result = false;
if (json && 'Object/Filter' === json['@Object']) {
this.id = pString(json.ID);
this.name(pString(json.Name));
this.enabled(!!json.Enabled);
/**
* @static
* @param {FetchJsonFilter} json
* @returns {?FilterModel}
*/
static reviveFromJson(json) {
const filter = super.reviveFromJson(json);
if (filter) {
filter.id = pString(json.ID);
filter.name(pString(json.Name));
filter.enabled(!!json.Enabled);
this.conditionsType(pString(json.ConditionsType));
filter.conditionsType(pString(json.ConditionsType));
this.conditions([]);
filter.conditions([]);
if (Array.isNotEmpty(json.Conditions)) {
this.conditions(
filter.conditions(
json.Conditions.map(aData => {
const filterCondition = new FilterConditionModel();
return filterCondition && filterCondition.parse(aData) ? filterCondition : null;
@ -227,21 +232,18 @@ class FilterModel extends AbstractModel {
);
}
this.actionType(pString(json.ActionType));
filter.actionType(pString(json.ActionType));
this.actionValue(pString(json.ActionValue));
this.actionValueSecond(pString(json.ActionValueSecond));
this.actionValueThird(pString(json.ActionValueThird));
this.actionValueFourth(pString(json.ActionValueFourth));
filter.actionValue(pString(json.ActionValue));
filter.actionValueSecond(pString(json.ActionValueSecond));
filter.actionValueThird(pString(json.ActionValueThird));
filter.actionValueFourth(pString(json.ActionValueFourth));
this.actionNoStop(!json.Stop);
this.actionKeep(!!json.Keep);
this.actionMarkAsRead(!!json.MarkAsRead);
result = true;
filter.actionNoStop(!json.Stop);
filter.actionKeep(!!json.Keep);
filter.actionMarkAsRead(!!json.MarkAsRead);
}
return result;
return filter;
}
cloneSelf() {