public inbox for pdm-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [PATCH datacenter-manager 4/8] ui: pve: factor out the pve-manager version extraction
Date: Fri, 14 Aug 2026 15:44:00 +0200	[thread overview]
Message-ID: <20260814134548.3446943-5-d.csapak@proxmox.com> (raw)
In-Reply-To: <20260814134548.3446943-1-d.csapak@proxmox.com>

This was done three times in the same way. Simply refactor it into
it's own method.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 ui/src/pve/mod.rs | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/ui/src/pve/mod.rs b/ui/src/pve/mod.rs
index f069ec75..1c32d26f 100644
--- a/ui/src/pve/mod.rs
+++ b/ui/src/pve/mod.rs
@@ -25,6 +25,7 @@ use pdm_api_types::{
     remote_updates::RemoteUpdateSummary,
     resource::{PveResource, ResourceType},
 };
+use proxmox_deb_version::Version;
 
 use crate::remotes::RemoteCertCheck;
 use crate::{LoadResult, extract_package_version, get_deep_url, get_remote};
@@ -158,6 +159,13 @@ pub struct PveRemoteComp {
     updates: LoadResult<RemoteUpdateSummary, Error>,
 }
 
+impl PveRemoteComp {
+    fn get_pve_manager_version(&self, node: &str) -> Option<Version> {
+        let updates = self.updates.data.as_ref()?;
+        extract_package_version(updates, node, "pve-manager")
+    }
+}
+
 pwt::impl_deref_mut_property!(PveRemoteComp, state, LoadableComponentState<ViewState>);
 
 impl LoadableComponent for PveRemoteComp {
@@ -206,31 +214,17 @@ impl LoadableComponent for PveRemoteComp {
 
         let content: Html = match &self.view {
             PveTreeNode::Root => remote::PveRemotePanel::new(remote.clone()).into(),
-            PveTreeNode::Node(node) => {
-                let pve_manager = match &self.updates.data {
-                    Some(updates) => extract_package_version(updates, &node.node, "pve-manager"),
-                    None => None,
-                };
-                node::PveNodePanel::new(remote.clone(), node.node.clone())
-                    .pve_manager_version(pve_manager)
-                    .into()
-            }
+            PveTreeNode::Node(node) => node::PveNodePanel::new(remote.clone(), node.node.clone())
+                .pve_manager_version(self.get_pve_manager_version(&node.node))
+                .into(),
             PveTreeNode::Qemu(qemu) => {
-                let pve_manager = match &self.updates.data {
-                    Some(updates) => extract_package_version(updates, &qemu.node, "pve-manager"),
-                    None => None,
-                };
                 qemu::QemuPanel::new(remote.clone(), qemu.node.clone(), qemu.clone())
-                    .pve_manager_version(pve_manager)
+                    .pve_manager_version(self.get_pve_manager_version(&qemu.node))
                     .into()
             }
             PveTreeNode::Lxc(lxc) => {
-                let pve_manager = match &self.updates.data {
-                    Some(updates) => extract_package_version(updates, &lxc.node, "pve-manager"),
-                    None => None,
-                };
                 lxc::LxcPanel::new(remote.clone(), lxc.node.clone(), lxc.clone())
-                    .pve_manager_version(pve_manager)
+                    .pve_manager_version(self.get_pve_manager_version(&lxc.node))
                     .into()
             }
             PveTreeNode::Storage(storage) => {
-- 
2.47.3





  parent reply	other threads:[~2026-08-14 13:46 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-14 13:43 [PATCH datacenter-manager 0/8] refactor and partially fix #7371 Dominik Csapak
2026-08-14 13:43 ` [PATCH datacenter-manager 1/8] lib: add new ResourceView type and move accessors there Dominik Csapak
2026-08-14 13:43 ` [PATCH datacenter-manager 2/8] lib: api types: resource: add 'node' helper to ResourceView Dominik Csapak
2026-08-14 13:43 ` [PATCH datacenter-manager 3/8] lib: api-types: add 'vmid' getter " Dominik Csapak
2026-08-14 13:44 ` Dominik Csapak [this message]
2026-08-14 13:44 ` [PATCH datacenter-manager 5/8] ui: renderer: use ResourceView for rendering Dominik Csapak
2026-08-14 13:44 ` [PATCH datacenter-manager 6/8] ui: pve: tree: reuse `PveResource` for `PveTreeNode` Dominik Csapak
2026-08-14 13:44 ` [PATCH datacenter-manager 7/8] ui: pve: show ha maintenance mode for nodes Dominik Csapak
2026-08-14 13:44 ` [PATCH datacenter-manager 8/8] ui: pve: node selector: show maintenance badge with node name Dominik Csapak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260814134548.3446943-5-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pdm-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal