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 97EC3BA555 for ; Thu, 14 Dec 2023 10:48:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 81EBA15034 for ; Thu, 14 Dec 2023 10:48:48 +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 ; Thu, 14 Dec 2023 10:48:48 +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 BC1164755D for ; Thu, 14 Dec 2023 10:48:47 +0100 (CET) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Thu, 14 Dec 2023 10:48:44 +0100 Message-Id: <20231214094844.84950-3-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231214094844.84950-1-l.wagner@proxmox.com> References: <20231214094844.84950-1-l.wagner@proxmox.com> 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH widget-toolkit 2/2] notify: change 'Remove' button to 'Reset to default' for built-ins 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, 14 Dec 2023 09:48:48 -0000 A HTTP DELETE for a built-in target/matcher acts as a reset to its defaults. This patch changes the 'Remove' button text based on the selected target/matcher. If it is a built-in, the button text is changed to 'Reset to default'. Also, if the built-in is not actually modified, the button is disabled. Signed-off-by: Lukas Wagner --- src/panel/NotificationConfigView.js | 63 +++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/src/panel/NotificationConfigView.js b/src/panel/NotificationConfigView.js index 4d3ee46..2e2eede 100644 --- a/src/panel/NotificationConfigView.js +++ b/src/panel/NotificationConfigView.js @@ -1,3 +1,32 @@ +Ext.define('Proxmox.panel.NotificationConfigViewModel', { + extend: 'Ext.app.ViewModel', + + alias: 'viewmodel.pmxNotificationConfigPanel', + + formulas: { + builtinSelected: function(get) { + let origin = get('selection')?.get('origin'); + return origin === 'modified-builtin' || origin === 'builtin'; + }, + removeButtonText: function(get) { + if (get('builtinSelected')) { + return gettext('Reset to default'); + } else { + return gettext('Remove'); + } + }, + removeButtonConfirmMessage: function(get) { + if (get('builtinSelected')) { + return gettext('Do you want to reset {0} to its default settings?'); + } else { + // Use default message provided by the button + return undefined; + } + }, + }, + +}); + Ext.define('Proxmox.panel.NotificationConfigView', { extend: 'Ext.panel.Panel', alias: 'widget.pmxNotificationConfigView', @@ -36,6 +65,14 @@ Ext.define('Proxmox.panel.NotificationEndpointView', { title: gettext('Notification Targets'), + viewModel: { + type: 'pmxNotificationConfigPanel', + }, + + bind: { + selection: '{selection}', + }, + controller: { xclass: 'Ext.app.ViewController', @@ -70,6 +107,7 @@ Ext.define('Proxmox.panel.NotificationEndpointView', { let me = this; let view = me.getView(); view.getStore().rstore.load(); + this.getView().setSelection(null); }, testEndpoint: function() { @@ -205,9 +243,17 @@ Ext.define('Proxmox.panel.NotificationEndpointView', { { xtype: 'proxmoxStdRemoveButton', callback: 'reload', + bind: { + text: '{removeButtonText}', + customConfirmationMessage: '{removeButtonConfirmMessage}', + }, getUrl: function(rec) { return `${me.baseUrl}/endpoints/${rec.data.type}/${rec.getId()}`; }, + enableFn: (rec) => { + let origin = rec.get('origin'); + return origin === 'user-created' || origin === 'modified-builtin'; + }, }, '-', { @@ -260,9 +306,18 @@ Ext.define('Proxmox.panel.NotificationMatcherView', { reload: function() { this.getView().getStore().rstore.load(); + this.getView().setSelection(null); }, }, + viewModel: { + type: 'pmxNotificationConfigPanel', + }, + + bind: { + selection: '{selection}', + }, + listeners: { itemdblclick: 'openEditForSelectedItem', activate: 'reload', @@ -342,7 +397,15 @@ Ext.define('Proxmox.panel.NotificationMatcherView', { { xtype: 'proxmoxStdRemoveButton', callback: 'reload', + bind: { + text: '{removeButtonText}', + customConfirmationMessage: '{removeButtonConfirmMessage}', + }, baseurl: `${me.baseUrl}/matchers`, + enableFn: (rec) => { + let origin = rec.get('origin'); + return origin === 'user-created' || origin === 'modified-builtin'; + }, }, ], }); -- 2.39.2