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 C953A9FAEB for ; Tue, 7 Nov 2023 11:20:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D4B4D30452 for ; Tue, 7 Nov 2023 11:19:11 +0100 (CET) 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 ; Tue, 7 Nov 2023 11:19:09 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 6F62D46959 for ; Tue, 7 Nov 2023 11:19:07 +0100 (CET) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Tue, 7 Nov 2023 11:18:24 +0100 Message-Id: <20231107101827.340100-25-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107101827.340100-1-l.wagner@proxmox.com> References: <20231107101827.340100-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.016 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH proxmox-widget-toolkit 24/27] notification ui: rename filter to matcher X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2023 10:20:02 -0000 Signed-off-by: Lukas Wagner --- 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