From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 1D3DC1FF15C
for <inbox@lore.proxmox.com>; Fri, 13 Jun 2025 15:52:07 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id CB9EC117B0;
Fri, 13 Jun 2025 15:52:27 +0200 (CEST)
Message-ID: <a3815adc-d186-4ba1-b2cb-5a1344aebd93@proxmox.com>
Date: Fri, 13 Jun 2025 15:51:55 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Lukas Wagner <l.wagner@proxmox.com>
References: <20250611125927.272238-1-l.wagner@proxmox.com>
<20250611125927.272238-2-l.wagner@proxmox.com>
From: =?UTF-8?Q?Michael_K=C3=B6ppl?= <m.koeppl@proxmox.com>
Content-Language: en-US
In-Reply-To: <20250611125927.272238-2-l.wagner@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.019 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: Re: [pve-devel] [PATCH manager 2/2] ui: one-shot backup: remove
'auto' notification mode for clarity
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
On 6/11/25 14:59, Lukas Wagner wrote:
> The 'auto' mode does not really add any functionality but only adds
> confusion about what it actually does, so we completely remove it from
> the UI. It is still supported by the backend, but in the UI we map it to
> a concrete mode (either notification-system or legacy-sendmail,
> depending on whether mailto is set).
>
> We also stop using the term 'notification system' in the UI, instead it
> is called "Global Notification Settings".
>
> Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
> ---
> www/manager6/window/Backup.js | 32 +++++++++++++++++++++-----------
> 1 file changed, 21 insertions(+), 11 deletions(-)
>
> diff --git a/www/manager6/window/Backup.js b/www/manager6/window/Backup.js
> index 70b51409..d80a6e85 100644
> --- a/www/manager6/window/Backup.js
> +++ b/www/manager6/window/Backup.js
> @@ -33,22 +33,22 @@ Ext.define('PVE.window.Backup', {
> let mailtoField = Ext.create('Ext.form.field.Text', {
> fieldLabel: gettext('Send email to'),
> name: 'mailto',
> + hidden: true,
> emptyText: Proxmox.Utils.noneText,
> });
>
> let notificationModeSelector = Ext.create({
> xtype: 'proxmoxKVComboBox',
> comboItems: [
> - ['auto', gettext('Auto')],
> - ['legacy-sendmail', gettext('Email (legacy)')],
> - ['notification-system', gettext('Notification system')],
> + ['notification-system', gettext('Use global settings')],
> + ['legacy-sendmail', gettext('Use sendmail')],
> ],
> - fieldLabel: gettext('Notification mode'),
> + fieldLabel: gettext('Notification'),
> name: 'notification-mode',
> - value: 'auto',
> + value: 'notification-system',
> listeners: {
> change: function(field, value) {
> - mailtoField.setDisabled(value === 'notification-system');
> + mailtoField.setHidden(value === 'notification-system');
While this does work, I think I'd prefer it if the field is always
visible and is enabled or disabled depending on the selection of the
notification system. With the hidden field, UI shifts a tiny bit once it
becomes visible (Firefox 139.0.1). Since the Backup window is not super
cluttered, I think this additional field could always be visible, but
that's just my two cents.
> },
> },
> });
> @@ -170,11 +170,21 @@ Ext.define('PVE.window.Backup', {
> success: function(response, opts) {
> const data = response.result.data;
>
> - if (!initialDefaults && data.mailto !== undefined) {
> - mailtoField.setValue(data.mailto);
> - }
> - if (!initialDefaults && data['notification-mode'] !== undefined) {
> - notificationModeSelector.setValue(data['notification-mode']);
> + if (!initialDefaults) {
> + let notificationMode = data['notification-mode'] ?? 'auto';
> + let mailto = data.mailto;
> +
> + if (notificationMode === 'auto' && mailto !== undefined) {
> + notificationMode = 'legacy-sendmail';
> + }
> + if (notificationMode === 'auto' && mailto === undefined) {
> + notificationMode = 'notification-system';
> + }
> +
> + notificationModeSelector.setValue(notificationMode);
> + if (mailto !== undefined) {
> + mailtoField.setValue(mailto);
> + }
> }
> if (!initialDefaults && data.mode !== undefined) {
> modeSelector.setValue(data.mode);
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel