[pmg-devel] [PATCH pmg-api/pmg-gui v3 0/2] fix #3450: batch deletion/delivery for postfix queue

[pmg-devel] [PATCH pmg-api/pmg-gui v3 0/2] fix #3450: batch deletion/delivery for postfix queue

[Hannes Laimer]

Adds a new POST endpoint that accepts both a type(delete/deliver) and a
list of id's. This is also how batch operations are done for quarantine.

https://bugzilla.proxmox.com/show_bug.cgi?id=3450

v3, thanks @Thomas:
 - code cleanup
 - add more context to commit messages
 - remove not needed checks when passing a list of ids to `postsuper -d -`
 - ui: use INFO instead of WARNING confirm popup, same as we do for quarantine
 - ui: no confirmation for flush of single mails, so existing behaviour of the
   button does not change

v2:
 - instead of 'filter' use the IDs directly
 - UI now doesn't have extra buttons, the existing Remove and Flush ones
   will just work with either one or multiple selected items

pmg-api:

Hannes Laimer (1):
  fix #3450: api: queue: add POST endpoint for batch deletion/delivery

 src/PMG/API2/Postfix.pm | 40 ++++++++++++++++++++++++++++++++++++++++
 src/PMG/Postfix.pm      | 24 ++++++++++++++++++++++++
 2 files changed, 64 insertions(+)


pmg-gui:

Hannes Laimer (1):
  fix #3450: ui: queue: multi-select for item deletion/delivery

 js/PostfixMailQueue.js | 100 ++++++++++++++++++++++++++++-------------
 1 file changed, 68 insertions(+), 32 deletions(-)


Summary over all repositories:
  3 files changed, 132 insertions(+), 32 deletions(-)

-- 
Generated by git-murpp 0.8.1


_______________________________________________
pmg-devel mailing list
pmg-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel

[pmg-devel] [PATCH pmg-api v3 1/1] fix #3450: api: queue: add POST endpoint for batch deletion/delivery

[Hannes Laimer]

Delivery is done using `postqueue -i <id>`, this is slower than using
`postsuper -r -`. But `postsuper -r -` would only re-queue the mails,
they'd also recieve new IDs. Flush should rather be an immediate delivery
attempt.
The flushing of 2000 mails took ~8s, since 2000 is the max amount
possible through the UI this is ok I think.

DELETE endpoints don't accept data, that is why we didn't extend the
existing DELETE endpoint with an optional `ids` field. This is also how
batch actions, including delete, are done for quarantine.

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
 src/PMG/API2/Postfix.pm | 40 ++++++++++++++++++++++++++++++++++++++++
 src/PMG/Postfix.pm      | 24 ++++++++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/src/PMG/API2/Postfix.pm b/src/PMG/API2/Postfix.pm
index ba0689c..a8f9995 100644
--- a/src/PMG/API2/Postfix.pm
+++ b/src/PMG/API2/Postfix.pm
@@ -335,6 +335,46 @@ __PACKAGE__->register_method({
     },
 });
 
+__PACKAGE__->register_method({
+    name => 'queue_action',
+    path => 'queue/{queue}',
+    method => 'POST',
+    description => "Perform an action on the given queue IDs (delete/deliver).",
+    proxyto => 'node',
+    permissions => { check => ['admin'] },
+    protected => 1,
+    parameters => {
+        additionalProperties => 0,
+        properties => {
+            node => get_standard_option('pve-node'),
+            queue => $queue_name_option,
+            action => {
+                description => 'Operation to perform on the given IDs.',
+                type => 'string',
+                enum => ['delete', 'deliver'],
+            },
+            ids => {
+                description => 'Queue ID(s), separated by semicolons (;).',
+                type => 'string',
+                pattern => '[a-zA-Z0-9]{8,20}(;[a-zA-Z0-9]{8,20})*',
+            },
+        },
+    },
+    returns => { type => 'null' },
+    code => sub {
+        my ($param) = @_;
+        my @id_list = PVE::Tools::split_list($param->{ids});
+
+        if ($param->{action} eq 'delete') {
+            PMG::Postfix::delete_queue_ids($param->{queue}, \@id_list);
+        } elsif ($param->{action} eq 'deliver') {
+            PMG::Postfix::flush_queue_ids(\@id_list);
+        }
+
+        return undef;
+    },
+});
+
 __PACKAGE__->register_method({
     name => 'delete_queue',
     path => 'queue/{queue}',
diff --git a/src/PMG/Postfix.pm b/src/PMG/Postfix.pm
index 966130f..ca7ac40 100644
--- a/src/PMG/Postfix.pm
+++ b/src/PMG/Postfix.pm
@@ -221,6 +221,30 @@ sub delete_queue {
     PVE::Tools::run_command($cmd);
 }
 
+# delete multiple mails by queue IDs
+sub delete_queue_ids {
+    my ($queue, $ids) = @_;
+
+    return if !$ids || ref($ids) ne 'ARRAY' || !@$ids;
+
+    my $input = join("\n", @$ids) . "\n";
+    my $cmd = ['/usr/sbin/postsuper', '-d', '-'];
+    push @$cmd, $queue if defined($queue);
+
+    PVE::Tools::run_command($cmd, input => $input);
+}
+
+# flush multiple mails by queue IDs
+sub flush_queue_ids {
+    my ($ids) = @_;
+
+    return if !$ids || ref($ids) ne 'ARRAY' || !@$ids;
+
+    for my $qid (@$ids) {
+        PVE::Tools::run_command(['/usr/sbin/postqueue', '-i', $qid]);
+    }
+}
+
 sub discard_verify_cache {
     unlink "/var/lib/postfix/verify_cache.db";
 
-- 
2.47.3



_______________________________________________
pmg-devel mailing list
pmg-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel

[pmg-devel] [PATCH pmg-gui v3 1/1] fix #3450: ui: queue: multi-select for item deletion/delivery

[Hannes Laimer]

ExtJS does not allow having a "select all" checkbox in the header for
buffered stores, that is why we have to use `Ext.data.Store` instead.

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
 js/PostfixMailQueue.js | 100 ++++++++++++++++++++++++++++-------------
 1 file changed, 68 insertions(+), 32 deletions(-)

diff --git a/js/PostfixMailQueue.js b/js/PostfixMailQueue.js
index 17c7d05..ec39df9 100644
--- a/js/PostfixMailQueue.js
+++ b/js/PostfixMailQueue.js
@@ -22,8 +22,14 @@ Ext.define('PMG.Postfix.MailQueue', {
 
     queuename: 'deferred',
 
+    selModel: {
+        selType: 'checkboxmodel',
+        mode: 'MULTI',
+        showHeaderCheckbox: true,
+    },
+
     store: {
-        xclass: 'Ext.data.BufferedStore',
+        xclass: 'Ext.data.Store',
         model: 'pmg-mailq',
         remoteFilter: true,
         remoteSort: true,
@@ -54,42 +60,64 @@ Ext.define('PMG.Postfix.MailQueue', {
 
         onFlush: function (button, event, rec) {
             var view = this.getView();
+            let sel = view.getSelectionModel().getSelection();
+            let ids = sel.map((r) => r.get('queue_id'));
+
+            let do_deliver = function () {
+                Proxmox.Utils.API2Request({
+                    url: `/api2/extjs/nodes/${view.nodename}/postfix/queue/${view.queuename}`,
+                    method: 'POST',
+                    params: { action: 'deliver', ids: ids.join(';') },
+                    waitMsgTarget: view,
+                    success: () => {
+                        view.selModel.deselectAll();
+                        view.store.load();
+                    },
+                    failure: (response) => Ext.Msg.alert(gettext('Error'), response.htmlStatus),
+                });
+            }
 
-            Proxmox.Utils.API2Request({
-                url:
-                    '/api2/extjs/nodes/' +
-                    view.nodename +
-                    '/postfix/queue/' +
-                    view.queuename +
-                    '/' +
-                    rec.data.queue_id,
-                method: 'POST',
-                waitMsgTarget: view,
-                failure: function (response, opts) {
-                    Ext.Msg.alert(gettext('Error'), response.htmlStatus);
-                },
-            });
+            if (sel.length === 1) {
+                do_deliver();
+            } else if (sel.length > 1) {
+                Ext.Msg.show({
+                    title: gettext('Confirm'),
+                    message: Ext.String.format(gettext("Deliver {0} selected mails now?"), ids.length),
+                    buttons: Ext.Msg.YESNO,
+                    icon: Ext.Msg.INFO,
+                    fn: function (btn) {
+                        if (btn === 'yes') { do_deliver(); }
+                    },
+                });
+            }
         },
 
         onRemove: function (button, event, rec) {
             var view = this.getView();
+            let sel = view.getSelectionModel().getSelection();
+            let ids = sel.map((r) => r.get('queue_id'));
+
+            let do_delete = function () {
+                Proxmox.Utils.API2Request({
+                    url: `/api2/extjs/nodes/${view.nodename}/postfix/queue/${view.queuename}`,
+                    method: 'POST',
+                    params: { action: 'delete', ids: ids.join(';') },
+                    waitMsgTarget: view,
+                    success: () => {
+                        view.selModel.deselectAll();
+                        view.store.load();
+                    },
+                    failure: (response) => Ext.Msg.alert(gettext('Error'), response.htmlStatus),
+                });
+            }
 
-            Proxmox.Utils.API2Request({
-                url:
-                    '/api2/extjs/nodes/' +
-                    view.nodename +
-                    '/postfix/queue/' +
-                    view.queuename +
-                    '/' +
-                    rec.data.queue_id,
-                method: 'DELETE',
-                waitMsgTarget: view,
-                success: function (response, opts) {
-                    view.selModel.deselectAll();
-                    view.store.load();
-                },
-                failure: function (response, opts) {
-                    Ext.Msg.alert(gettext('Error'), response.htmlStatus);
+            Ext.Msg.show({
+                title: gettext('Confirm'),
+                message: Ext.String.format(gettext("Delete {0} selected mails?"), ids.length),
+                buttons: Ext.Msg.YESNO,
+                icon: Ext.Msg.INFO,
+                fn: function (btn) {
+                    if (btn === 'yes') { do_delete(); }
                 },
             });
         },
@@ -130,6 +158,12 @@ Ext.define('PMG.Postfix.MailQueue', {
     tbar: [
         {
             xtype: 'proxmoxButton',
+            reference: 'headerBtn',
+            enableFn: function (rec) {
+                let grid = this.up('grid');
+                if (!grid) { return false; }
+                return grid.getSelectionModel().getCount() === 1;
+            },
             disabled: true,
             text: gettext('Headers'),
             handler: 'onHeaders',
@@ -141,7 +175,9 @@ Ext.define('PMG.Postfix.MailQueue', {
             handler: 'onFlush',
         },
         {
-            xtype: 'proxmoxStdRemoveButton',
+            xtype: 'proxmoxButton',
+            disabled: true,
+            text: gettext('Remove'),
             handler: 'onRemove',
         },
         {
-- 
2.47.3



_______________________________________________
pmg-devel mailing list
pmg-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel