From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <pdm-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
	by lore.proxmox.com (Postfix) with ESMTPS id 1EA931FF168
	for <inbox@lore.proxmox.com>; Tue,  7 Jan 2025 14:23:21 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id F386641BF;
	Tue,  7 Jan 2025 14:23:09 +0100 (CET)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pdm-devel@lists.proxmox.com
Date: Tue,  7 Jan 2025 14:23:03 +0100
Message-Id: <20250107132303.2447962-1-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.39.5
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results:  0
 AWL 0.016 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
 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
 Validity was blocked. See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
 information.
 RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
 Validity was blocked. See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
 information.
 RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
 Validity was blocked. See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
 information.
 SPF_HELO_NONE           0.001 SPF: HELO does not publish an SPF Record
 SPF_PASS               -0.001 SPF: sender matches SPF record
Subject: [pdm-devel] [PATCH datacenter-manager] ui: pve storage selector:
 fix the displayed values
X-BeenThere: pdm-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Datacenter Manager development discussion
 <pdm-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pdm-devel>, 
 <mailto:pdm-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pdm-devel/>
List-Post: <mailto:pdm-devel@lists.proxmox.com>
List-Help: <mailto:pdm-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel>, 
 <mailto:pdm-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox Datacenter Manager development discussion
 <pdm-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pdm-devel-bounces@lists.proxmox.com
Sender: "pdm-devel" <pdm-devel-bounces@lists.proxmox.com>

we want to show 'available' and 'capacity' (indicated by the column
headers), but showed 'used' and 'available' respectively.

Fix this by using the correct values from the struct.

While at it, rename the intermediated variables to match what they are.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 ui/src/widget/pve_storage_selector.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/src/widget/pve_storage_selector.rs b/ui/src/widget/pve_storage_selector.rs
index 188acc6..488175a 100644
--- a/ui/src/widget/pve_storage_selector.rs
+++ b/ui/src/widget/pve_storage_selector.rs
@@ -209,15 +209,15 @@ fn columns() -> Rc<Vec<DataTableHeader<StorageInfo>>> {
             .into(),
         DataTableColumn::new(tr!("Avail"))
             .get_property_owned(|entry: &StorageInfo| entry.used.unwrap_or_default())
-            .render(|entry: &StorageInfo| match entry.used {
-                Some(used) => html! {format!("{:.2}", HumanByte::new_decimal(used as f64))},
+            .render(|entry: &StorageInfo| match entry.avail {
+                Some(avail) => html! {format!("{:.2}", HumanByte::new_decimal(avail as f64))},
                 None => html! {"-"},
             })
             .into(),
         DataTableColumn::new(tr!("Capacity"))
             .get_property_owned(|entry: &StorageInfo| entry.avail.unwrap_or_default())
-            .render(|entry: &StorageInfo| match entry.avail {
-                Some(used) => html! { format!("{:.2}", HumanByte::new_decimal(used as f64))},
+            .render(|entry: &StorageInfo| match entry.total {
+                Some(total) => html! { format!("{:.2}", HumanByte::new_decimal(total as f64))},
                 None => html! {"-"},
             })
             .into(),
-- 
2.39.5



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel