From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 72D691FF17C for ; Wed, 3 Sep 2025 15:24:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6A354E00B; Wed, 3 Sep 2025 15:24:30 +0200 (CEST) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Wed, 3 Sep 2025 15:09:22 +0200 Message-ID: <20250903132351.841830-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250903132351.841830-1-d.csapak@proxmox.com> References: <20250903132351.841830-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.022 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_MSPIKE_H2 0.001 Average reputation (+2) 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 v5 06/10] ui: dashboard: guest panel: search for guest states when clicking on them X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" by using the SearchProvider, we create a fitting search term for the clicked/selected type of guest. Signed-off-by: Dominik Csapak --- changes from v4: * implement into ResourceType from GuestType, so we use the same type as the backend does to filter, minimizes the risk that we diverge with that ui/src/dashboard/guest_panel.rs | 87 +++++++++++++++++++++++++++++++-- ui/src/pve/mod.rs | 11 ++++- 2 files changed, 92 insertions(+), 6 deletions(-) diff --git a/ui/src/dashboard/guest_panel.rs b/ui/src/dashboard/guest_panel.rs index 8d130c3..678e30f 100644 --- a/ui/src/dashboard/guest_panel.rs +++ b/ui/src/dashboard/guest_panel.rs @@ -1,19 +1,26 @@ use std::rc::Rc; -use pdm_api_types::resource::GuestStatusCount; +use pdm_api_types::resource::{GuestStatusCount, ResourceType}; +use pdm_search::{Search, SearchTerm}; use proxmox_yew_comp::GuestState; use pwt::{ prelude::*, props::ExtractPrimaryKey, state::Store, widget::{ - data_table::{DataTable, DataTableColumn, DataTableHeader}, + data_table::{ + DataTable, DataTableColumn, DataTableHeader, DataTableKeyboardEvent, + DataTableMouseEvent, DataTableRowRenderArgs, + }, Fa, }, }; -use yew::virtual_dom::{VComp, VNode}; +use yew::{ + virtual_dom::{Key, VComp, VNode}, + Properties, +}; -use crate::pve::GuestType; +use crate::{pve::GuestType, search_provider::get_search_provider}; use super::loading_column; @@ -101,13 +108,20 @@ fn columns(guest_type: GuestType) -> Rc>> { pub struct PdmGuestPanel {} impl yew::Component for PdmGuestPanel { - type Message = String; + type Message = Search; type Properties = GuestPanel; fn create(_ctx: &yew::Context) -> Self { Self {} } + fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool { + if let Some(provider) = get_search_provider(ctx) { + provider.search(msg); + } + false + } + fn view(&self, ctx: &yew::Context) -> yew::Html { let props = ctx.props(); if props.status.is_none() { @@ -137,7 +151,70 @@ impl yew::Component for PdmGuestPanel { .striped(false) .borderless(true) .bordered(false) + .row_render_callback(|renderer: &mut DataTableRowRenderArgs| { + renderer.class.push("pwt-pointer"); + }) + .on_row_keydown({ + let store = store.clone(); + let link = ctx.link().clone(); + move |event: &mut DataTableKeyboardEvent| match event.key().as_str() { + " " | "Enter" => search_callback(&link, &store, guest_type, &event.record_key), + _ => {} + } + }) + .on_row_click({ + let store = store.clone(); + let link = ctx.link().clone(); + move |event: &mut DataTableMouseEvent| { + search_callback(&link, &store, guest_type, &event.record_key); + } + }) .show_header(false) .into() } } + +fn search_callback( + link: &html::Scope, + store: &Store, + guest_type: GuestType, + key: &Key, +) { + if let Some((_, record)) = store.filtered_data().find(|(_, rec)| rec.key() == *key) { + let (status, template) = match &*record.record() { + StatusRow::State(guest_state, _) => match guest_state { + GuestState::Running => (Some("running"), Some(false)), + GuestState::Paused => (Some("paused"), Some(false)), + GuestState::Stopped => (Some("stopped"), Some(false)), + GuestState::Template => (None, Some(true)), + GuestState::Unknown => (Some("unknown"), None), + }, + StatusRow::All(_) => (None, None), + }; + + link.send_message(create_guest_search_term(guest_type, status, template)); + } +} + +fn create_guest_search_term( + guest_type: GuestType, + status: Option<&'static str>, + template: Option, +) -> Search { + let resource_type: ResourceType = guest_type.into(); + if status.is_none() && template.is_none() { + return Search::with_terms(vec![ + SearchTerm::new(resource_type.as_str()).category(Some("type")) + ]); + } + + let mut terms = vec![SearchTerm::new(resource_type.as_str()).category(Some("type"))]; + + if let Some(template) = template { + terms.push(SearchTerm::new(template.to_string()).category(Some("template"))); + } + if let Some(status) = status { + terms.push(SearchTerm::new(status).category(Some("status"))); + } + Search::with_terms(terms) +} diff --git a/ui/src/pve/mod.rs b/ui/src/pve/mod.rs index a3cf573..dd5e04f 100644 --- a/ui/src/pve/mod.rs +++ b/ui/src/pve/mod.rs @@ -20,7 +20,7 @@ use pwt::{ widget::{Column, Panel, Row}, }; -use pdm_api_types::resource::PveResource; +use pdm_api_types::resource::{PveResource, ResourceType}; pub mod lxc; pub mod node; @@ -81,6 +81,15 @@ impl Display for GuestType { } } +impl From for ResourceType { + fn from(value: GuestType) -> Self { + match value { + GuestType::Qemu => ResourceType::PveQemu, + GuestType::Lxc => ResourceType::PveLxc, + } + } +} + #[derive(PartialEq, Clone, Copy)] pub struct GuestInfo { pub guest_type: GuestType, -- 2.47.2 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel