Merge branch 'pu/ccheng/empty_preferred_email' into '2024.11'

fix(Addressbook/js): resolve recipient token with empty contact email

See merge request tine20/tine20!5367

Author: ccheng-dev

tine20/Addressbook/js/ContactPropertiesGrid.js

@@ -25,7 +25,7 @@ export default (config) => {
         _,
         Tine.widgets.form.FieldManager.CATEGORY_PROPERTYGRID
     );
-
+    
     config.propertyNames = {};
     config.customEditors = {};
     config.customRenderers = {};
@@ -121,7 +121,7 @@ export default (config) => {
         const recordGrants = _.get(record, record.constructor.getMeta('grantsPath'));
         propertyGrid.setSource(config.fields.reduce((source, field, idx) => {
             const requiredGrants = field.requiredGrants; // NOTE: at the moment this means rw!
-            if (! requiredGrants || recordGrants.adminGrant || requiredGrants?.some((requiredGrant) => { return recordGrants[requiredGrant] })) {
+            if (! requiredGrants || recordGrants?.adminGrant || requiredGrants?.some((requiredGrant) => { return recordGrants?.[requiredGrant] })) {
                 const name = `${_.padStart(String(idx), 3, '0')}_${field.fieldName}`;
                 source[name] = record.get(field.fieldName);
             }

tine20/Addressbook/js/Model.js

@@ -30,9 +30,15 @@ Tine.Addressbook.Model.ContactMixin = {
      * @return {String}
      */
     getPreferredEmail: function() {
-        let preferredType = this.get('preferred_email');
+        let preferredType = this.get('preferred_email') ?? 'email';
         const email = this.get(preferredType);
-        if (!email || email === '') preferredType = 'email';
+        if (!email || email === '') {
+            _.each(this.modelConfiguration.fields, (field) => {
+                if (field?.specialType === 'Addressbook_Model_ContactProperties_Email' && this.get(field.fieldName)) {
+                    preferredType = field.fieldName;
+                }
+            });
+        }
 
         return {
             email: this.get(preferredType),

tine20/Felamimail/js/ContactGrid.js

@@ -152,6 +152,7 @@ Tine.Felamimail.ContactGridPanel = Ext.extend(Tine.Addressbook.ContactGridPanel,
      */
     preferredEmailRenderer: function(field, cell, contact) {
         const token = this.getSelectedToken(contact).token;
+        if (!token) return '';
         const block =  document.createElement('span');
         block.className = 'tinebase-contact-link';
         block.innerHTML = Tine.Felamimail.ContactSearchCombo.prototype.renderEmailAddressAndIcon(token);
@@ -252,6 +253,7 @@ Tine.Felamimail.ContactGridPanel = Ext.extend(Tine.Addressbook.ContactGridPanel,
                 const fieldName = field.fieldName;
                 if (!contact.data[fieldName]) return;
                 const token = Tine.Felamimail.GridPanelHook.prototype.getRecipientTokenFromContact(contact, fieldName);
+                if (!token) return;
                 items.push(new Ext.Action({
                     text: Tine.Felamimail.ContactSearchCombo.prototype.renderEmailAddressAndIcon(token),
                     iconCls: target.textContent.includes(token.email) ? 'action_enable' : '',