feat: make api's for graphs we use instead of templating json

glados-web/src/lib.rs

@@ -90,6 +90,14 @@ pub async fn run_glados_web(config: Arc<State>) -> Result<()> {
             "/api/hourly-success-rate/",
             get(routes::hourly_success_rate),
         )
+        .route(
+            "/api/latest-census-node-diversiity-data",
+            get(routes::get_radius_diversity_data),
+        )
+        .route(
+            "/api/latest-census-node-radius-data",
+            get(routes::generate_radius_graph_data),
+        )
         .route(
             "/api/is-content-in-deadzone/:content_key",
             get(routes::is_content_in_deadzone),

glados-web/src/routes.rs

@@ -107,7 +107,9 @@ impl Display for ClientDiversityResult {
     }
 }
 
-async fn generate_radius_graph_data(state: &Arc<State>) -> Vec<CalculatedRadiusChartData> {
+pub async fn generate_radius_graph_data(
+    Extension(state): Extension<Arc<State>>,
+) -> Result<Json<Vec<CalculatedRadiusChartData>>, StatusCode> {
     let builder = state.database_connection.get_database_backend();
     let mut radius_density = Query::select();
     radius_density
@@ -206,7 +208,20 @@ async fn generate_radius_graph_data(state: &Arc<State>) -> Vec<CalculatedRadiusC
         });
     }
 
-    radius_percentages
+    Ok(Json(radius_percentages))
+}
+
+pub async fn get_radius_diversity_data(
+    Extension(state): Extension<Arc<State>>,
+) -> Result<Json<Vec<ClientDiversityResult>>, StatusCode> {
+    let client_diversity_data = match get_max_census_id(&state).await {
+        None => vec![],
+        Some(max_census_id) => generate_client_diversity_data(&state, None, max_census_id)
+            .await
+            .unwrap(),
+    };
+
+    Ok(Json(client_diversity_data))
 }
 
 fn xor_distance_to_fraction(radius_high_bytes: [u8; 4]) -> f64 {
@@ -384,14 +399,6 @@ async fn generate_enr_list_from_census_id(
 }
 
 pub async fn root(Extension(state): Extension<Arc<State>>) -> impl IntoResponse {
-    let client_diversity_data = match get_max_census_id(&state).await {
-        None => vec![],
-        Some(max_census_id) => generate_client_diversity_data(&state, None, max_census_id)
-            .await
-            .unwrap(),
-    };
-
-    let radius_percentages = generate_radius_graph_data(&state).await;
     // Run queries for content dashboard data concurrently
     let (hour_stats, day_stats, week_stats) = tokio::join!(
         get_audit_stats(
@@ -429,8 +436,6 @@ pub async fn root(Extension(state): Extension<Arc<State>>) -> impl IntoResponse
     let week_stats = week_stats.unwrap();
 
     let template = IndexTemplate {
-        client_diversity_data,
-        average_radius_chart: radius_percentages,
         stats: [hour_stats, day_stats, week_stats],
     };
     HtmlTemplate(template)

glados-web/src/templates.rs

@@ -5,16 +5,12 @@ use axum::{
 };
 use entity::{client_info, content, content_audit, execution_metadata, key_value, node, record};
 
-use crate::routes::{
-    CalculatedRadiusChartData, ClientDiversityResult, PaginatedCensusListResult, RawEnr,
-};
+use crate::routes::{ClientDiversityResult, PaginatedCensusListResult, RawEnr};
 use glados_core::stats::AuditStats;
 
 #[derive(Template)]
 #[template(path = "index.html")]
 pub struct IndexTemplate {
-    pub client_diversity_data: Vec<ClientDiversityResult>,
-    pub average_radius_chart: Vec<CalculatedRadiusChartData>,
     pub stats: [AuditStats; 3],
 }
 

glados-web/templates/index.html

@@ -92,10 +92,17 @@ <h3 style="text-align: center">Client Count</h3>
 
 </div>
 <script>
-    pie_chart_count({{ client_diversity_data| json | safe }});
-    const census_data = {{ average_radius_chart| json | safe }};
-    radius_node_id_scatter_chart(census_data);
-    radius_stacked_chart(census_data);
+    fetch('/api/latest-census-node-diversiity-data')
+        .then(response => response.json())
+        .then(client_diversity_data => {
+            pie_chart_count(client_diversity_data);
+        });
+    fetch('/api/latest-census-node-radius-data')
+        .then(response => response.json())
+        .then(census_data => {
+            radius_node_id_scatter_chart(census_data);
+            radius_stacked_chart(census_data);
+        });
     statsHistoryChart();
 
 </script>