From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@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 UTF8SMTPS id D57B178186
for <pve-devel@lists.proxmox.com>; Thu, 29 Apr 2021 14:14:01 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with UTF8SMTP id D2E0F1BEC3
for <pve-devel@lists.proxmox.com>; Thu, 29 Apr 2021 14:14:01 +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 UTF8SMTPS id E83B91BEB4
for <pve-devel@lists.proxmox.com>; Thu, 29 Apr 2021 14:14:00 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with UTF8SMTP id C1E62464D4;
Thu, 29 Apr 2021 14:14:00 +0200 (CEST)
Message-ID: <abb2cd8b-66f6-97ed-29b8-d56ab997f253@proxmox.com>
Date: Thu, 29 Apr 2021 14:14:00 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:88.0) Gecko/20100101
Thunderbird/88.0
Content-Language: en-US
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Lorenz Stechauner <l.stechauner@proxmox.com>
References: <20210428141346.240896-1-l.stechauner@proxmox.com>
<20210428141346.240896-3-l.stechauner@proxmox.com>
From: Dominik Csapak <d.csapak@proxmox.com>
In-Reply-To: <20210428141346.240896-3-l.stechauner@proxmox.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.003 Adjusted score from AWL reputation of From: address
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
NICE_REPLY_A -0.001 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
Subject: Re: [pve-devel] [PATCH widget-toolkit 1/1] window: add
upidFieldName option
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: Thu, 29 Apr 2021 12:14:01 -0000
as i wrote on the other patches, this is
unnecessary if we split the thing up into two api calls
On 4/28/21 16:13, Lorenz Stechauner wrote:
> Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com>
> ---
> src/window/Edit.js | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/src/window/Edit.js b/src/window/Edit.js
> index 53d0e73..867ba9b 100644
> --- a/src/window/Edit.js
> +++ b/src/window/Edit.js
> @@ -53,6 +53,10 @@ Ext.define('Proxmox.window.Edit', {
>
> showTaskViewer: false,
>
> + // name of the upid field in response data
> + // required for showTaskViewer
> + upidFieldName: undefined,
> +
> // gets called if we have a progress bar or taskview and it detected that
> // the task finished. function(success)
> taskDone: Ext.emptyFn,
> @@ -165,9 +169,8 @@ Ext.define('Proxmox.window.Edit', {
> Ext.Msg.alert(gettext('Error'), response.htmlStatus);
> },
> success: function(response, options) {
> - let hasProgressBar =
> - (me.backgroundDelay || me.showProgress || me.showTaskViewer) &&
> - response.result.data;
> + let data = response.result.data;
> + let hasProgressBar = (me.backgroundDelay || me.showProgress || me.showTaskViewer) && data;
>
> me.apiCallDone(true, response, options);
>
> @@ -176,7 +179,7 @@ Ext.define('Proxmox.window.Edit', {
> // when background action is completed
> me.hide();
>
> - let upid = response.result.data;
> + let upid = me.upidFieldName ? data[me.upidFieldName] : data;
> let viewerClass = me.showTaskViewer ? 'Viewer' : 'Progress';
> Ext.create('Proxmox.window.Task' + viewerClass, {
> autoShow: true,
>