ContactProperty and FilterCondition use reviveFromJson

dev/Common/Enums.js

@@ -330,7 +330,7 @@ export const ContactPropertyType = {
 
 	FirstName: 15,
 	LastName: 16,
-	MiddleName: 16,
+	MiddleName: 17,
 	Nick: 18,
 
 	NamePrefix: 20,

dev/Model/Contact.js

@@ -1,5 +1,6 @@
 import ko from 'ko';
 
+import { ContactPropertyModel } from 'Model/ContactProperty';
 import { ContactPropertyType } from 'Common/Enums';
 import { pInt, pString } from 'Common/Utils';
 
@@ -56,17 +57,48 @@ class ContactModel extends AbstractModel {
 			contact.display = pString(json.display);
 			contact.readOnly = !!json.readOnly;
 
+			let list = [];
 			if (Array.isNotEmpty(json.properties)) {
 				json.Properties.forEach(property => {
-					if (property && property.Type && null != property.Value && null != property.TypeStr) {
+					property = ContactPropertyModel.reviveFromJson(property);
-						contact.properties.push([pInt(property.Type), pString(property.Value), pString(property.TypeStr)]);
+					property && list.push(property);
-					}
 				});
 			}
+			contact.properties = list;
+			contact.initDefaultProperties();
 		}
 		return contact;
 	}
 
+	initDefaultProperties() {
+		let list = this.properties;
+		list.sort((p1,p2) =>{
+			if (p2.type() == ContactPropertyType.FirstName) {
+				return 1;
+			}
+			if (p1.type() == ContactPropertyType.FirstName || p1.type() == ContactPropertyType.LastName) {
+				return -1;
+			}
+			if (p2.type() == ContactPropertyType.LastName) {
+				return 1;
+			}
+			return 0;
+		});
+		let found = list.find(prop => prop.type() == ContactPropertyType.LastName);
+		if (!found) {
+			found = new ContactPropertyModel(ContactPropertyType.LastName);
+			list.unshift(found);
+		}
+		found.placeholder('CONTACTS/PLACEHOLDER_ENTER_LAST_NAME');
+		found = list.find(prop => prop.type() == ContactPropertyType.FirstName);
+		if (!found) {
+			found = new ContactPropertyModel(ContactPropertyType.FirstName);
+			list.unshift(found);
+		}
+		found.placeholder('CONTACTS/PLACEHOLDER_ENTER_FIRST_NAME');
+		this.properties = list;
+	}
+
 	/**
 	 * @returns {string}
 	 */

dev/Model/ContactProperty.js

@@ -33,6 +33,17 @@ class ContactPropertyModel extends AbstractModel {
 
 		this.regDisposables([this.placeholderValue, this.largeValue]);
 	}
+
+	static reviveFromJson(json) {
+		const property = super.reviveFromJson(json);
+		if (property) {
+			property.type(pInt(property.type));
+			property.typeStr(pInt(property.typeStr));
+			property.value(pString(json.value));
+			return property;
+		}
+		return null;
+	}
 }
 
 export { ContactPropertyModel, ContactPropertyModel as default };

dev/Model/Email.js

