From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 313B69378F for ; Fri, 7 Apr 2023 15:43:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BA4771A795 for ; Fri, 7 Apr 2023 15:43:09 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 7 Apr 2023 15:43:08 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 76F5446456 for ; Fri, 7 Apr 2023 15:43:07 +0200 (CEST) From: Leo Nunner To: pmg-devel@lists.proxmox.com Date: Fri, 7 Apr 2023 15:42:55 +0200 Message-Id: <20230407134258.199691-10-l.nunner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230407134258.199691-1-l.nunner@proxmox.com> References: <20230407134258.199691-1-l.nunner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.121 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pmg-devel] [PATCH pmg-gui 1/2] feature: negate objects inside rules X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Apr 2023 13:43:10 -0000 This patch exposes the new 'negate' parameter through the GUI. All objects (except for actions) now have a small icon next to them in the rule overview, and clicking it will toggle the respective negation setting. Negated objects are marked by a small 'NOT' before the object name. Signed-off-by: Leo Nunner --- js/RuleInfo.js | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/js/RuleInfo.js b/js/RuleInfo.js index b7802fa..d14e229 100644 --- a/js/RuleInfo.js +++ b/js/RuleInfo.js @@ -58,6 +58,22 @@ Ext.define('PMG.RuleInfo', { ); }, + updateNegateObjectGroup: function(rec) { + var me = this; + Proxmox.Utils.API2Request({ + url: me.getViewModel().get('baseurl') + '/' + rec.data.oclass + '/'+ rec.data.typeid, + method: 'PUT', + params: { negate: rec.data.negate ? 0 : 1 }, + waitMsgTarget: me.getView(), + callback: function() { + me.reload(); + }, + failure: function(response, opts) { + Ext.Msg.alert(gettext('Error'), response.htmlStatus); + }, + }); + }, + addObjectGroup: function(type, record) { var me = this; var baseurl = me.getViewModel().get('baseurl'); @@ -113,7 +129,7 @@ Ext.define('PMG.RuleInfo', { }); store.load(); Ext.Array.each(ruledata[oc], function(og) { - data.push({ oclass: oc, name: og.name, typeid: og.id }); + data.push({ oclass: oc, name: og.name, typeid: og.id, negate: og.negate }); }); }); @@ -126,6 +142,11 @@ Ext.define('PMG.RuleInfo', { me.removeObjectGroup(record); }, + negateIconClick: function(gridView, rowindex, colindex, button, event, record) { + var me = this; + me.updateNegateObjectGroup(record); + }, + removeDrop: function(gridView, data, overModel) { var me = this; var record = data.records[0]; // only one @@ -163,7 +184,7 @@ Ext.define('PMG.RuleInfo', { stores: { objects: { - fields: ['oclass', 'name', 'typeid'], + fields: ['oclass', 'name', 'typeid', 'negate'], groupField: 'oclass', sorters: 'name', }, @@ -294,8 +315,28 @@ Ext.define('PMG.RuleInfo', { { header: gettext('Name'), dataIndex: 'name', + renderer: function(value, data, record) { + return record.data.negate ? '' + gettext("NOT") + ' ' + value : value; + }, flex: 1, }, + { + text: '', + xtype: 'actioncolumn', + align: 'center', + width: 40, + items: [ + { + getClass: function(v, m, { data }) { + if (data.oclass === 'action') return ''; + return 'fa fa-fw fa-refresh'; + }, + isActionDisabled: (v, r, c, i, { data }) => data.oclass === 'action', + tooltip: gettext('Negate'), + handler: 'negateIconClick', + }, + ], + }, { text: '', xtype: 'actioncolumn', -- 2.30.2