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 5275996EF for ; Thu, 3 Aug 2023 14:23:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 311D031B7 for ; Thu, 3 Aug 2023 14:23:25 +0200 (CEST) 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 ; Thu, 3 Aug 2023 14:23:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7A6F242627 for ; Thu, 3 Aug 2023 14:17:36 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Thu, 3 Aug 2023 14:17:16 +0200 Message-Id: <20230803121719.519207-28-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230803121719.519207-1-l.wagner@proxmox.com> References: <20230803121719.519207-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.048 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 v6 proxmox-widget-toolkit 27/30] notification: add gui for notification groups 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: Thu, 03 Aug 2023 12:23:25 -0000 The GUI is based on the 'plugin-based' dialog window EndpointEditBase that was introduced in an earlier commit. Signed-off-by: Lukas Wagner --- Notes: Changes since v5: - Extended commit message Changes since v3: - Use items/advancedItems instead of columns - Call initField in EndpointSelector - Minor code style improvements src/Makefile | 1 + src/Schema.js | 5 + src/panel/NotificationGroupEditPanel.js | 174 ++++++++++++++++++++++++ src/window/EndpointEditBase.js | 6 +- 4 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 src/panel/NotificationGroupEditPanel.js diff --git a/src/Makefile b/src/Makefile index 2e620e3..829081d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -61,6 +61,7 @@ JSSRC= \ panel/LogView.js \ panel/NodeInfoRepoStatus.js \ panel/NotificationConfigView.js \ + panel/NotificationGroupEditPanel.js \ panel/JournalView.js \ panel/PermissionView.js \ panel/PruneKeepPanel.js \ diff --git a/src/Schema.js b/src/Schema.js index 37ecd88..a7ffdf8 100644 --- a/src/Schema.js +++ b/src/Schema.js @@ -48,6 +48,11 @@ Ext.define('Proxmox.Schema', { // a singleton ipanel: 'pmxGotifyEditPanel', iconCls: 'fa-bell-o', }, + group: { + name: gettext('Notification Group'), + ipanel: 'pmxNotificationGroupEditPanel', + iconCls: 'fa-bell-o', + }, }, pxarFileTypes: { diff --git a/src/panel/NotificationGroupEditPanel.js b/src/panel/NotificationGroupEditPanel.js new file mode 100644 index 0000000..910d15a --- /dev/null +++ b/src/panel/NotificationGroupEditPanel.js @@ -0,0 +1,174 @@ +Ext.define('Proxmox.panel.NotificationGroupEditPanel', { + extend: 'Proxmox.panel.InputPanel', + xtype: 'pmxNotificationGroupEditPanel', + mixins: ['Proxmox.Mixin.CBind'], + + type: 'group', + + items: [ + { + xtype: 'pmxDisplayEditField', + name: 'name', + cbind: { + value: '{name}', + editable: '{isCreate}', + }, + fieldLabel: gettext('Group Name'), + allowBlank: false, + }, + { + xtype: 'pmxNotificationEndpointSelector', + name: 'endpoint', + allowBlank: false, + }, + { + xtype: 'proxmoxtextfield', + name: 'comment', + fieldLabel: gettext('Comment'), + cbind: { + deleteEmpty: '{!isCreate}', + }, + }, + ], +}); + +Ext.define('Proxmox.form.NotificationEndpointSelector', { + extend: 'Ext.grid.Panel', + alias: 'widget.pmxNotificationEndpointSelector', + + mixins: { + field: 'Ext.form.field.Field', + }, + + padding: '0 0 10 0', + + allowBlank: true, + selectAll: false, + isFormField: true, + + store: { + autoLoad: true, + model: 'proxmox-notification-endpoints', + sorters: 'name', + filters: item => item.data.type !== 'group', + }, + + columns: [ + { + header: gettext('Endpoint Name'), + dataIndex: 'name', + flex: 1, + }, + { + header: gettext('Type'), + dataIndex: 'type', + flex: 1, + }, + { + header: gettext('Comment'), + dataIndex: 'comment', + flex: 3, + }, + ], + + selModel: { + selType: 'checkboxmodel', + mode: 'SIMPLE', + }, + + checkChangeEvents: [ + 'selectionchange', + 'change', + ], + + listeners: { + selectionchange: function() { + // to trigger validity and error checks + this.checkChange(); + }, + }, + + getSubmitData: function() { + let me = this; + let res = {}; + res[me.name] = me.getValue(); + return res; + }, + + getValue: function() { + let me = this; + if (me.savedValue !== undefined) { + return me.savedValue; + } + let sm = me.getSelectionModel(); + return (sm.getSelection() ?? []).map(item => item.data.name); + }, + + setValueSelection: function(value) { + let me = this; + + let store = me.getStore(); + + let notFound = []; + let selection = value.map(item => { + let found = store.findRecord('name', item, 0, false, true, true); + if (!found) { + notFound.push(item); + } + return found; + }).filter(r => r); + + for (const name of notFound) { + let rec = store.add({ + name, + type: '-', + comment: gettext('Included endpoint does not exist!'), + }); + selection.push(rec[0]); + } + + let sm = me.getSelectionModel(); + if (selection.length) { + sm.select(selection); + } else { + sm.deselectAll(); + } + // to correctly trigger invalid class + me.getErrors(); + }, + + setValue: function(value) { + let me = this; + + let store = me.getStore(); + if (!store.isLoaded()) { + me.savedValue = value; + store.on('load', function() { + me.setValueSelection(value); + delete me.savedValue; + }, { single: true }); + } else { + me.setValueSelection(value); + } + return me.mixins.field.setValue.call(me, value); + }, + + getErrors: function(value) { + let me = this; + if (!me.isDisabled() && me.allowBlank === false && + me.getSelectionModel().getCount() === 0) { + me.addBodyCls(['x-form-trigger-wrap-default', 'x-form-trigger-wrap-invalid']); + return [gettext('No endpoint selected')]; + } + + me.removeBodyCls(['x-form-trigger-wrap-default', 'x-form-trigger-wrap-invalid']); + return []; + }, + + initComponent: function() { + let me = this; + me.callParent(); + me.initField(); + }, + +}); diff --git a/src/window/EndpointEditBase.js b/src/window/EndpointEditBase.js index 7e4c910..9230b99 100644 --- a/src/window/EndpointEditBase.js +++ b/src/window/EndpointEditBase.js @@ -18,7 +18,11 @@ Ext.define('Proxmox.window.EndpointEditBase', { throw "baseUrl not set"; } - me.url = `/api2/extjs${me.baseUrl}/endpoints/${me.type}`; + if (me.type === 'group') { + me.url = `/api2/extjs${me.baseUrl}/groups`; + } else { + me.url = `/api2/extjs${me.baseUrl}/endpoints/${me.type}`; + } if (me.isCreate) { me.method = 'POST'; -- 2.39.2