Support phonetic name as sort key

nextcloud · Aug 8, 2020 · 3e82509 · 3e82509
1 parent 67e24f1
commit 3e82509
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/src/components/Settings/SettingsSortContacts.vue b/src/components/Settings/SettingsSortContacts.vue
@@ -57,6 +57,14 @@ export default {
 					label: t('contacts', 'Last name'),
 					key: 'lastName',
 				},
+				{
+					label: t('contacts', 'Phonetic first name'),
+					key: 'phoneticFirstName',
+				},
+				{
+					label: t('contacts', 'Phonetic last name'),
+					key: 'phoneticLastName',
+				},
 				{
 					label: t('contacts', 'Display name'),
 					key: 'displayName',

diff --git a/src/models/contact.js b/src/models/contact.js
@@ -398,6 +398,7 @@ export default class Contact {
 		if (orderKey && n && !isEmpty(n)) {
 			switch (orderKey) {
 			case 'firstName':
+			case 'phoneticFirstName':
 				// Stevenson;John;Philip,Paul;Dr.;Jr.,M.D.,A.C.P.
 				// -> John Stevenson
 				return n.slice(0, 2).reverse().join(' ')
@@ -459,6 +460,36 @@ export default class Contact {
 		return this.displayName
 	}
 
+	/**
+	 * Return the phonetic first name if exists
+	 * Returns the first name or displayName otherwise
+	 *
+	 * @readonly
+	 * @memberof Contact
+	 * @returns {string} phoneticFirstName|firstName|displayName
+	 */
+	get phoneticFirstName() {
+		if (this.vCard.hasProperty('x-phonetic-first-name')) {
+			return this.vCard.getFirstPropertyValue('x-phonetic-first-name')
+		}
+		return this.firstName
+	}
+
+	/**
+	 * Return the phonetic last name if exists
+	 * Returns the displayName otherwise
+	 *
+	 * @readonly
+	 * @memberof Contact
+	 * @returns {string} lastName|displayName
+	 */
+	get phoneticLastName() {
+		if (this.vCard.hasProperty('x-phonetic-last-name')) {
+			return this.vCard.getFirstPropertyValue('x-phonetic-last-name')
+		}
+		return this.lastName
+	}
+
 	/**
 	 * Return all the properties as Property objects
 	 *

diff --git a/src/store/addressbooks.js b/src/store/addressbooks.js
@@ -345,7 +345,8 @@ const actions = {
 	 */
 	async getContactsFromAddressBook(context, { addressbook }) {
 		return addressbook.dav
-			.findAllAndFilterBySimpleProperties(['EMAIL', 'UID', 'CATEGORIES', 'FN', 'ORG', 'N'])
+			.findAllAndFilterBySimpleProperties(['EMAIL', 'UID', 'CATEGORIES', 'FN', 'ORG', 'N',
+				'X-PHONETIC-FIRST-NAME', 'X-PHONETIC-LAST-NAME'])
 			.then((response) => {
 				// We don't want to lose the url information
 				// so we need to parse one by one