From a1561dfe3a728f3b636852df05d36c1947883dd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Wed, 30 Jan 2019 11:16:29 +0100
Subject: [PATCH 1/2] Add property-defined actions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 css/Properties/Properties.scss                | 41 ++++++++++---------
 css/icons.scss                                |  4 ++
 img/up.svg                                    |  3 ++
 package-lock.json                             |  8 ++--
 src/components/ContactDetails.vue             |  4 +-
 .../ContactDetails/ContactDetailsProperty.vue | 12 +++++-
 .../Properties/PropertyDateTime.vue           |  5 +--
 .../Properties/PropertyMultipleText.vue       |  5 +--
 src/components/Properties/PropertySelect.vue  |  5 +--
 src/components/Properties/PropertyText.vue    | 11 +----
 src/main.js                                   |  3 +-
 src/mixins/PropertyMixin.js                   | 11 +++++
 src/models/rfcProps.js                        | 23 +++++++++--
 src/services/checks/missingFN.js              |  4 ++
 src/store/contacts.js                         |  4 ++
 15 files changed, 95 insertions(+), 48 deletions(-)
 create mode 100644 img/up.svg

diff --git a/css/Properties/Properties.scss b/css/Properties/Properties.scss
index 55ad6c999..a777054f8 100644
--- a/css/Properties/Properties.scss
+++ b/css/Properties/Properties.scss
@@ -26,8 +26,8 @@ $property-value-max-width: 250px;
 .property {
 	@include generate-grid-span(1);
 	position: relative;
-	padding-right: 44px; // delete button
-	// we need this to keep the alignment of the ext and delete button
+	padding-right: 44px; // actions menu / button
+	// we need this to keep the alignment of the ext and delete/action button
 	// The flex grow will never go over those values. Therefore we can set
 	// the max width and keep the right alignment
 	max-width: $property-label-max-width + $property-value-max-width + 44px;
@@ -37,8 +37,8 @@ $property-value-max-width: 250px;
 	&--last {
 		margin-bottom: $grid-height-unit;
 	}
-	// no delete icon on addressbook selector
-	&--addressbooks &__delete {
+	// no delete/action icon on addressbook selector
+	&--addressbooks &__actions {
 		display: none !important;
 	}
 		
@@ -132,17 +132,15 @@ $property-value-max-width: 250px;
 			&:hover,
 			&:focus,
 			&:active {
-				~ .property__ext, 
-				~ .property__delete {
+				~ .property__ext {
 					opacity: .5;
 				}
 			}
 		}
 	}
 
-	// show ext & delete button on full row hover
-	&:hover &__ext,
-	&:hover &__delete {
+	// show ext button on full row hover
+	&:hover &__ext{
 		opacity: .5;
 	}
 
@@ -156,28 +154,31 @@ $property-value-max-width: 250px;
 		&:focus,
 		&:active {
 			opacity: .7;
-			// still show the delete button for keyboard accessibility
-			~ .property__delete {
-				opacity: .5;
-			}
 		}
 	}
 	
-	// Delete property button
-	&__delete {
-		position: absolute;
+	// Delete property button + actions
+	&__actions {
+		position: absolute !important;
 		top: 0;
 		left: 100%;
-		width: $grid-height-unit;
-		height: $grid-height-unit;
 		margin: 0;
+		margin-top: -3px; // align with line because of the 44x44px size
 		border: 0;
 		background-color: transparent;
-		opacity: 0;
+		z-index: 10;
+		// opacity applies on the single action OR 
+		&:not(.action-item--multiple),
+		&.action-item--multiple .icon-more {
+			opacity: 0.5;
+		}
 		&:hover,
 		&:active,
 		&:focus {
-			opacity: .7;
+			&:not(.action-item--multiple),
+			&.action-item--multiple .icon-more {
+				opacity: 0.7;
+			}
 		}
 	}
 }
diff --git a/css/icons.scss b/css/icons.scss
index 5549a1625..41cc93b39 100644
--- a/css/icons.scss
+++ b/css/icons.scss
@@ -35,3 +35,7 @@
 .icon-eye-white {
 	@include icon-color('eye', 'contacts', $color-white, 1);
 }
+
+.icon-up {
+	@include icon-color('up', 'contacts', $color-black, 1);
+}
diff --git a/img/up.svg b/img/up.svg
new file mode 100644
index 000000000..fa3ecbb1d
--- /dev/null
+++ b/img/up.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+  <path d="M10 15H6V8H1l7-7 7 7h-5z"/>
+</svg>
diff --git a/package-lock.json b/package-lock.json
index 597691c06..b77bc8777 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2042,7 +2042,7 @@
     },
     "cdav-library": {
       "version": "github:nextcloud/cdav-library#37cfc379b050deff8cb15407d5652098c350bff0",
-      "from": "github:nextcloud/cdav-library#37cfc379b050deff8cb15407d5652098c350bff0",
+      "from": "github:nextcloud/cdav-library",
       "requires": {
         "@babel/polyfill": "^7.2.5"
       }
@@ -10242,9 +10242,9 @@
       "dev": true
     },
     "vue2-datepicker": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/vue2-datepicker/-/vue2-datepicker-2.8.0.tgz",
-      "integrity": "sha512-IQw/ai04WYGZC4P7toLhryBHhrqc1hCJ3ivgEayXfeDD1EjJnIhUMb4nqo2JvRG72nPqc9HJvHM/66K+AZnjUA==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/vue2-datepicker/-/vue2-datepicker-2.9.0.tgz",
+      "integrity": "sha512-THS5uCcWAPSU8OAqeie+Jie+7aw23WVbptfR5x1A8YFn4IizgWvttXoLpgwKmwwuJ59O36eoY0aeP/ugsK1RCQ==",
       "requires": {
         "fecha": "^2.3.3"
       }
diff --git a/src/components/ContactDetails.vue b/src/components/ContactDetails.vue
index ab55c2218..1bc9b3cf4 100644
--- a/src/components/ContactDetails.vue
+++ b/src/components/ContactDetails.vue
@@ -95,9 +95,11 @@
 			<section v-else class="contact-details">
 				<!-- properties iteration -->
 				<!-- using contact.key in the key and index as key to avoid conflicts between similar data and exact key -->
+				<!-- passing the debounceUpdateContact so that the contact-property component contains the function
+					and allow us to use it on the rfcProps since the scope is forwarded to the actions -->
 				<contact-property v-for="(property, index) in sortedProperties" :key="`${index}-${contact.key}-${property.name}`" :index="index"
 					:sorted-properties="sortedProperties" :property="property" :contact="contact"
-					@updatedcontact="debounceUpdateContact" />
+					:update-contact="debounceUpdateContact" @updatedcontact="debounceUpdateContact" />
 
 				<!-- addressbook change select - no last property because class is not applied here,
 					empty property because this is a required prop on regular property-select. But since
diff --git a/src/components/ContactDetails/ContactDetailsProperty.vue b/src/components/ContactDetails/ContactDetailsProperty.vue
index f6bab167d..35db50321 100644
--- a/src/components/ContactDetails/ContactDetailsProperty.vue
+++ b/src/components/ContactDetails/ContactDetailsProperty.vue
@@ -61,6 +61,14 @@ export default {
 		contact: {
 			type: Contact,
 			default: null
+		},
+		/**
+		 * This is needed so that we can update
+		 * the contact within the rfcProps actions
+		 */
+		updateContact: {
+			type: Function,
+			default: () => {}
 		}
 	},
 