@@ -289,15 +289,14 @@ class EmailModel extends AbstractModel {
 	 */
 	static reviveFromJson(json) {
 		const email = super.reviveFromJson(json);
-		if (email && email.email) {
+		if (email) {
-			email.name = json.Name.trim();
+			email.name = json.Name;
-			email.email = json.Email.trim();
+			email.email = json.Email;
-			email.dkimStatus = (json.DkimStatus || '').trim();
+			email.dkimStatus = (json.DkimStatus || '');
-			email.dkimValue = (json.DkimValue || '').trim();
+			email.dkimValue = (json.DkimValue || '');
 			email.clearDuplicateName();
-			return email;
 		}
-		return null;
+		return email;
 	}
 
 	/**

dev/Model/Filter.js

@@ -225,10 +225,7 @@ class FilterModel extends AbstractModel {
 
 			if (Array.isNotEmpty(json.Conditions)) {
 				filter.conditions(
-					json.Conditions.map(aData => {
+					json.Conditions.map(aData => FilterConditionModel.reviveFromJson(aData)).filter(v => v)
-						const filterCondition = new FilterConditionModel();
-						return filterCondition && filterCondition.parse(aData) ? filterCondition : null;
-					}).filter(v => v)
 				);
 			}
 

dev/Model/FilterCondition.js

@@ -56,17 +56,15 @@ class FilterConditionModel extends AbstractModel {
 		return true;
 	}
 
-	parse(json) {
+	static reviveFromJson(json) {
-		if (json && json.Field && json.Type) {
+		const filter = super.reviveFromJson(json);
-			this.field(pString(json.Field));
+		if (filter) {
-			this.type(pString(json.Type));
+			this.field(pString(json.field));
-			this.value(pString(json.Value));
+			this.type(pString(json.type));
-			this.valueSecond(pString(json.ValueSecond));
+			this.value(pString(json.value));
-
+			this.valueSecond(pString(json.valueSecond));
-			return true;
 		}
-
+		return filter;
-		return false;
 	}
 
 	toJson() {

dev/View/Popup/Contacts.js

@@ -489,10 +489,7 @@ class ContactsPopupView extends AbstractViewNext {
 	 * @param {?ContactModel} contact
 	 */
 	populateViewContact(contact) {
-		let id = '',
+		let id = '';
-			lastName = '',
-			firstName = '';
-		const list = [];
 
 		this.watchHash(false);
 
@@ -501,49 +498,18 @@ class ContactsPopupView extends AbstractViewNext {
 
 		if (contact) {
 			id = contact.id;
-			if (Array.isNotEmpty(contact.properties)) {
-				contact.properties.forEach(property => {
-					if (property && property[0]) {
-						if (ContactPropertyType.LastName === property[0]) {
-							lastName = property[1];
-						} else if (ContactPropertyType.FirstName === property[0]) {
-							firstName = property[1];
-						} else {
-							list.push(new ContactPropertyModel(property[0], property[2] || '', property[1]));
-						}
-					}
-				});
-			}
-
 			this.viewReadOnly(!!contact.readOnly);
+		} else {
+			contact = new ContactModel;
+			contact.initDefaultProperties();
 		}
 
-		list.unshift(
-			new ContactPropertyModel(
-				ContactPropertyType.LastName,
-				'',
-				lastName,
-				false,
-				this.getPropertyPlaceholder(ContactPropertyType.LastName)
-			)
-		);
-
-		list.unshift(
-			new ContactPropertyModel(
-				ContactPropertyType.FirstName,
-				'',
-				firstName,
-				!contact,
-				this.getPropertyPlaceholder(ContactPropertyType.FirstName)
-			)
-		);
-
 		this.viewID(id);
 
 		delegateRunOnDestroy(this.viewProperties());
 
 		this.viewProperties([]);
-		this.viewProperties(list);
+		this.viewProperties(contact.properties);
 
 		this.watchDirty(false);
 		this.watchHash(true);

snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php

@@ -151,14 +151,14 @@ class Property implements \JsonSerializable
 		// Simple hack
 		if ($this && $this->IsWeb())
 		{
-			$this->Value = \preg_replace('/(skype|ftp|http[s]?)\\\:\/\//i', '$1://', $this->Value);
+			$this->Value = \preg_replace('#(https?)\\\://#i', '$1://', $this->Value);
 		}
 		return array(
-			'@Object' => 'Object/Property',
+			'@Object' => 'Object/ContactProperty',
-			'IdProperty' => $this->IdProperty,
+			'id' => $this->IdProperty,
-			'Type' => $this->Type,
+			'type' => $this->Type,
-			'TypeStr' => $this->TypeStr,
+			'typeStr' => $this->TypeStr,
-			'Value' => \MailSo\Base\Utils::Utf8Clear($this->Value)
+			'value' => \MailSo\Base\Utils::Utf8Clear($this->Value)
 		));
 	}
 }

snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Classes/FilterCondition.php

@@ -91,11 +91,11 @@ class FilterCondition implements \JsonSerializable
 	public function jsonSerialize()
 	{
 		return array(
-//			'@Object' => 'Object/FilterCondition',
+			'@Object' => 'Object/FilterCondition',
-			'Field' => $this->Field(),
+			'field' => $this->Field(),
-			'Type' => $this->Type(),
+			'type' => $this->Type(),
-			'Value' => $this->Value(),
+			'value' => $this->Value(),
-			'ValueSecond' => $this->ValueSecond()
+			'valueSecond' => $this->ValueSecond()
 		);
 	}
 }