[pbs-devel] [PATCH proxmox-backup 2/3] ui: Show if Filter includes or excludes

[Philipp Hufnagl]

To make the UI compatible, the Group Filter dialogue has been extended
by a "behaviour" column which will show if the filter includes or
excludes the matches.

While it would be a nice feature to also re-sort the filter in the GUI,
it is not strictly needed for it to work and should (in my option) be
done in an other patch.

Signed-off-by: Philipp Hufnagl <p.hufnagl at proxmox.com>
---
 www/form/GroupFilter.js | 57 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 4 deletions(-)

diff --git a/www/form/GroupFilter.js b/www/form/GroupFilter.js
index dee37b0b..10ac02c4 100644
--- a/www/form/GroupFilter.js
+++ b/www/form/GroupFilter.js
@@ -45,6 +45,22 @@ Ext.define('PBS.form.GroupFilter', {
 	    me.updateRealField();
 	},
 
+
+	onBehaviourChange: function(field, value) {
+	    let me = this;
+	    let record = field.getWidgetRecord();
+	    if (record === undefined) {
+		return;
+	    }
+
+	    record.set('behaviour', value);
+	    record.commit();
+	    if (record.widgets) {
+		me.setInputValue(record.widgets, record);
+	    }
+	    me.updateRealField();
+	},
+
 	onTypeChange: function(field, value) {
 	    let me = this;
 	    let record = field.getWidgetRecord();
@@ -77,8 +93,12 @@ Ext.define('PBS.form.GroupFilter', {
 	},
 
 	parseGroupFilter: function(filter) {
-	    let [, type, input] = filter.match(/^(type|group|regex):(.*)$/);
+	    let [, behaviour, type, input] = filter.match(/^(?:(exclude|include):)?(type|group|regex):(.*)$/);
+	    if (behaviour === undefined) {
+		behaviour = "include";
+	    }
 	    return {
+		behaviour,
 		type,
 		input,
 	    };
@@ -163,8 +183,12 @@ Ext.define('PBS.form.GroupFilter', {
 
 	    let filter = [];
 	    me.lookup('grid').getStore().each((rec) => {
-		if (rec.data.type && rec.data.input) {
-		    filter.push(`${rec.data.type}:${rec.data.input}`);
+		if (rec.data.type && rec.data.input && rec.data.behaviour) {
+		    let behaviour_string = '';
+		    if (rec.data.behaviour === 'exclude') {
+			behaviour_string = 'exclude:';
+		    }
+		    filter.push(`${behaviour_string}${rec.data.type}:${rec.data.input}`);
 		}
 	    });
 
@@ -175,6 +199,9 @@ Ext.define('PBS.form.GroupFilter', {
 	},
 
 	control: {
+	    'grid pbsGroupBehaviourSelector': {
+		change: 'onBehaviourChange',
+	    },
 	    'grid pbsGroupFilterTypeSelector': {
 		change: 'onTypeChange',
 	    },
@@ -277,6 +304,16 @@ Ext.define('PBS.form.GroupFilter', {
 		deferEmptyText: false,
 	    },
 	    columns: [
+		{
+		    text: gettext('Behaviour'),
+		    xtype: 'widgetcolumn',
+		    dataIndex: 'behaviour',
+		    flex: 1,
+		    widget: {
+			xtype: 'pbsGroupBehaviourSelector',
+			isFormField: false,
+		    },
+		},
 		{
 		    text: gettext('Filter Type'),
 		    xtype: 'widgetcolumn',
@@ -368,7 +405,7 @@ Ext.define('PBS.form.GroupFilter', {
 		    xtype: 'box',
 		    style: 'margin: 3px 0px;',
 		    html: `<span class="pmx-hint">${gettext('Note')}</span>: `
-			+ gettext('Filters are additive (OR-like)'),
+			+ gettext('Filters are additive or subtractive'),
 		},
 	    ],
 	},
@@ -384,6 +421,18 @@ Ext.define('PBS.form.GroupFilter', {
     },
 });
 
+Ext.define('PBS.form.pbsGroupBehaviourSelector', {
+    extend: 'Proxmox.form.KVComboBox',
+    alias: 'widget.pbsGroupBehaviourSelector',
+
+    allowBlank: false,
+
+    comboItems: [
+	['include', gettext('Include')],
+	['exclude', gettext('Exclude')],
+    ],
+});
+
 Ext.define('PBS.form.GroupFilterTypeSelector', {
     extend: 'Proxmox.form.KVComboBox',
     alias: 'widget.pbsGroupFilterTypeSelector',
-- 
2.39.2