quarantine grids: use arrow function for size renderer

[pmg-gui.git] / js / AttachmentQuarantine.js

diff --git a/js/AttachmentQuarantine.js b/js/AttachmentQuarantine.js
index c143d6a5d3ca33aa45cc1f094fe785d8ff39c517..b295448bc1d5e510cc2d604471b499d572d537a0 100644 (file)
--- a/js/AttachmentQuarantine.js
+++ b/js/AttachmentQuarantine.js
@@ -1,9 +1,6 @@
-/*global Proxmox*/
-/*jslint confusion: true*/
-/*format is a string and a function*/
 Ext.define('pmg-attachment-list', {
     extend: 'Ext.data.Model',
-    fields: [ 'id', 'envelope_sender', 'from', 'sender', 'receiver', 'subject',
+    fields: ['id', 'envelope_sender', 'from', 'sender', 'receiver', 'subject',
        { type: 'integer', name: 'bytes' },
        { type: 'date', dateFormat: 'timestamp', name: 'time' },
        {
@@ -11,14 +8,14 @@ Ext.define('pmg-attachment-list', {
            name: 'day',
            convert: function(v, rec) {
                return Ext.Date.format(rec.get('time'), 'Y-m-d');
-           }, depends: ['time']
-       }
+           }, depends: ['time'],
+       },
     ],
     proxy: {
         type: 'proxmox',
-       url: "/api2/json/quarantine/attachment"
+       url: "/api2/json/quarantine/attachment",
     },
-    idProperty: 'id'
+    idProperty: 'id',
 });
 
 Ext.define('PMG.AttachmentQuarantine', {
@@ -37,13 +34,16 @@ Ext.define('PMG.AttachmentQuarantine', {
        updatePreview: function(raw, rec) {
            var preview = this.lookupReference('preview');
 
-           if (!rec || !rec.data || !rec.data.id)  {
+           if (!rec || !rec.data || !rec.data.id) {
                preview.update('');
                preview.setDisabled(true);
                return;
            }
 
-           var url = '/api2/htmlmail/quarantine/content?id=' + rec.data.id + ((raw)?'&raw=1':'');
+           let url = `/api2/htmlmail/quarantine/content?id=${rec.data.id}`;
+           if (raw) {
+               url += '&raw=1';
+           }
            preview.setDisabled(false);
            preview.update("<iframe frameborder=0 width=100% height=100% sandbox='allow-same-origin' src='" + url +"'></iframe>");
        },
@@ -52,6 +52,7 @@ Ext.define('PMG.AttachmentQuarantine', {
            var me = this;
            var list = this.lookupReference('list');
            var rec = list.getSelection()[0] || {};
+           me.lookup('mailinfo').setVisible(me.raw);
            me.raw = !me.raw;
            me.updatePreview(me.raw, rec);
        },
@@ -71,22 +72,25 @@ Ext.define('PMG.AttachmentQuarantine', {
        },
 
        onSelectMail: function() {
-           var me = this;
-           var list = this.lookupReference('list');
-           var rec = list.getSelection()[0] || {};
+           let me = this;
+           let list = me.lookup('list');
+           let rec = list.getSelection()[0] || {};
+           let mailinfo = me.lookup('mailinfo');
 
            me.updatePreview(me.raw || false, rec);
-           this.lookupReference('attachmentlist').setID(rec);
+           me.lookup('attachmentlist').setID(rec);
+           mailinfo.setVisible(!!rec.data && !me.raw);
+           mailinfo.update(rec.data);
        },
 
        control: {
            'button[reference=raw]': {
-               click: 'toggleRaw'
+               click: 'toggleRaw',
            },
            'pmgQuarantineList': {
-               selectionChange: 'onSelectMail'
-           }
-       }
+               selectionChange: 'onSelectMail',
+           },
+       },
 
     },
 
@@ -107,41 +111,42 @@ Ext.define('PMG.AttachmentQuarantine', {
                groupDir: 'DESC',
                sorters: [{
                    property: 'time',
-                   direction: 'DESC'
-               }]
+                   direction: 'DESC',
+               }],
            },
 
            columns: [
                {
-                   header: gettext('Sender/Subject'),
+                   header: `${gettext('Sender')}/${gettext('Receiver')}/${gettext('Subject')}`,
                    dataIndex: 'subject',
-                   renderer: PMG.Utils.sender_renderer,
-                   flex: 1
+                   renderer: PMG.Utils.render_sender_receiver,
+                   flex: 1,
                },
                {
                    header: gettext('Size') + ' (KB)',
-                   renderer: function(v) { return Ext.Number.toFixed(v/1024, 0); },
+                   renderer: v => Ext.Number.toFixed(v/1024, 0),
                    dataIndex: 'bytes',
                    align: 'right',
-                   width: 90
+                   width: 90,
                },
                {
                    header: gettext('Date'),
                    dataIndex: 'day',
-                   hidden: true
+                   hidden: true,
                },
                {
                    xtype: 'datecolumn',
                    header: gettext('Time'),
                    dataIndex: 'time',
-                   format: 'H:i:s'
-               }
-           ]
+                   format: 'H:i:s',
+               },
+           ],
        },
        {
            title: gettext('Selected Mail'),
            border: false,
            region: 'center',
+           layout: 'fit',
            split: true,
            reference: 'preview',
            disabled: true,
@@ -155,22 +160,22 @@ Ext.define('PMG.AttachmentQuarantine', {
                            reference: 'raw',
                            text: gettext('Toggle Raw'),
                            enableToggle: true,
-                           iconCls: 'fa fa-file-code-o'
+                           iconCls: 'fa fa-file-code-o',
                        },
                        '->',
                        {
                            reference: 'deliver',
                            text: gettext('Deliver'),
                            iconCls: 'fa fa-paper-plane-o',
-                           handler: 'btnHandler'
+                           handler: 'btnHandler',
                        },
                        {
                            reference: 'delete',
                            text: gettext('Delete'),
                            iconCls: 'fa fa-trash-o',
-                           handler: 'btnHandler'
-                       }
-                   ]
+                           handler: 'btnHandler',
+                       },
+                   ],
                },
                {
                    xtype: 'pmgAttachmentGrid',
@@ -178,8 +183,13 @@ Ext.define('PMG.AttachmentQuarantine', {
                    maxHeight: 250,
                    scrollable: true,
                    reference: 'attachmentlist',
-               }
-           ]
-       }
-    ]
+               },
+               {
+                   xtype: 'pmgMailInfo',
+                   hidden: true,
+                   reference: 'mailinfo',
+               },
+           ],
+       },
+    ],
 });