Re: [PATCH yew-mobile-gui 20/20] resources page: map subscription level analogous to dashboard

["Shan Shaji" <s.shaji@proxmox.com>]

Hi,

I have tested this patch with my community subscription. Now the status
is correctly shown on both dashboard and resources pages.

Tested-by: Shan Shaji <s.shaji@proxmox.com>

On Fri May 8, 2026 at 5:05 PM CEST, Shannon Sterz wrote:
> and unify the mapping logic.
>
> Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
> ---
>
> Notes:
>     i couldn't find a similar helper anyway in yew-comp yet, so i added
>     this here for now. Thomas' recent series [1] added something like
>     that, but that would only be available for pdm. maybe we should have
>     something like this in yew-comp?
>     
>     [1]: https://lore.proxmox.com/pdm-devel/20260507082943.2749725-3-t.lamprecht@proxmox.com/
>
>  src/pages/mod.rs            | 13 +++++++++++++
>  src/pages/page_dashboard.rs | 13 ++-----------
>  src/pages/page_resources.rs |  8 +++-----
>  3 files changed, 18 insertions(+), 16 deletions(-)
>
> diff --git a/src/pages/mod.rs b/src/pages/mod.rs
> index bc5ff97..3d945a0 100644
> --- a/src/pages/mod.rs
> +++ b/src/pages/mod.rs
> @@ -45,3 +45,16 @@ pub use page_cluster_firewall::PageClusterFirewall;
>  
>  mod page_not_found;
>  pub use page_not_found::PageNotFound;
> +
> +fn map_subscription(level: &Option<String>) -> &str {
> +    match level.as_deref() {
> +        Some("") | None => "no subscription",
> +        Some(level) => match level {
> +            "c" => "Community",
> +            "b" => "Basic",
> +            "s" => "Standard",
> +            "p" => "Premium",
> +            _ => "-",
> +        },
> +    }
> +}
> diff --git a/src/pages/page_dashboard.rs b/src/pages/page_dashboard.rs
> index 1e0243f..fe2f5b4 100644
> --- a/src/pages/page_dashboard.rs
> +++ b/src/pages/page_dashboard.rs
> @@ -20,7 +20,7 @@ use proxmox_yew_comp::layout::list_tile::{icon_list_tile, list_tile_usage};
>  use proxmox_yew_comp::layout::render_loaded_data;
>  use proxmox_yew_comp::{SubscriptionAlert, http_get};
>  
> -use crate::pages::ResourceFilter;
> +use crate::pages::{ResourceFilter, map_subscription};
>  use crate::widgets::TopNavBar;
>  
>  #[derive(Clone, PartialEq, Properties)]
> @@ -202,16 +202,7 @@ impl PvePageDashboard {
>                      let navigator = navigator.clone();
>                      let item = &nodes[pos as usize];
>                      let nodename = item.node.clone();
> -                    let subtitle = match item.level.as_deref() {
> -                        Some("") | None => "no subscription",
> -                        Some(level) => match level {
> -                            "c" => "Community",
> -                            "b" => "Basic",
> -                            "s" => "Standard",
> -                            "p" => "Premium",
> -                            _ => "-",
> -                        },
> -                    };
> +                    let subtitle = map_subscription(&item.level);
>  
>                      icon_list_tile(
>                          Fa::new("server").class(
> diff --git a/src/pages/page_resources.rs b/src/pages/page_resources.rs
> index 469bbf3..470a054 100644
> --- a/src/pages/page_resources.rs
> +++ b/src/pages/page_resources.rs
> @@ -23,6 +23,8 @@ use proxmox_yew_comp::layout::render_loaded_data;
>  
>  use pve_api_types::{ClusterResource, ClusterResourceType};
>  
> +use crate::pages::map_subscription;
> +
>  #[derive(Clone, PartialEq, Properties)]
>  pub struct PageResources {}
>  
> @@ -119,11 +121,7 @@ impl PvePageResources {
>              Fa::new("server")
>                  .class((item.status.as_deref() == Some("online")).then_some("pwt-color-primary")),
>              nodename.clone(),
> -            match item.level.as_deref() {
> -                Some("") | None => "no subscription",
> -                Some(level) => level,
> -            }
> -            .to_string(),
> +            map_subscription(&item.level),
>              item.status.clone(),
>          )
>          .interactive(true)