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 7F86B9615A for ; Mon, 15 Apr 2024 11:51:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 656C06D8A for ; Mon, 15 Apr 2024 11:51:07 +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 ; Mon, 15 Apr 2024 11:51:06 +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 8F1EA44A8C for ; Mon, 15 Apr 2024 11:51:06 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Mon, 15 Apr 2024 11:51:01 +0200 Message-Id: <20240415095102.2566187-1-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.004 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 Subject: [pve-devel] [PATCH manager v2 1/2] ui: dc: backup: improve UX for the different 'notification-mode's 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: Mon, 15 Apr 2024 09:51:07 -0000 - Switch order of 'mailto' and 'mailnotification' field - When mode is 'auto', disable 'mailtnotification' field - When mode is 'auto' and 'mailto' is empty, show hint that the notification system will be used Signed-off-by: Lukas Wagner Tested-by: Maximiliano Sandoval --- Notes: Changes since v1: - Set 'mailNotification' in viewModel to 'always' to avoid the combobox being empty initially www/manager6/dc/Backup.js | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js index 70903bdc..70b5604e 100644 --- a/www/manager6/dc/Backup.js +++ b/www/manager6/dc/Backup.js @@ -207,13 +207,25 @@ Ext.define('PVE.dc.BackupEdit', { data: { selMode: 'include', notificationMode: '__default__', + mailto: '', + mailNotification: 'always', }, formulas: { poolMode: (get) => get('selMode') === 'pool', - disableVMSelection: (get) => get('selMode') !== 'include' && get('selMode') !== 'exclude', + disableVMSelection: (get) => get('selMode') !== 'include' && + get('selMode') !== 'exclude', showMailtoFields: (get) => ['auto', 'legacy-sendmail', '__default__'].includes(get('notificationMode')), + enableMailnotificationField: (get) => { + let mode = get('notificationMode'); + let mailto = get('mailto'); + + return (['auto', '__default__'].includes(mode) && mailto) || + mode === 'legacy-sendmail'; + }, + hintTextVisible: (get) => + ['auto', '__default__'].includes(get('notificationMode')) && !get('mailto'), }, }, @@ -325,6 +337,15 @@ Ext.define('PVE.dc.BackupEdit', { value: '{notificationMode}', }, }, + { + xtype: 'textfield', + fieldLabel: gettext('Send email to'), + name: 'mailto', + bind: { + hidden: '{!showMailtoFields}', + value: '{mailto}', + }, + }, { xtype: 'pveEmailNotificationSelector', fieldLabel: gettext('Send email'), @@ -334,15 +355,18 @@ Ext.define('PVE.dc.BackupEdit', { deleteEmpty: '{!isCreate}', }, bind: { - disabled: '{!showMailtoFields}', + hidden: '{!showMailtoFields}', + disabled: '{!enableMailnotificationField}', + value: '{mailNotification}', }, }, { - xtype: 'textfield', - fieldLabel: gettext('Send email to'), - name: 'mailto', + xtype: 'displayfield', + userCls: 'pmx-hint', + hidden: true, + value: gettext('No email configured, the notification system will be used'), bind: { - disabled: '{!showMailtoFields}', + hidden: '{!hintTextVisible}', }, }, { -- 2.39.2