From: Dominik Csapak <d.csapak@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH datacenter-manager 09/18] ui: views: implement view loading from api
Date: Wed, 12 Nov 2025 17:11:44 +0100 [thread overview]
Message-ID: <20251112161900.75032-10-d.csapak@proxmox.com> (raw)
In-Reply-To: <20251112161900.75032-1-d.csapak@proxmox.com>
by simply loading the config from the api. Also move the default
dashboard into a constant.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
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<Self>, _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<ViewTemplate, Error> {
- // 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<AttrValue>) -> Result<ViewTemplate, Error> {
+ 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
next prev parent reply other threads:[~2025-11-12 16:18 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-12 16:11 [pdm-devel] [PATCH datacenter-manager 00/18] enable custom views on the UI Dominik Csapak
2025-11-12 16:11 ` [pdm-devel] [PATCH datacenter-manager 01/18] lib: pdm-config: views: add locking/saving methods Dominik Csapak
2025-11-12 16:11 ` [pdm-devel] [PATCH datacenter-manager 02/18] lib: api-types: add 'layout' property to ViewConfig Dominik Csapak
2025-11-12 16:11 ` [pdm-devel] [PATCH datacenter-manager 03/18] server: api: implement CRUD api for views Dominik Csapak
2025-11-12 16:11 ` [pdm-devel] [PATCH datacenter-manager 04/18] server: api: resources: add 'view' category to search syntax Dominik Csapak
2025-11-12 16:11 ` [pdm-devel] [PATCH datacenter-manager 05/18] ui: remote selector: allow forcing of value Dominik Csapak
2025-11-12 16:11 ` [pdm-devel] [PATCH datacenter-manager 06/18] ui: dashboard types: add missing 'default' to de-serialization Dominik Csapak
2025-11-12 16:11 ` [pdm-devel] [PATCH datacenter-manager 07/18] ui: dashboard: status row: add optional 'editing state' Dominik Csapak
2025-11-12 16:11 ` [pdm-devel] [PATCH datacenter-manager 08/18] ui: dashboard: prepare view for editing custom views Dominik Csapak
2025-11-12 16:11 ` Dominik Csapak [this message]
2025-11-12 16:11 ` [pdm-devel] [PATCH datacenter-manager 10/18] ui: views: make 'view' name property optional Dominik Csapak
2025-11-12 16:11 ` [pdm-devel] [PATCH datacenter-manager 11/18] ui: views: add 'view' parameter to api calls Dominik Csapak
2025-11-12 16:11 ` [pdm-devel] [PATCH datacenter-manager 12/18] ui: views: save updated layout to backend Dominik Csapak
2025-11-12 16:11 ` [pdm-devel] [PATCH datacenter-manager 13/18] ui: add view list context Dominik Csapak
2025-11-12 16:11 ` [pdm-devel] [PATCH datacenter-manager 14/18] ui: configuration: add view CRUD panels Dominik Csapak
2025-11-12 16:11 ` [pdm-devel] [PATCH datacenter-manager 15/18] ui: main menu: add optional view_list property Dominik Csapak
2025-11-12 16:11 ` [pdm-devel] [PATCH datacenter-manager 16/18] ui: load view list on page init Dominik Csapak
2025-11-12 16:11 ` [pdm-devel] [PATCH datacenter-manager 17/18] lib/ui: move views types to pdm-api-types Dominik Csapak
2025-11-12 16:11 ` [pdm-devel] [PATCH datacenter-manager 18/18] server: api: views: check layout string for validity Dominik Csapak
2025-11-14 10:20 ` [pdm-devel] [PATCH datacenter-manager 00/18] enable custom views on the UI Lukas Wagner
2025-11-14 10:56 ` Dominik Csapak
2025-11-14 12:13 ` [pdm-devel] superseded: " 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=20251112161900.75032-10-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