[pmg-devel] [PATCH pmg-gui 1/2] feature: negate objects inside rules

Leo Nunner l.nunner at proxmox.com
Fri Apr 7 15:42:55 CEST 2023


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 <l.nunner at proxmox.com>
---
 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 ? '<span style="color:gray">' + gettext("NOT") + ' </span>' + 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





More information about the pmg-devel mailing list