@@ -139,7 +147,9 @@ export default {
 		 * @returns {Object}
 		 */
 		propModel() {
-			return this.properties[this.propName]
+			// passing this to properties to allow us to scope the properties object
+			// this make possible defining actions there
+			return this.properties(this)[this.propName]
 		},
 
 		/**
diff --git a/src/components/Properties/PropertyDateTime.vue b/src/components/Properties/PropertyDateTime.vue
index 96c72f583..ff2df7e8d 100644
--- a/src/components/Properties/PropertyDateTime.vue
+++ b/src/components/Properties/PropertyDateTime.vue
@@ -43,9 +43,8 @@
 				{{ propModel.readableName }}
 			</div>
 
-			<!-- delete the prop -->
-			<button v-if="!isReadOnly" :title="t('contacts', 'Delete')" class="property__delete icon-delete"
-				@click="deleteProperty" />
+			<!-- props actions -->
+			<action :actions="actions" class="property__actions" />
 
 			<!-- Real input where the picker shows -->
 			<datetime-picker :value="localValue.toJSDate()" :minute-step="10" :lang="lang"
diff --git a/src/components/Properties/PropertyMultipleText.vue b/src/components/Properties/PropertyMultipleText.vue
index b2220e036..1408e3ff8 100644
--- a/src/components/Properties/PropertyMultipleText.vue
+++ b/src/components/Properties/PropertyMultipleText.vue
@@ -47,9 +47,8 @@
 			<input v-if="!property.isStructuredValue" v-model.trim="localValue[0]" :readonly="isReadOnly"
 				class="property__value" type="text" @input="updateValue">
 
-			<!-- delete the prop -->
-			<button v-if="!isReadOnly" :title="t('contacts', 'Delete')" class="property__delete icon-delete"
-				@click="deleteProperty" />
+			<!-- props actions -->
+			<action :actions="actions" class="property__actions" />
 		</div>
 
 		<!-- force order based on model -->
diff --git a/src/components/Properties/PropertySelect.vue b/src/components/Properties/PropertySelect.vue
index 51ccd032b..69593f8c6 100644
--- a/src/components/Properties/PropertySelect.vue
+++ b/src/components/Properties/PropertySelect.vue
@@ -37,9 +37,8 @@
 				{{ propModel.readableName }}
 			</div>
 
-			<!-- delete the prop -->
-			<button v-if="!isReadOnly" :title="t('contacts', 'Delete')" class="property__delete icon-delete"
-				@click="deleteProperty" />
+			<!-- props actions -->
+			<action :actions="actions" class="property__actions" />
 
 			<multiselect v-model="matchedOptions" :options="propModel.options" :placeholder="t('contacts', 'Select option')"
 				:disabled="isSingleOption || isReadOnly" class="property__value" track-by="id"
diff --git a/src/components/Properties/PropertyText.vue b/src/components/Properties/PropertyText.vue
index b61df21da..447775abd 100644
--- a/src/components/Properties/PropertyText.vue
+++ b/src/components/Properties/PropertyText.vue
@@ -58,9 +58,8 @@
 			<a v-if="haveExtHandler" :href="externalHandler" class="property__ext icon-external"
 				target="_blank" />
 
-			<!-- delete the prop -->
-			<button v-if="!isReadOnly" :title="t('contacts', 'Delete')" class="property__delete icon-delete"
-				@click="deleteProperty" />
+			<!-- props actions -->
+			<action :actions="actions" class="property__actions" />
 		</div>
 	</div>
 </template>
@@ -157,12 +156,6 @@ export default {
 	},
 
 	methods: {
-		/**
-		 * Delete the property
-		 */
-		deleteProperty() {
-			this.$emit('delete')
-		},
 
 		/**
 		 * Watch textarea resize and update the gridSize accordingly
diff --git a/src/main.js b/src/main.js
index 1cbb209c7..e0264e5f4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -27,7 +27,7 @@ import { sync } from 'vuex-router-sync'
 import { generateFilePath } from 'nextcloud-server/dist/router'
 
 /** GLOBAL COMPONENTS AND DIRECTIVE */
-import { AppNavigation, DatetimePicker, Multiselect, PopoverMenu } from 'nextcloud-vue'
+import { Action, AppNavigation, DatetimePicker, Multiselect, PopoverMenu } from 'nextcloud-vue'
 import ClickOutside from 'vue-click-outside'
 import { VTooltip } from 'v-tooltip'
 import VueClipboard from 'vue-clipboard2'
@@ -43,6 +43,7 @@ __webpack_nonce__ = btoa(OC.requestToken)
 // eslint-disable-next-line
 __webpack_public_path__ = generateFilePath('contacts', '', 'js/')
 
+Vue.component('Action', Action)
 Vue.component('AppNavigation', AppNavigation)
 Vue.component('DatetimePicker', DatetimePicker)
 Vue.component('Multiselect', Multiselect)
diff --git a/src/mixins/PropertyMixin.js b/src/mixins/PropertyMixin.js
index 73b3f21ca..cdb166f28 100644
--- a/src/mixins/PropertyMixin.js
+++ b/src/mixins/PropertyMixin.js
@@ -76,6 +76,17 @@ export default {
 		}
 	},
 
+	computed: {
+		actions() {
+			const del = {
+				text: t('contacts', 'Delete'),
+				icon: 'icon-delete',
+				action: this.deleteProperty
+			}
+			return [del, ...this.propModel.actions ? this.propModel.actions : []]
+		}
+	},
+
 	watch: {
 		/**
 		 * Since we're updating a local data based on the value prop,
diff --git a/src/models/rfcProps.js b/src/models/rfcProps.js
index 122736f28..79c891e66 100644
--- a/src/models/rfcProps.js
+++ b/src/models/rfcProps.js
@@ -21,7 +21,17 @@
  */
 import { VCardTime } from 'ical.js'
 
-const properties = {
+const copyNtoFN = ({ contact, updateContact }) => () => {
+	if (contact.vCard.hasProperty('n')) {
+		// Stevenson;John;Philip,Paul;Dr.;Jr.,M.D.,A.C.P.
+		// -> John Stevenson
+		const n = contact.vCard.getFirstPropertyValue('n')
+		contact.fullName = n.slice(0, 2).reverse().join(' ')
+		updateContact()
+	}
+}
+
+const properties = component => ({
 	nickname: {
 		readableName: t('contacts', 'Nickname'),
 		icon: 'icon-user'
@@ -39,7 +49,14 @@ const properties = {
 		defaultValue: {
 			value: ['', '', '', '', '']
 		},
-		icon: 'icon-user'
+		icon: 'icon-user',
+		actions: [
+			{
+				text: t('contacts', 'Copy to full name'),
+				icon: 'icon-up',
+				action: copyNtoFN(component)
+			}
+		]
 	},
 	note: {
 		readableName: t('contacts', 'Notes'),
@@ -266,7 +283,7 @@ const properties = {
 			{ id: 'O', name: t('contacts', 'Other') }
 		]
 	}
-}
+})
 
 const fieldOrder = [
 	'org',
diff --git a/src/services/checks/missingFN.js b/src/services/checks/missingFN.js
index 1f17afc85..449f4a438 100644
--- a/src/services/checks/missingFN.js
+++ b/src/services/checks/missingFN.js
@@ -29,6 +29,10 @@ export default {
 	run: contact => {
 		return !contact.vCard.hasProperty('fn')						// No FN
 			|| contact.vCard.getFirstPropertyValue('fn') === ''		// Empty FN
+			|| ( // we don't want to fix newly created contacts
+				contact.dav																		// Existing contact
+				&& contact.vCard.getFirstPropertyValue('fn') === t('contacts', 'New contact')	// AND Unchanged FN
+			)
 	},
 	fix: contact => {
 		if (contact.vCard.hasProperty('n')) {
diff --git a/src/store/contacts.js b/src/store/contacts.js
index 5258d8612..d5538b6e2 100644
--- a/src/store/contacts.js
+++ b/src/store/contacts.js
@@ -285,6 +285,10 @@ const actions = {
 	 * @returns {Promise}
 	 */
 	async updateContact(context, contact) {
+
+		// Checking contact validity 🙈
+		validate(contact)
+
 		let vData = ICAL.stringify(contact.vCard.jCal)
 
 		// if no dav key, contact does not exists on server

From 41e8ec164713dc6b51754575e6da92995dd55df9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Wed, 30 Jan 2019 12:51:55 +0100
Subject: [PATCH 2/2] Fix string detection, put delete in last and fix
 properties scoping
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 .../ContactDetailsAddNewProp.vue              | 17 +++++++++++----
 .../ContactDetails/ContactDetailsAvatar.vue   | 12 +++++------
 .../ContactDetails/ContactDetailsProperty.vue |  8 +++----
 .../ContactsList/ContactsListItem.vue         |  2 +-
 src/components/Properties/PropertyText.vue    |  2 +-
 src/mixins/PropertyMixin.js                   |  4 ++--
 src/models/contact.js                         |  2 +-
 src/services/checks/missingFN.js              | 21 +++++++++++++------
 src/services/validate.js                      | 20 +++++++++++-------
 src/store/contacts.js                         |  2 +-
 src/views/Contacts.vue                        |  7 ++++---
 11 files changed, 60 insertions(+), 37 deletions(-)

diff --git a/src/components/ContactDetails/ContactDetailsAddNewProp.vue b/src/components/ContactDetails/ContactDetailsAddNewProp.vue
index 7562a9a7c..fc8e824d3 100644
--- a/src/components/ContactDetails/ContactDetailsAddNewProp.vue
+++ b/src/components/ContactDetails/ContactDetailsAddNewProp.vue
@@ -55,6 +55,15 @@ export default {
 	},
 
 	computed: {
+
+		/**
+		 * Rfc props scoped
+		 * @returns {Object}
+		 */
+		properties() {
+			return rfcProps.properties(this)
+		},
+
 		/**
 		 * List of properties that the contact already have
 		 *
@@ -71,14 +80,14 @@ export default {
 		 * @returns {Object[]}
 		 */
 		availableProperties() {
-			return Object.keys(rfcProps.properties)
+			return Object.keys(this.properties)
 				// only allow to add multiple properties OR props that are not yet in the contact
-				.filter(key => rfcProps.properties[key].multiple || this.usedProperties.indexOf(key) === -1)
+				.filter(key => this.properties[key].multiple || this.usedProperties.indexOf(key) === -1)
 				// usable array of objects
 				.map(key => {
 					return {
 						id: key,
-						name: rfcProps.properties[key].readableName
+						name: this.properties[key].readableName
 					}
 				}).sort((a, b) => a.name.localeCompare(b.name))
 		}
@@ -92,7 +101,7 @@ export default {
 		 * @param {string} data.id the id of the property. e.g fn
 		 */
 		addProp({ id }) {
-			let defaultData = rfcProps.properties[id].defaultValue
+			let defaultData = this.properties[id].defaultValue
 			let property = this.contact.vCard.addPropertyWithValue(id, defaultData ? defaultData.value : '')
 			if (defaultData && defaultData.type) {
 				property.setParameter('type', defaultData.type)
diff --git a/src/components/ContactDetails/ContactDetailsAvatar.vue b/src/components/ContactDetails/ContactDetailsAvatar.vue
index 8afa46d27..fccbd25f8 100644
--- a/src/components/ContactDetails/ContactDetailsAvatar.vue
+++ b/src/components/ContactDetails/ContactDetailsAvatar.vue
@@ -1,10 +1,10 @@
 <!--
-import rfcProps from '../../models/rfcProps';
- * @copyright Copyright (c) 2018 Team Popcorn <teampopcornberlin@gmail.com>
- *
- * @author Team Popcorn <teampopcornberlin@gmail.com>
- *
- * @license GNU AGPL version 3 or any later version
+  - @copyright Copyright (c) 2018 Team Popcorn <teampopcornberlin@gmail.com>
+  -
+  - @author Team Popcorn <teampopcornberlin@gmail.com>
+  - @author John Molakvoæ <skjnldsv@protonmail.com>
+  -
+  - @license GNU AGPL version 3 or any later version
   -
   - This program is free software: you can redistribute it and/or modify
   - it under the terms of the GNU Affero General Public License as
diff --git a/src/components/ContactDetails/ContactDetailsProperty.vue b/src/components/ContactDetails/ContactDetailsProperty.vue
index 35db50321..cfe5abe26 100644
--- a/src/components/ContactDetails/ContactDetailsProperty.vue
+++ b/src/components/ContactDetails/ContactDetailsProperty.vue
@@ -89,8 +89,10 @@ export default {
 		},
 
 		// rfc properties list
+		// passing this to properties to allow us to scope the properties object
+		// this make possible defining actions there
 		properties() {
-			return rfcProps.properties
+			return rfcProps.properties(this)
 		},
 		fieldOrder() {
 			return rfcProps.fieldOrder
@@ -147,9 +149,7 @@ export default {
 		 * @returns {Object}
 		 */
 		propModel() {
-			// passing this to properties to allow us to scope the properties object
-			// this make possible defining actions there
-			return this.properties(this)[this.propName]
+			return this.properties[this.propName]
 		},
 
 		/**
diff --git a/src/components/ContactsList/ContactsListItem.vue b/src/components/ContactsList/ContactsListItem.vue
index 78ff1ea0f..60086c4ac 100644
--- a/src/components/ContactsList/ContactsListItem.vue
+++ b/src/components/ContactsList/ContactsListItem.vue
@@ -65,7 +65,7 @@ export default {
 		 * @returns {boolean}
 		 */
 		matchSearch() {
-			if (this.searchQuery !== '') {
+			if (this.searchQuery.trim() !== '') {
 				return this.contact.searchData.toString().toLowerCase().search(this.searchQuery.toLowerCase()) !== -1
 			}
 			return true
diff --git a/src/components/Properties/PropertyText.vue b/src/components/Properties/PropertyText.vue
index 447775abd..106ccf2bc 100644
--- a/src/components/Properties/PropertyText.vue
+++ b/src/components/Properties/PropertyText.vue
@@ -147,7 +147,7 @@ export default {
 		},
 
 		haveExtHandler() {
-			return this.externalHandler !== '' && this.value && this.value.length > 0
+			return this.externalHandler.trim() !== '' && this.value && this.value.length > 0
 		}
 	},
 
diff --git a/src/mixins/PropertyMixin.js b/src/mixins/PropertyMixin.js
index cdb166f28..b1070bcc1 100644
--- a/src/mixins/PropertyMixin.js
+++ b/src/mixins/PropertyMixin.js
@@ -28,7 +28,7 @@ export default {
 			type: [Object],
 			default: () => {}
 		},
-		// Coming fro the rfcProps Model
+		// Coming from the rfcProps Model
 		propModel: {
 			type: Object,
 			default: () => {},
@@ -83,7 +83,7 @@ export default {
 				icon: 'icon-delete',
 				action: this.deleteProperty
 			}
-			return [del, ...this.propModel.actions ? this.propModel.actions : []]
+			return [...this.propModel.actions ? this.propModel.actions : [], del]
 		}
 	},
 
diff --git a/src/models/contact.js b/src/models/contact.js
index 6510edb8b..d284e7fce 100644
--- a/src/models/contact.js
+++ b/src/models/contact.js
@@ -178,7 +178,7 @@ export default class Contact {
 		let groupsProp = this.vCard.getFirstProperty('categories')
 		if (groupsProp) {
 			return groupsProp.getValues()
-				.filter(group => group !== '')
+				.filter(group => group.trim() !== '')
 		}
 		return []
 	}
diff --git a/src/services/checks/missingFN.js b/src/services/checks/missingFN.js
index 449f4a438..86a92c7af 100644
--- a/src/services/checks/missingFN.js
+++ b/src/services/checks/missingFN.js
@@ -30,8 +30,9 @@ export default {
 		return !contact.vCard.hasProperty('fn')						// No FN
 			|| contact.vCard.getFirstPropertyValue('fn') === ''		// Empty FN
 			|| ( // we don't want to fix newly created contacts
-				contact.dav																		// Existing contact
-				&& contact.vCard.getFirstPropertyValue('fn') === t('contacts', 'New contact')	// AND Unchanged FN
+				contact.dav															// Existing contact
+				&& contact.vCard.getFirstPropertyValue('fn')
+					.toLowerCase() === t('contacts', 'New contact').toLowerCase()	// AND Unchanged FN
 			)
 	},
 	fix: contact => {
@@ -39,14 +40,22 @@ export default {
 			// Stevenson;John;Philip,Paul;Dr.;Jr.,M.D.,A.C.P.
 			// -> John Stevenson
 			const n = contact.vCard.getFirstPropertyValue('n')
-			contact.fullName = n.slice(0, 2).reverse().join(' ')
-			return true
+			const fullName = n.slice(0, 2).reverse().join(' ')
+			if (fullName.trim() !== '') {
+				contact.fullName = fullName
+				return true
+			}
+			return false
 		} else if (contact.vCard.hasProperty('org')) {
 			const org = contact.vCard.getFirstPropertyValue('org')
 			// ABC, Inc.;North American Division;Marketing
 			// -> ABC, Inc.
-			contact.fullName = org[0]
-			return true
+			const fullName = org[0]
+			if (fullName.trim() !== '') {
+				contact.fullName = fullName
+				return true
+			}
+			return false
 		}
 		return false
 	}
diff --git a/src/services/validate.js b/src/services/validate.js
index be080988d..c80542f9c 100644
--- a/src/services/validate.js
+++ b/src/services/validate.js
@@ -28,16 +28,20 @@ export default function(contact) {
 
 		// Going through every checks
 		checks.forEach(check => {
-			if (check.run(contact)) {
+			try {
+				if (check.run(contact)) {
 
-				// A fix is needed, running ⏳
-				if (!check.fix(contact)) {
-					// FAILURE 🙅
-					console.warn('The following contact needed a correction that failed:', check.name, contact)
-				} else {
-					// SUCCESS 💪
-					console.info('The following contact has been repaired:', check.name, contact)
+					// A fix is needed, running ⏳
+					if (!check.fix(contact)) {
+						// FAILURE 🙅
+						console.warn('The following contact needed a correction that failed:', check.name, contact)
+					} else {
+						// SUCCESS 💪
+						console.info('The following contact has been repaired:', check.name, contact)
+					}
 				}
+			} catch (error) {
+				console.error('Error during the check:', check.name, contact, error)
 			}
 		})
 
diff --git a/src/store/contacts.js b/src/store/contacts.js
index d5538b6e2..613fd2a9f 100644
--- a/src/store/contacts.js
+++ b/src/store/contacts.js
@@ -331,7 +331,7 @@ const actions = {
 	 * @returns {Promise}
 	 */
 	async fetchFullContact(context, { contact, etag = '' }) {
-		if (etag !== '') {
+		if (etag.trim() !== '') {
 			await context.commit('updateContactEtag', { contact, etag })
 		}
 		return contact.dav.fetchCompleteData()
diff --git a/src/views/Contacts.vue b/src/views/Contacts.vue
index 894389fd2..4e99bb276 100644
--- a/src/views/Contacts.vue
+++ b/src/views/Contacts.vue
@@ -261,11 +261,12 @@ export default {
 	methods: {
 		async newContact() {
 			let contact = new Contact('BEGIN:VCARD\nVERSION:4.0\nEND:VCARD', this.defaultAddressbook)
+			const properties = rfcProps.properties(this)
 			contact.fullName = t('contacts', 'New contact')
 			// itterate over all properties (filter is not usable on objects and we need the key of the property)
-			for (let name in rfcProps.properties) {
-				if (rfcProps.properties[name].default) {
-					let defaultData = rfcProps.properties[name].defaultValue
+			for (let name in properties) {
+				if (properties[name].default) {
+					let defaultData = properties[name].defaultValue
 					// add default field
 					let property = contact.vCard.addPropertyWithValue(name, defaultData.value)
 					// add default type