[pve-devel] [PATCH proxmox-widget-toolkit 24/27] notification ui: rename filter to matcher

[Lukas Wagner]

Signed-off-by: Lukas Wagner <l.wagner at proxmox.com>
---
 src/Makefile                                  |  2 +-
 src/data/model/NotificationConfig.js          |  2 +-
 src/panel/NotificationConfigView.js           | 26 +++++++++----------
 ...lterEdit.js => NotificationMatcherEdit.js} | 14 +++++-----
 4 files changed, 22 insertions(+), 22 deletions(-)
 rename src/window/{NotificationFilterEdit.js => NotificationMatcherEdit.js} (92%)

diff --git a/src/Makefile b/src/Makefile
index e07f17c..c6d31c3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -88,7 +88,7 @@ JSSRC=					\
 	window/ACMEPluginEdit.js	\
 	window/ACMEDomains.js		\
 	window/EndpointEditBase.js	\
-	window/NotificationFilterEdit.js \
+	window/NotificationMatcherEdit.js \
 	window/FileBrowser.js		\
 	window/AuthEditBase.js		\
 	window/AuthEditOpenId.js	\
diff --git a/src/data/model/NotificationConfig.js b/src/data/model/NotificationConfig.js
index bb4ef85..f447db4 100644
--- a/src/data/model/NotificationConfig.js
+++ b/src/data/model/NotificationConfig.js
@@ -7,7 +7,7 @@ Ext.define('proxmox-notification-endpoints', {
     idProperty: 'name',
 });
 
-Ext.define('proxmox-notification-filters', {
+Ext.define('proxmox-notification-matchers', {
     extend: 'Ext.data.Model',
     fields: ['name', 'comment'],
     proxy: {
diff --git a/src/panel/NotificationConfigView.js b/src/panel/NotificationConfigView.js
index ba98395..ecf764d 100644
--- a/src/panel/NotificationConfigView.js
+++ b/src/panel/NotificationConfigView.js
@@ -21,7 +21,7 @@ Ext.define('Proxmox.panel.NotificationConfigView', {
 	    border: false,
 	    collapsible: true,
 	    animCollapse: false,
-	    xtype: 'pmxNotificationFilterView',
+	    xtype: 'pmxNotificationMatcherView',
 	    cbind: {
 		baseUrl: '{baseUrl}',
 	    },
@@ -209,21 +209,21 @@ Ext.define('Proxmox.panel.NotificationEndpointView', {
     },
 });
 
-Ext.define('Proxmox.panel.NotificationFilterView', {
+Ext.define('Proxmox.panel.NotificationMatcherView', {
     extend: 'Ext.grid.Panel',
-    alias: 'widget.pmxNotificationFilterView',
+    alias: 'widget.pmxNotificationMatcherView',
 
-    title: gettext('Notification Filters'),
+    title: gettext('Notification Matchers'),
 
     controller: {
 	xclass: 'Ext.app.ViewController',
 
-	openEditWindow: function(filter) {
+	openEditWindow: function(matcher) {
 	    let me = this;
 
-	    Ext.create('Proxmox.window.NotificationFilterEdit', {
+	    Ext.create('Proxmox.window.NotificationMatcherEdit', {
 		baseUrl: me.getView().baseUrl,
-		name: filter,
+		name: matcher,
 		autoShow: true,
 		listeners: {
 		    destroy: () => me.reload(),
@@ -253,12 +253,12 @@ Ext.define('Proxmox.panel.NotificationFilterView', {
 	activate: 'reload',
     },
 
-    emptyText: gettext('No notification filters configured'),
+    emptyText: gettext('No notification matchers configured'),
 
     columns: [
 	{
 	    dataIndex: 'name',
-	    text: gettext('Filter Name'),
+	    text: gettext('Matcher Name'),
 	    renderer: Ext.String.htmlEncode,
 	    flex: 1,
 	},
@@ -276,8 +276,8 @@ Ext.define('Proxmox.panel.NotificationFilterView', {
 	autoDestroyRstore: true,
 	rstore: {
 	    type: 'update',
-	    storeid: 'proxmox-notification-filters',
-	    model: 'proxmox-notification-filters',
+	    storeid: 'proxmox-notification-matchers',
+	    model: 'proxmox-notification-matchers',
 	    autoStart: true,
 	},
 	sorters: 'name',
@@ -307,12 +307,12 @@ Ext.define('Proxmox.panel.NotificationFilterView', {
 		{
 		    xtype: 'proxmoxStdRemoveButton',
 		    callback: 'reload',
-		    baseurl: `${me.baseUrl}/filters`,
+		    baseurl: `${me.baseUrl}/matchers`,
 		},
 	    ],
 	});
 
 	me.callParent();
-	me.store.rstore.proxy.setUrl(`/api2/json/${me.baseUrl}/filters`);
+	me.store.rstore.proxy.setUrl(`/api2/json/${me.baseUrl}/matchers`);
     },
 });
diff --git a/src/window/NotificationFilterEdit.js b/src/window/NotificationMatcherEdit.js
similarity index 92%
rename from src/window/NotificationFilterEdit.js
rename to src/window/NotificationMatcherEdit.js
index bcde4fa..a014f3e 100644
--- a/src/window/NotificationFilterEdit.js
+++ b/src/window/NotificationMatcherEdit.js
@@ -1,6 +1,6 @@
-Ext.define('Proxmox.panel.NotificationFilterEditPanel', {
+Ext.define('Proxmox.panel.NotificationMatcherEditPanel', {
     extend: 'Proxmox.panel.InputPanel',
-    xtype: 'pmxNotificationFilterEditPanel',
+    xtype: 'pmxNotificationMatcherEditPanel',
     mixins: ['Proxmox.Mixin.CBind'],
 
     items: [
@@ -11,7 +11,7 @@ Ext.define('Proxmox.panel.NotificationFilterEditPanel', {
 		value: '{name}',
 		editable: '{isCreate}',
 	    },
-	    fieldLabel: gettext('Filter Name'),
+	    fieldLabel: gettext('Matcher Name'),
 	    allowBlank: false,
 	},
 	{
@@ -65,7 +65,7 @@ Ext.define('Proxmox.panel.NotificationFilterEditPanel', {
     ],
 });
 
-Ext.define('Proxmox.window.NotificationFilterEdit', {
+Ext.define('Proxmox.window.NotificationMatcherEdit', {
     extend: 'Proxmox.window.Edit',
 
     isAdd: true,
@@ -85,7 +85,7 @@ Ext.define('Proxmox.window.NotificationFilterEdit', {
 	    throw "baseUrl not set";
 	}
 
-	me.url = `/api2/extjs${me.baseUrl}/filters`;
+	me.url = `/api2/extjs${me.baseUrl}/matchers`;
 
 	if (me.isCreate) {
 	    me.method = 'POST';
@@ -94,12 +94,12 @@ Ext.define('Proxmox.window.NotificationFilterEdit', {
 	    me.method = 'PUT';
 	}
 
-	me.subject = gettext('Notification Filter');
+	me.subject = gettext('Notification Matcher');
 
 	Ext.apply(me, {
 	    items: [{
 		name: me.name,
-		xtype: 'pmxNotificationFilterEditPanel',
+		xtype: 'pmxNotificationMatcherEditPanel',
 		isCreate: me.isCreate,
 		baseUrl: me.baseUrl,
 	    }],
-- 
2.39.2