[pdm-devel] [PATCH datacenter-manager v2 8/9] ui: refactor check_subscription into lib

[Dominik Csapak <d.csapak@proxmox.com>]

so we can reuse the global subscription check logic elsewhere

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 ui/src/lib.rs  |  9 +++++++++
 ui/src/main.rs | 28 ++++++++++++----------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/ui/src/lib.rs b/ui/src/lib.rs
index 27a51084..d8225a42 100644
--- a/ui/src/lib.rs
+++ b/ui/src/lib.rs
@@ -3,6 +3,9 @@ use pdm_api_types::remotes::RemoteType;
 use pdm_api_types::resource::{PveLxcResource, PveNetworkResource, PveQemuResource};
 use pdm_client::types::Resource;
 use serde::{Deserialize, Serialize};
+use serde_json::Value;
+
+use proxmox_yew_comp::http_get;
 
 mod administration;
 
@@ -234,3 +237,9 @@ pub(crate) fn locale_compare(first: String, second: &str, numeric: bool) -> std:
         .locale_compare(second, &Array::new(), &options)
         .cmp(&0)
 }
+
+/// Returns true if the global subscription checks succeeded
+pub async fn check_subscription() -> bool {
+    let data: Result<Value, _> = http_get("/nodes/localhost/subscription", None).await;
+    proxmox_yew_comp::subscription_is_active(&Some(data))
+}
diff --git a/ui/src/main.rs b/ui/src/main.rs
index 9cff3833..b7dd3ef1 100644
--- a/ui/src/main.rs
+++ b/ui/src/main.rs
@@ -1,6 +1,6 @@
 use anyhow::Error;
 use gloo_timers::callback::Timeout;
-use serde_json::{json, Value};
+use serde_json::json;
 use wasm_bindgen::JsCast;
 use web_sys::HtmlElement;
 
@@ -23,8 +23,8 @@ use proxmox_yew_comp::{
 //use pbs::MainMenu;
 use pdm_api_types::views::ViewConfig;
 use pdm_ui::{
-    register_pve_tasks, MainMenu, RemoteList, RemoteListCacheEntry, SearchProvider, TopNavBar,
-    ViewListContext,
+    check_subscription, register_pve_tasks, MainMenu, RemoteList, RemoteListCacheEntry,
+    SearchProvider, TopNavBar, ViewListContext,
 };
 
 type MsgRemoteList = Result<RemoteList, Error>;
@@ -62,17 +62,6 @@ struct DatacenterManagerApp {
     async_pool: AsyncPool,
 }
 
-async fn check_subscription() -> Msg {
-    let data: Result<Value, _> = http_get("/nodes/localhost/subscription", None).await;
-
-    let is_active = proxmox_yew_comp::subscription_is_active(&Some(data));
-    if !is_active {
-        Msg::ShowSubscriptionAlert
-    } else {
-        Msg::ConfirmSubscription
-    }
-}
-
 /*
 async fn get_fingerprint() -> Option<Msg> {
     http_get("/nodes/localhost/status", None)
@@ -89,8 +78,15 @@ impl DatacenterManagerApp {
                 if self.subscription_confirmed {
                     ctx.link().send_message(Msg::ConfirmSubscription);
                 } else {
-                    self.async_pool
-                        .send_future(ctx.link().clone(), check_subscription());
+                    self.async_pool.send_future(ctx.link().clone(), async move {
+                        let is_active = check_subscription().await;
+
+                        if !is_active {
+                            Msg::ShowSubscriptionAlert
+                        } else {
+                            Msg::ConfirmSubscription
+                        }
+                    });
                 }
             } else {
                 ctx.link().send_message(Msg::ConfirmSubscription);
-- 
2.47.3



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel