From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <t.lamprecht@proxmox.com>
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 039A2924FE
for <pve-devel@lists.proxmox.com>; Mon, 12 Sep 2022 16:36:39 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id EDFCE7299
for <pve-devel@lists.proxmox.com>; Mon, 12 Sep 2022 16:36:38 +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) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Mon, 12 Sep 2022 16:36:37 +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 3A0FA43386
for <pve-devel@lists.proxmox.com>; Mon, 12 Sep 2022 16:36:37 +0200 (CEST)
Message-ID: <dd9b59b5-ae67-dae7-d82f-0dfdc46c585b@proxmox.com>
Date: Mon, 12 Sep 2022 16:36:35 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:105.0) Gecko/20100101
Thunderbird/105.0
Content-Language: en-GB
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Stefan Hanreich <s.hanreich@proxmox.com>
References: <20220912120008.1220711-1-s.hanreich@proxmox.com>
<20220912120008.1220711-4-s.hanreich@proxmox.com>
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
In-Reply-To: <20220912120008.1220711-4-s.hanreich@proxmox.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 2.044 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
NICE_REPLY_A -4.101 Looks like a legit reply (A)
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 manager v2 1/1] fix #4228: ui: Add checkbox
to rollback dialog for automatically restarting VM/CT
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>
X-List-Received-Date: Mon, 12 Sep 2022 14:36:39 -0000
Am 12/09/2022 um 14:00 schrieb Stefan Hanreich:
some (short) commit message body can often be nice to have, especially if not
totally trivial (like a typo fix) and it definitively doesn't have to be a full
essay, but I yet have to see the patch here on the list where I'd feel like I
got a too lengthy commit message ;-)
> Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
> ---
> I've added a custom Window containing the dialog, since using MessageBox
> for this seemed a bit tricky. Maybe I could move the definition of the
> components outside the handler and only instantiate them there? I
> thought it was fine for now, since the Window is specific to the
> SnapshotTree anyway.
see below.
>
> www/manager6/tree/SnapshotTree.js | 62 +++++++++++++++++++++++++++----
> 1 file changed, 55 insertions(+), 7 deletions(-)
>
> diff --git a/www/manager6/tree/SnapshotTree.js b/www/manager6/tree/SnapshotTree.js
> index 97268072..a6f25f19 100644
> --- a/www/manager6/tree/SnapshotTree.js
> +++ b/www/manager6/tree/SnapshotTree.js
> @@ -61,7 +61,9 @@ Ext.define('PVE.guest.SnapshotTree', {
> me.mon(win, 'destroy', me.reload, me);
> },
>
> - snapshotAction: function(action, method) {
> + snapshotAction: function(action, method, params) {
> + params = params || {};
> +
> let me = this;
> let view = me.getView();
> let vm = me.getViewModel();
> @@ -75,6 +77,7 @@ Ext.define('PVE.guest.SnapshotTree', {
> Proxmox.Utils.API2Request({
> url: `/nodes/${nodename}/${type}/${vmid}/snapshot/${snapname}/${action}`,
> method: method,
> + params: params,
> waitMsgTarget: view,
> callback: function() {
> me.reload();
> @@ -89,9 +92,8 @@ Ext.define('PVE.guest.SnapshotTree', {
> },
> });
> },
> -
> - rollback: function() {
> - this.snapshotAction('rollback', 'POST');
> + rollback: function(params) {
> + this.snapshotAction('rollback', 'POST', params);
> },
> remove: function() {
> this.snapshotAction('', 'DELETE');
> @@ -255,14 +257,60 @@ Ext.define('PVE.guest.SnapshotTree', {
> bind: {
> disabled: '{!canRollback}',
> },
> - confirmMsg: function() {
> + handler: function() {
> let view = this.up('treepanel');
> +
> let rec = view.getSelection()[0];
> let vmid = view.getViewModel().get('vmid');
> - return Proxmox.Utils.format_task_description('qmrollback', vmid) +
> + let label = Proxmox.Utils.format_task_description('qmrollback', vmid) +
> ` '${rec.data.name}'? ${gettext("Current state will be lost.")}`;
> +
I'd rather go for using proxmoxWindowEdit here instead, gives you form, basic desired
window handling and API call for free, as the snapshotAction then could be actually
dropped by inlining the relevant code in "remove", which would be the only call side
left then, could maybe get eliminated completely by using a proxmoxStdRemoveButton
for that in a separate patch, but mostly mentioning for completeness sake, wouldn't
block this one here.
> + let formPanel = Ext.create({
> + xtype: 'inputpanel',
> + bodyPadding: 10,
> + border: false,
> + items: [
> + {
> + xtype: 'label',
> + html: label,
> + },
> + {
> + xtype: 'proxmoxcheckbox',
> + name: 'start',
> + margin: '5 0 0 0',
> + boxLabel: gettext('Start guest after rollback'),
> + },
> + ],
> + });
> +
> + let win = Ext.create("Ext.window.Window", {
> + width: 400,
> + layout: 'fit',
> + title: gettext('Confirm'),
> + closable: true,
> + resizable: false,
> + modal: true,
> + buttons: [
> + {
> + text: 'Yes',
> + handler: function() {
> + view.controller.rollback(formPanel.getValues());
> + win.close();
> + },
> + },
> + {
> + text: 'No',
> + handler: function() {
> + win.close();
> + },
> + },
> + ],
> + buttonAlign: 'center',
> + items: [formPanel],
> + });
> +
> + win.show();
use the `autoShow: true,` configuration for new code instead
> },
> - handler: 'rollback',
> },
> '-',
> {