]> git.proxmox.com Git - pmg-gui.git/blobdiff - js/SpamQuarantine.js
quarantine: restore behavior of selecting next in list after action
[pmg-gui.git] / js / SpamQuarantine.js
index 6ff74eb24f999c080937a8346b7d1af09afc533b..f580ab3cf468f922a187c5273b6396a72f855b3a 100644 (file)
@@ -1,23 +1,20 @@
-/*global Proxmox*/
-/*jslint confusion: true*/
-/*format is a string and a function*/
 Ext.define('pmg-spam-archive', {
     extend: 'Ext.data.Model',
     fields: [
        { type: 'number', name: 'spamavg' },
        { type: 'integer', name: 'count' },
-        { type: 'date', dateFormat: 'timestamp', name: 'day' }
+        { type: 'date', dateFormat: 'timestamp', name: 'day' },
     ],
     proxy: {
         type: 'proxmox',
-        url: "/api2/json/quarantine/spam"
+        url: "/api2/json/quarantine/spam",
     },
-    idProperty: 'day'
+    idProperty: 'day',
 });
 
 Ext.define('pmg-spam-list', {
     extend: 'Ext.data.Model',
-    fields: [ 'id', 'envelope_sender', 'from', 'sender', 'receiver', 'subject',
+    fields: ['id', 'envelope_sender', 'from', 'sender', 'receiver', 'subject',
        { type: 'number', name: 'spamlevel' },
        { type: 'integer', name: 'bytes' },
        { type: 'date', dateFormat: 'timestamp', name: 'time' },
@@ -26,14 +23,14 @@ Ext.define('pmg-spam-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/spam"
+       url: "/api2/json/quarantine/spam",
     },
-    idProperty: 'id'
+    idProperty: 'id',
 });
 
 Ext.define('PMG.SpamQuarantine', {
@@ -48,6 +45,15 @@ Ext.define('PMG.SpamQuarantine', {
     // from mail link
     cselect: undefined,
 
+    viewModel: {
+       parent: null,
+       data: {
+           mailid: '',
+       },
+       formulas: {
+           downloadMailURL: get => '/api2/json/quarantine/download?mailid=' + encodeURIComponent(get('mailid')),
+       },
+    },
     controller: {
 
        xclass: 'Ext.app.ViewController',
@@ -55,37 +61,43 @@ Ext.define('PMG.SpamQuarantine', {
        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':'');
+           var url = '/api2/htmlmail/quarantine/content?id=' + rec.data.id + (raw?'&raw=1':'');
            preview.setDisabled(false);
            this.lookupReference('raw').setDisabled(false);
            this.lookupReference('spam').setDisabled(false);
+           this.lookupReference('download').setDisabled(false);
            preview.update("<iframe frameborder=0 width=100% height=100% sandbox='allow-same-origin' src='" + url +"'></iframe>");
        },
 
-       multiSelect: function() {
+       multiSelect: function(selection) {
            var preview = this.lookupReference('preview');
            var raw = this.lookupReference('raw');
            var spam = this.lookupReference('spam');
            var spaminfo = this.lookupReference('spaminfo');
+           var mailinfo = this.lookupReference('mailinfo');
+           var download = this.lookupReference('download');
 
            preview.setDisabled(false);
-           preview.update('<h3>' + gettext('Multiple E-Mails selected') + '</h3>');
+           preview.update(`<h3 style="padding-left:5px;">${gettext('Multiple E-Mails selected')} (${selection.length})</h3>`);
            raw.setDisabled(true);
            spam.setDisabled(true);
            spam.setPressed(false);
            spaminfo.setVisible(false);
+           mailinfo.setVisible(false);
+           download.setDisabled(true);
        },
 
        toggleRaw: function(button) {
            var me = this;
-           var list = this.lookupReference('list');
+           var list = me.lookupReference('list');
            var rec = list.selModel.getSelection()[0];
+           me.lookupReference('mailinfo').setVisible(me.raw);
            me.raw = !me.raw;
            me.updatePreview(me.raw, rec);
        },
@@ -106,31 +118,52 @@ Ext.define('PMG.SpamQuarantine', {
            var list = this.lookupReference('list');
 
            if (selected.length > 1) {
-               var idlist = [];
-               selected.forEach(function(item) {
-                   idlist.push(item.data.id);
-               });
+               let idlist = selected.map(item => item.data.id);
                Ext.Msg.confirm(
                    gettext('Confirm'),
                    Ext.String.format(
                        gettext("Action '{0}' for '{1}' items"),
-                       action, selected.length
+                       action, selected.length,
                    ),
-                   function(button) {
+                   async function(button) {
                        if (button !== 'yes') {
                            return;
                        }
 
-                       PMG.Utils.doQuarantineAction(action, idlist.join(';'), function() {
-                           list.getController().load();
-                       });
-                   }
+                       list.mask(gettext('Processing...'), 'x-mask-loading');
+
+                       const sliceSize = 2500, maxInFlight = 2;
+                       let batches = [], batchCount = Math.ceil(selected.length / sliceSize);
+                       for (let i = 0; i * sliceSize < selected.length; i++) {
+                           let sliceStart = i * sliceSize;
+                           let sliceEnd = Math.min(sliceStart + sliceSize, selected.length);
+                           batches.push(
+                               PMG.Async.doQAction(
+                                   action,
+                                   idlist.slice(sliceStart, sliceEnd),
+                                   i + 1,
+                                   batchCount,
+                               ),
+                           );
+                           if (batches.length >= maxInFlight) {
+                               await Promise.allSettled(batches); // eslint-disable-line no-await-in-loop
+                               batches = [];
+                           }
+                       }
+                       await Promise.allSettled(batches); // await possible remaining ones
+                       list.unmask();
+                       // below can be slow, we could remove directly from the in-memory store, but
+                       // with lots of elements and some failures we could be quite out of sync?
+                       list.getController().load();
+                   },
                );
                return;
            }
 
            PMG.Utils.doQuarantineAction(action, selected[0].data.id, function() {
-               list.getController().load();
+               // success -> remove directly to avoid slow store reload for a single-element action
+               list.getStore().remove(selected[0]);
+               list.getController().restoreSavedSelection();
            });
        },
 
@@ -139,13 +172,17 @@ Ext.define('PMG.SpamQuarantine', {
            var list = this.lookupReference('list');
            var selection = list.selModel.getSelection();
            if (selection.length > 1) {
-               me.multiSelect();
+               me.multiSelect(selection);
                return;
            }
-           var rec = list.selModel.getSelection()[0];
 
+           var rec = selection[0] || {};
+
+           me.getViewModel().set('mailid', rec.data ? rec.data.id : '');
            me.updatePreview(me.raw || false, rec);
            me.lookupReference('spaminfo').setID(rec);
+           me.lookupReference('mailinfo').setVisible(!!rec.data && !me.raw);
+           me.lookupReference('mailinfo').update(rec.data);
        },
 
        toggleSpamInfo: function(btn) {
@@ -155,15 +192,40 @@ Ext.define('PMG.SpamQuarantine', {
 
        openContextMenu: function(table, record, tr, index, event) {
            event.stopEvent();
+           let me = this;
+           let list = me.lookup('list');
+           Ext.create('PMG.menu.SpamContextMenu', {
+               callback: action => me.doAction(action, list.getSelection()),
+           }).showAt(event.getXY());
+       },
+
+       keyPress: function(table, record, item, index, event) {
            var me = this;
            var list = me.lookup('list');
-           var menu = Ext.create('PMG.menu.SpamContextMenu', {
-               callback: function(action) {
-                   me.doAction(action, list.getSelection());
-               }
-           });
+           var key = event.getKey();
+           var action = '';
+           switch (key) {
+               case event.DELETE:
+               case 127:
+                   action = 'delete';
+                   break;
+               case Ext.event.Event.D:
+               case Ext.event.Event.D + 32:
+                   action = 'deliver';
+                   break;
+               case Ext.event.Event.W:
+               case Ext.event.Event.W + 32:
+                   action = 'whitelist';
+                   break;
+               case Ext.event.Event.B:
+               case Ext.event.Event.B + 32:
+                   action = 'blacklist';
+                   break;
+           }
 
-           menu.showAt(event.getXY());
+           if (action !== '') {
+               me.doAction(action, list.getSelection());
+           }
        },
 
        init: function(view) {
@@ -172,22 +234,24 @@ Ext.define('PMG.SpamQuarantine', {
 
        control: {
            'button[reference=raw]': {
-               click: 'toggleRaw'
+               click: 'toggleRaw',
            },
            'button[reference=spam]': {
-               click: 'toggleSpamInfo'
+               click: 'toggleSpamInfo',
            },
            'pmgQuarantineList': {
                selectionChange: 'onSelectMail',
-               rowcontextmenu: 'openContextMenu'
-           }
-       }
+               itemkeypress: 'keyPress',
+               rowcontextmenu: 'openContextMenu',
+           },
+       },
     },
 
     items: [
        {
            title: gettext('Spam Quarantine'),
            xtype: 'pmgQuarantineList',
+           selModel: 'checkboxmodel',
            emailSelection: true,
            reference: 'list',
            region: 'west',
@@ -200,8 +264,8 @@ Ext.define('PMG.SpamQuarantine', {
                groupDir: 'DESC',
                sorters: [{
                    property: 'time',
-                   direction: 'DESC'
-               }]
+                   direction: 'DESC',
+               }],
            },
 
            columns: [
@@ -209,33 +273,33 @@ Ext.define('PMG.SpamQuarantine', {
                    header: gettext('Sender/Subject'),
                    dataIndex: 'subject',
                    renderer: PMG.Utils.sender_renderer,
-                   flex: 1
+                   flex: 1,
                },
                {
                    header: gettext('Score'),
                    dataIndex: 'spamlevel',
                    align: 'right',
-                   width: 70
+                   width: 70,
                },
                {
                    header: gettext('Size') + ' (KB)',
                    renderer: function(v) { return 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'),
@@ -254,48 +318,67 @@ Ext.define('PMG.SpamQuarantine', {
                            reference: 'raw',
                            text: gettext('Toggle Raw'),
                            enableToggle: true,
-                           iconCls: 'fa fa-file-code-o'
+                           iconCls: 'fa fa-file-code-o',
                        },
                        {
                            xtype: 'button',
                            reference: 'spam',
                            text: gettext('Toggle Spam Info'),
                            enableToggle: true,
-                           iconCls: 'fa fa-bullhorn'
+                           iconCls: 'fa fa-bullhorn',
                        },
                        '->',
+                       {
+                           xtype: 'button',
+                           reference: 'download',
+                           text: gettext('Download'),
+                           setDownload: function(id) {
+                               this.el.dom.download = id + ".eml";
+                           },
+                           bind: {
+                               href: '{downloadMailURL}',
+                               download: '{mailid}',
+                           },
+                           iconCls: 'fa fa-download',
+                       },
+                       '-',
                        {
                            reference: 'whitelist',
                            text: gettext('Whitelist'),
                            iconCls: 'fa fa-check',
-                           handler: 'btnHandler'
+                           handler: 'btnHandler',
                        },
                        {
                            reference: 'blacklist',
                            text: gettext('Blacklist'),
                            iconCls: 'fa fa-times',
-                           handler: 'btnHandler'
+                           handler: 'btnHandler',
                        },
                        {
                            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: 'pmgSpamInfoGrid',
                    border: false,
-                   reference: 'spaminfo'
-               }
-           ]
-       }
-    ]
+                   reference: 'spaminfo',
+               },
+               {
+                   xtype: 'pmgMailInfo',
+                   hidden: true,
+                   reference: 'mailinfo',
+               },
+           ],
+       },
+    ],
 });