From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 399171FF179 for ; Wed, 12 Nov 2025 17:18:53 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4A4389592; Wed, 12 Nov 2025 17:19:35 +0100 (CET) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Wed, 12 Nov 2025 17:11:44 +0100 Message-ID: <20251112161900.75032-10-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251112161900.75032-1-d.csapak@proxmox.com> References: <20251112161900.75032-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 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 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 09/18] ui: views: implement view loading from api 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 simply loading the config from the api. Also move the default dashboard into a constant. Signed-off-by: Dominik Csapak --- ui/src/dashboard/view.rs | 179 +++++++++++++++++++++------------------ 1 file changed, 96 insertions(+), 83 deletions(-) diff --git a/ui/src/dashboard/view.rs b/ui/src/dashboard/view.rs index 3182d4ea..b3e827ec 100644 --- a/ui/src/dashboard/view.rs +++ b/ui/src/dashboard/view.rs @@ -33,6 +33,7 @@ use crate::{pdm_client, LoadResult}; use pdm_api_types::remotes::RemoteType; use pdm_api_types::resource::ResourcesStatus; use pdm_api_types::subscription::RemoteSubscriptions; +use pdm_api_types::views::ViewConfig; use pdm_api_types::TaskStatistics; use pdm_client::types::TopEntities; @@ -263,8 +264,9 @@ impl Component for ViewComp { ); let async_pool = AsyncPool::new(); + let view = ctx.props().view.clone(); async_pool.send_future(ctx.link().clone(), async move { - Msg::ViewTemplateLoaded(load_template().await) + Msg::ViewTemplateLoaded(load_template(Some(view)).await) }); Self { @@ -351,8 +353,9 @@ impl Component for ViewComp { fn changed(&mut self, ctx: &Context, _old_props: &Self::Properties) -> bool { self.async_pool = AsyncPool::new(); self.load_finished_time = None; + let view = ctx.props().view.clone(); self.async_pool.send_future(ctx.link().clone(), async move { - Msg::ViewTemplateLoaded(load_template().await) + Msg::ViewTemplateLoaded(load_template(Some(view)).await) }); true } @@ -459,88 +462,98 @@ impl Component for ViewComp { } } -async fn load_template() -> Result { - // FIXME: load template from api - - let view_str = " - { - \"description\": \"some description\", - \"layout\": { - \"layout-type\": \"rows\", - \"rows\": [ - [ - { - \"flex\": 3.0, - \"widget-type\": \"remotes\", - \"show-wizard\": true - }, - { - \"flex\": 3.0, - \"widget-type\": \"nodes\", - \"remote-type\": \"pve\" - }, - { - \"flex\": 3.0, - \"widget-type\": \"guests\", - \"guest-type\": \"qemu\" - }, - { - \"flex\": 3.0, - \"widget-type\": \"nodes\", - \"remote-type\": \"pbs\" - }, - { - \"flex\": 3.0, - \"widget-type\": \"guests\", - \"guest-type\": \"lxc\" - }, - { - \"flex\": 3.0, - \"widget-type\": \"pbs-datastores\" - }, - { - \"flex\": 5.0, - \"widget-type\": \"subscription\" - } - ], - [ - { - \"widget-type\": \"leaderboard\", - \"leaderboard-type\": \"guest-cpu\" - }, - { - \"widget-type\": \"leaderboard\", - \"leaderboard-type\": \"node-cpu\" - }, - { - \"widget-type\": \"leaderboard\", - \"leaderboard-type\": \"node-memory\" - } - ], - [], - [ - { - \"flex\": 5.0, - \"widget-type\": \"task-summary\", - \"grouping\": \"category\", - \"sorting\": \"default\" - }, - { - \"flex\": 5.0, - \"widget-type\": \"task-summary\", - \"grouping\": \"remote\", - \"sorting\": \"failed-tasks\" - }, - { - \"flex\": 2.0, - \"widget-type\": \"sdn\" - } - ] - ] - } +const DEFAULT_DASHBOARD: &str = " + { + \"description\": \"some description\", + \"layout\": { + \"layout-type\": \"rows\", + \"rows\": [ + [ + { + \"flex\": 3.0, + \"widget-type\": \"remotes\", + \"show-wizard\": true + }, + { + \"flex\": 3.0, + \"widget-type\": \"nodes\", + \"remote-type\": \"pve\" + }, + { + \"flex\": 3.0, + \"widget-type\": \"guests\", + \"guest-type\": \"qemu\" + }, + { + \"flex\": 3.0, + \"widget-type\": \"nodes\", + \"remote-type\": \"pbs\" + }, + { + \"flex\": 3.0, + \"widget-type\": \"guests\", + \"guest-type\": \"lxc\" + }, + { + \"flex\": 3.0, + \"widget-type\": \"pbs-datastores\" + }, + { + \"flex\": 5.0, + \"widget-type\": \"subscription\" + } + ], + [ + { + \"widget-type\": \"leaderboard\", + \"leaderboard-type\": \"guest-cpu\" + }, + { + \"widget-type\": \"leaderboard\", + \"leaderboard-type\": \"node-cpu\" + }, + { + \"widget-type\": \"leaderboard\", + \"leaderboard-type\": \"node-memory\" + } + ], + [ + { + \"flex\": 5.0, + \"widget-type\": \"task-summary\", + \"grouping\": \"category\", + \"sorting\": \"default\" + }, + { + \"flex\": 5.0, + \"widget-type\": \"task-summary\", + \"grouping\": \"remote\", + \"sorting\": \"failed-tasks\" + }, + { + \"flex\": 2.0, + \"widget-type\": \"sdn\" + } + ] + ] + } + } +"; + +async fn load_template(view: Option) -> Result { + let view_str = match view { + Some(view) => { + let config: ViewConfig = http_get(&format!("/config/views/{}", view), None).await?; + config.layout } - "; + None => String::new(), + }; + + let template: ViewTemplate = if view_str.is_empty() { + serde_json::from_str(DEFAULT_DASHBOARD)? + } else { + serde_json::from_str(&view_str)? + }; - let template: ViewTemplate = serde_json::from_str(view_str)?; Ok(template) } -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel