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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 1FFA5948D3 for ; Fri, 24 Feb 2023 14:25:51 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 03B519F0B for ; Fri, 24 Feb 2023 14:25:21 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 24 Feb 2023 14:25:18 +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 70898483F3; Fri, 24 Feb 2023 14:25:18 +0100 (CET) Message-ID: <6372bff1-9560-ff52-0081-375f7aad3d2a@proxmox.com> Date: Fri, 24 Feb 2023 14:25:17 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:110.0) Gecko/20100101 Thunderbird/110.0 To: Proxmox VE development discussion , Matthias Heiserer References: <20230224121007.186614-1-m.heiserer@proxmox.com> Content-Language: en-US From: Dominik Csapak In-Reply-To: <20230224121007.186614-1-m.heiserer@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.106 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 -0.09 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 v2 widget-toolkit] ui: SMART: fix eslint error and show correct value 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: Fri, 24 Feb 2023 13:25:51 -0000 On 2/24/23 13:10, Matthias Heiserer wrote: > Signed-off-by: Matthias Heiserer > --- > > Sorry for the long delay and the overall confusion! > This is the v2 of https://lists.proxmox.com/pipermail/pve-devel/2023-February/055798.html > The second arrow function spans multiple lines, that's because it really does not fit on a single one > and previous attempts to reduce the size didn't work out. > > src/window/DiskSmart.js | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/src/window/DiskSmart.js b/src/window/DiskSmart.js > index b538ea1..af2a023 100644 > --- a/src/window/DiskSmart.js > +++ b/src/window/DiskSmart.js > @@ -159,12 +159,17 @@ Ext.define('Proxmox.window.DiskSmart', { > { > name: 'real-value', > // FIXME remove with next major release (PBS 3.0) > - calculate: data => (data.normalized ?? false) ? data.raw : data.value, > + calculate: data => data.raw, > }, > { > name: 'real-normalized', > // FIXME remove with next major release (PBS 3.0) > - calculate: data => data.normalized ?? data.raw, > + calculate: data => { > + if (data.normalized === undefined || data.raw === undefined) { > + return data.value; > + } > + return data.normalized; > + }, > }, > ], > idProperty: 'name', just fyi, i talked with matthias off-list, imho the correct solution is to use real-value: data.raw ?? data.value real-normalized: data.normalized ?? data.value since we had raw+value in pve and normalized+value in pbs so reading 'raw' with 'value' fallback for 'real-value' is correct for both and reading 'normalized' with 'value' fallback for 'real-normalized' is also correct for both for new versions it's also correct since we then always have raw+normalized anyway