quarantine: subject/sender: refactor/code-style-fix render functions

extends on the improvements from the previous commit, reduces code
lines while (hopefully, as slightly subjective) not reducing
readability

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/js/AttachmentQuarantine.js b/js/AttachmentQuarantine.js
index 5e41ada7b5dada69438508a6dcf79adb7a42af47..c1dd50f20288c7fb22bcb2093f9fb167e4b43616 100644 (file)
--- a/js/AttachmentQuarantine.js
+++ b/js/AttachmentQuarantine.js
@@ -119,7 +119,7 @@ Ext.define('PMG.AttachmentQuarantine', {
                {
                    header: `${gettext('Sender')}/${gettext('Receiver')}/${gettext('Subject')}`,
                    dataIndex: 'subject',
-                   renderer: PMG.Utils.sender_receiver_renderer,
+                   renderer: PMG.Utils.render_sender_receiver,
                    flex: 1,
                },
                {

diff --git a/js/SpamQuarantine.js b/js/SpamQuarantine.js
index efb7fdc91dcb743bc92ab8e0d48a904c549f02f5..bfa71de87cb624edcb5bdd021491d8f04e2a4d51 100644 (file)
--- a/js/SpamQuarantine.js
+++ b/js/SpamQuarantine.js
@@ -278,7 +278,7 @@ Ext.define('PMG.SpamQuarantine', {
                {
                    header: gettext('Sender/Subject'),
                    dataIndex: 'subject',
-                   renderer: PMG.Utils.sender_renderer,
+                   renderer: PMG.Utils.render_sender,
                    flex: 1,
                },
                {

diff --git a/js/Utils.js b/js/Utils.js
index 695967d83e273abee74922a9b013100dee2121e8..dc924d2c4344b23abf2de528161868ef8b7ada88 100644 (file)
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -813,29 +813,22 @@ Ext.define('PMG.Utils', {
        return `<i class='fa ${iconCls}'></i> ${text}`;
     },
 
-    addresses_subject_renderer: function(value, metaData, rec, render_receiver) {
+    render_envelope: function(value, { data }, render_receiver) {
        let subject = Ext.htmlEncode(value);
-       let from = Ext.htmlEncode(rec.data.from);
-       let sender = Ext.htmlEncode(rec.data.sender);
-       if (sender) {
-           from = Ext.String.format(gettext("{0} on behalf of {1}"),
-                                    sender, from);
+       let from = Ext.htmlEncode(data.from);
+       if (data.sender) {
+           let sender = Ext.htmlEncode(data.sender);
+           from = Ext.String.format(gettext("{0} on behalf of {1}"), sender, from);
        }
-       let ret = '<small>' + from;
        if (render_receiver) {
-           ret += '<br>To: ' + Ext.htmlEncode(rec.data.receiver);
+           let receiver = Ext.htmlEncode(data.receiver);
+           return `<small>${from}<br>To: ${receiver}</small><br>${subject}`;
        }
-       ret += '</small><br>' + subject;
-       return ret;
+       return `<small>${from}</small><br>${subject}`;
     },
 
-    sender_renderer: function(value, metaData, rec) {
-       return PMG.Utils.addresses_subject_renderer(value, metaData, rec, false);
-    },
-
-    sender_receiver_renderer: function(value, metaData, rec) {
-       return PMG.Utils.addresses_subject_renderer(value, metaData, rec, true);
-    },
+    render_sender: (value, _meta, rec) => PMG.Utils.render_envelope(value, rec, false),
+    render_sender_receiver: (value, _meta, rec) => PMG.Utils.render_envelope(value, rec, true),
 
     constructor: function() {
        var me = this;

diff --git a/js/VirusQuarantine.js b/js/VirusQuarantine.js
index 9e9e3b8d67fa242d0d745b1b1133fd09c03c652b..0dba784a4b30f0692d31f8b7235f307cb4c0135b 100644 (file)
--- a/js/VirusQuarantine.js
+++ b/js/VirusQuarantine.js
@@ -122,7 +122,7 @@ Ext.define('PMG.VirusQuarantine', {
                {
                    header: `${gettext('Sender')}/${gettext('Receiver')}/${gettext('Subject')}`,
                    dataIndex: 'subject',
-                   renderer: PMG.Utils.sender_receiver_renderer,
+                   renderer: PMG.Utils.render_sender_receiver,
                    flex: 1,
                },
                {