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 33A1A99F02 for ; Tue, 14 Nov 2023 14:07:35 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 144A930E68 for ; Tue, 14 Nov 2023 14:07:05 +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, 14 Nov 2023 14:07:03 +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 51D0442993 for ; Tue, 14 Nov 2023 14:00:19 +0100 (CET) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Tue, 14 Nov 2023 13:59:45 +0100 Message-Id: <20231114130000.565122-38-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231114130000.565122-1-l.wagner@proxmox.com> References: <20231114130000.565122-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.009 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 v2 proxmox-widget-toolkit 37/52] notification ui: remove filter setting for targets 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, 14 Nov 2023 13:07:35 -0000 Signed-off-by: Lukas Wagner --- src/Makefile | 1 - src/form/NotificationFilterSelector.js | 58 ------------------------- src/panel/GotifyEditPanel.js | 9 ---- src/panel/NotificationGroupEditPanel.js | 9 ---- src/panel/SendmailEditPanel.js | 9 ---- 5 files changed, 86 deletions(-) delete mode 100644 src/form/NotificationFilterSelector.js diff --git a/src/Makefile b/src/Makefile index 21fbe76..85ecea4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -44,7 +44,6 @@ JSSRC= \ form/RoleSelector.js \ form/DiskSelector.js \ form/MultiDiskSelector.js \ - form/NotificationFilterSelector.js \ form/TaskTypeSelector.js \ form/ACME.js \ form/UserSelector.js \ diff --git a/src/form/NotificationFilterSelector.js b/src/form/NotificationFilterSelector.js deleted file mode 100644 index d2ab8be..0000000 --- a/src/form/NotificationFilterSelector.js +++ /dev/null @@ -1,58 +0,0 @@ -Ext.define('Proxmox.form.NotificationFilterSelector', { - extend: 'Proxmox.form.ComboGrid', - alias: ['widget.pmxNotificationFilterSelector'], - - // set default value to empty array, else it inits it with - // null and after the store load it is an empty array, - // triggering dirtychange - value: [], - valueField: 'name', - displayField: 'name', - deleteEmpty: true, - skipEmptyText: true, - allowBlank: true, - editable: false, - autoSelect: false, - - listConfig: { - columns: [ - { - header: gettext('Filter'), - dataIndex: 'name', - sortable: true, - hideable: false, - flex: 1, - }, - { - header: gettext('Comment'), - dataIndex: 'comment', - sortable: true, - hideable: false, - flex: 2, - }, - ], - }, - - initComponent: function() { - let me = this; - - Ext.apply(me, { - store: { - fields: ['name', 'comment'], - proxy: { - type: 'proxmox', - url: `/api2/json/${me.baseUrl}/filters`, - }, - sorters: [ - { - property: 'name', - direction: 'ASC', - }, - ], - autoLoad: true, - }, - }); - - me.callParent(); - }, -}); diff --git a/src/panel/GotifyEditPanel.js b/src/panel/GotifyEditPanel.js index 3ddcc4d..5d814e5 100644 --- a/src/panel/GotifyEditPanel.js +++ b/src/panel/GotifyEditPanel.js @@ -32,15 +32,6 @@ Ext.define('Proxmox.panel.GotifyEditPanel', { allowBlank: '{!isCreate}', }, }, - { - xtype: 'pmxNotificationFilterSelector', - name: 'filter', - fieldLabel: gettext('Filter'), - cbind: { - deleteEmpty: '{!isCreate}', - baseUrl: '{baseUrl}', - }, - }, { xtype: 'proxmoxtextfield', name: 'comment', diff --git a/src/panel/NotificationGroupEditPanel.js b/src/panel/NotificationGroupEditPanel.js index aa76810..910d15a 100644 --- a/src/panel/NotificationGroupEditPanel.js +++ b/src/panel/NotificationGroupEditPanel.js @@ -21,15 +21,6 @@ Ext.define('Proxmox.panel.NotificationGroupEditPanel', { name: 'endpoint', allowBlank: false, }, - { - xtype: 'pmxNotificationFilterSelector', - name: 'filter', - fieldLabel: gettext('Filter'), - cbind: { - deleteEmpty: '{!isCreate}', - baseUrl: '{baseUrl}', - }, - }, { xtype: 'proxmoxtextfield', name: 'comment', diff --git a/src/panel/SendmailEditPanel.js b/src/panel/SendmailEditPanel.js index ace6129..16abebc 100644 --- a/src/panel/SendmailEditPanel.js +++ b/src/panel/SendmailEditPanel.js @@ -86,15 +86,6 @@ Ext.define('Proxmox.panel.SendmailEditPanel', { return this.up('pmxSendmailEditPanel').mailValidator(); }, }, - { - xtype: 'pmxNotificationFilterSelector', - name: 'filter', - fieldLabel: gettext('Filter'), - cbind: { - deleteEmpty: '{!isCreate}', - baseUrl: '{baseUrl}', - }, - }, { xtype: 'proxmoxtextfield', name: 'comment', -- 2.39.2