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 299FE1FF164
for <inbox@lore.proxmox.com>; Fri, 6 Jun 2025 09:27:05 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 5D1D3355EF;
Fri, 6 Jun 2025 09:27:24 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pdm-devel@lists.proxmox.com
Date: Fri, 6 Jun 2025 09:27:19 +0200
Message-Id: <20250606072720.664054-5-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250606072720.664054-1-d.csapak@proxmox.com>
References: <20250606072720.664054-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
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 3/4] ui: dashboard: refactor
loading logic
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'll want to reload regularly, so refactor the logic to make that
easier. Only create one future, so we can reduce the amount of messages
and load everything in lockstep.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
ui/src/dashboard/mod.rs | 67 +++++++++++++++++++++++------------------
1 file changed, 37 insertions(+), 30 deletions(-)
diff --git a/ui/src/dashboard/mod.rs b/ui/src/dashboard/mod.rs
index 960766e..a1cac31 100644
--- a/ui/src/dashboard/mod.rs
+++ b/ui/src/dashboard/mod.rs
@@ -1,6 +1,7 @@
use std::rc::Rc;
use anyhow::Error;
+use futures::future::join;
use serde::{Deserialize, Serialize};
use serde_json::json;
use yew::{
@@ -60,9 +61,13 @@ pub struct DashboardConfig {
max_age: Option<u64>,
}
+pub type LoadingResult = (
+ Result<ResourcesStatus, Error>,
+ Result<pdm_client::types::TopEntities, proxmox_client::Error>,
+);
+
pub enum Msg {
- LoadingFinished(Result<ResourcesStatus, Error>),
- TopEntitiesLoadResult(Result<pdm_client::types::TopEntities, proxmox_client::Error>),
+ LoadingFinished(LoadingResult),
RemoteListChanged(RemoteList),
CreateWizard(bool),
}
@@ -76,8 +81,8 @@ pub struct PdmDashboard {
remote_list: RemoteList,
show_wizard: bool,
_context_listener: ContextHandle<RemoteList>,
- _async_pool: AsyncPool,
- _config: PersistentState<DashboardConfig>,
+ async_pool: AsyncPool,
+ config: PersistentState<DashboardConfig>,
}
impl PdmDashboard {
@@ -171,6 +176,22 @@ impl PdmDashboard {
.map(|err| error_message(&err.to_string())),
)
}
+
+ fn reload(&mut self, ctx: &yew::Context<Self>) {
+ let link = ctx.link().clone();
+ let max_age = self.config.max_age.unwrap_or(DEFAULT_MAX_AGE_S);
+
+ self.async_pool.spawn(async move {
+ let client = crate::pdm_client();
+
+ let top_entities_future = client.get_top_entities();
+ let status_future = http_get("/resources/status", Some(json!({"max-age": max_age})));
+
+ let (top_entities_res, status_res) = join(top_entities_future, status_future).await;
+
+ link.send_message(Msg::LoadingFinished((status_res, top_entities_res)));
+ });
+ }
}
impl Component for PdmDashboard {
@@ -178,30 +199,15 @@ impl Component for PdmDashboard {
type Properties = Dashboard;
fn create(ctx: &yew::Context<Self>) -> Self {
- let link = ctx.link().clone();
- let _config: PersistentState<DashboardConfig> =
- PersistentState::new(StorageLocation::local("dashboard-config"));
- let max_age = _config.max_age.unwrap_or(DEFAULT_MAX_AGE_S);
-
+ let config = PersistentState::new(StorageLocation::local("dashboard-config"));
let async_pool = AsyncPool::new();
- async_pool.spawn(async move {
- let result = http_get("/resources/status", Some(json!({"max-age": max_age}))).await;
- link.send_message(Msg::LoadingFinished(result));
- });
- async_pool.spawn({
- let link = ctx.link().clone();
- async move {
- let result = crate::pdm_client().get_top_entities().await;
- link.send_message(Msg::TopEntitiesLoadResult(result));
- }
- });
let (remote_list, _context_listener) = ctx
.link()
.context(ctx.link().callback(Msg::RemoteListChanged))
.expect("No Remote list context provided");
- Self {
+ let mut this = Self {
status: ResourcesStatus::default(),
last_error: None,
top_entities: None,
@@ -210,14 +216,18 @@ impl Component for PdmDashboard {
remote_list,
show_wizard: false,
_context_listener,
- _async_pool: async_pool,
- _config,
- }
+ async_pool,
+ config,
+ };
+
+ this.reload(ctx);
+
+ this
}
fn update(&mut self, _ctx: &Context<Self>, msg: Self::Message) -> bool {
match msg {
- Msg::LoadingFinished(resources_status) => {
+ Msg::LoadingFinished((resources_status, top_entities)) => {
match resources_status {
Ok(status) => {
self.last_error = None;
@@ -225,17 +235,14 @@ impl Component for PdmDashboard {
}
Err(err) => self.last_error = Some(err),
}
- self.loading = false;
- true
- }
- Msg::TopEntitiesLoadResult(res) => {
- match res {
+ match top_entities {
Ok(data) => {
self.last_top_entities_error = None;
self.top_entities = Some(data);
}
Err(err) => self.last_top_entities_error = Some(err),
}
+ self.loading = false;
true
}
Msg::RemoteListChanged(remote_list) => {
--
2.39.5
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel