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 E73629BC4D for ; Tue, 21 Nov 2023 13:52:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B857E95F4 for ; Tue, 21 Nov 2023 13:51:51 +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, 21 Nov 2023 13:51:51 +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 02CA74105D for ; Tue, 21 Nov 2023 13:51:51 +0100 (CET) Message-ID: <6dcefeac-8342-4b31-b905-ffa110a246af@proxmox.com> Date: Tue, 21 Nov 2023 13:51:50 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: pve-devel@lists.proxmox.com References: <20231121122328.134930-1-l.wagner@proxmox.com> <20231121122328.134930-4-l.wagner@proxmox.com> From: Philipp Hufnagl In-Reply-To: <20231121122328.134930-4-l.wagner@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.052 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: Re: [pve-devel] [PATCH v3 pve-manager 3/5] ui: backup jobs: add 'notification-mode' selector for backup jobs 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, 21 Nov 2023 12:52:21 -0000 On 11/21/23 13:23, Lukas Wagner wrote: > This selector allows one to selected between the 'old' (send email > directly via sendmail) or the 'new' notification system. > > The default is 'auto', which sends and email if one is configured, > and uses the notification system if no email address is set. > > Signed-off-by: Lukas Wagner > --- > www/manager6/dc/Backup.js | 33 ++++++++++++++++++++++++++++++++- > 1 file changed, 32 insertions(+), 1 deletion(-) > > diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js > index 9aae4090..8f7bab5a 100644 > --- a/www/manager6/dc/Backup.js > +++ b/www/manager6/dc/Backup.js > @@ -206,12 +206,15 @@ Ext.define('PVE.dc.BackupEdit', { > viewModel: { > data: { > selMode: 'include', > + notificationMode: '__default__', > }, > > formulas: { > poolMode: (get) => get('selMode') === 'pool', > disableVMSelection: (get) => get('selMode') !== 'include' && get('selMode') !== 'exclude', > - mailNotificationSelected: (get) => get('notificationMode') === 'mailto', > + showMailtoFields: (get) => { > + return ['auto', 'legacy-sendmail', '__default__'].includes(get('notificationMode')); > + }, WARN: line 215 col 33: arrow-body-style - Unexpected block statement surrounding arrow body; move the returned value immediately after the `=>`. (*) I think it wants you to inline this like showMailtoFields: (get) => ['auto', 'legacy-sendmail', '__default__'].includes(get('notificationMode')), > }, > }, > > @@ -301,6 +304,28 @@ Ext.define('PVE.dc.BackupEdit', { > }, > ], > column2: [ > + { > + xtype: 'proxmoxKVComboBox', > + comboItems: [ > + [ > + '__default__', > + Ext.String.format( > + gettext('{0} (Auto)'), Proxmox.Utils.defaultText nit: comma > + ) nit: comma > + ], > + ['auto', gettext('Auto')], > + ['legacy-sendmail', gettext('Email (legacy)')], > + ['notification-system', gettext('Notification system')], > + ], > + fieldLabel: gettext('Notification mode'), > + name: 'notification-mode', > + cbind: { > + deleteEmpty: '{!isCreate}', > + }, > + bind: { > + value: '{notificationMode}', > + }, > + }, > { > xtype: 'pveEmailNotificationSelector', > fieldLabel: gettext('Notify'), > @@ -309,11 +334,17 @@ Ext.define('PVE.dc.BackupEdit', { > value: (get) => get('isCreate') ? 'always' : '', > deleteEmpty: '{!isCreate}', > }, > + bind: { > + disabled: '{!showMailtoFields}', > + } nit: comma > }, > { > xtype: 'textfield', > fieldLabel: gettext('Send email to'), > name: 'mailto', > + bind: { > + disabled: '{!showMailtoFields}', > + } nit: comma > }, > { > xtype: 'pveBackupCompressionSelector',