From c709b8042f178d3c10162f43adcfbbd5a53aa1a8 Mon Sep 17 00:00:00 2001 From: "R. Tyler Croy" Date: Sun, 12 Mar 2023 17:21:16 -0700 Subject: [PATCH] Properly render the agent name This render_compact work is still half-finished, but I'm focused elsewhere at the moment and will come back to the idea of view components later --- src/server/config.rs | 2 +- src/server/main.rs | 2 +- src/server/routes.rs | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/server/config.rs b/src/server/config.rs index 90a5871..d1ae9f8 100644 --- a/src/server/config.rs +++ b/src/server/config.rs @@ -57,7 +57,7 @@ impl Agent { } pub fn render_compact(&self, _state: &AppState<'_>) -> String { - "".into() + self.name.clone() //let data = serde_json::to_str(self).unwrap_or(serde_json::Value::Array); //state.render("views/components/agent/compact.hbs", diff --git a/src/server/main.rs b/src/server/main.rs index 53da272..9fc73ae 100644 --- a/src/server/main.rs +++ b/src/server/main.rs @@ -117,7 +117,7 @@ async fn main() -> Result<(), tide::Error> { } for (name, agent) in config.agents.iter() { - debug!("Requesting capabilities from agent: {:?}", agent); + debug!("Requesting capabilities from agent: {} {:?}", name, agent); let response: synchronik::CapsResponse = reqwest::get(agent.url.join("/api/v1/capabilities")?) .await? diff --git a/src/server/routes.rs b/src/server/routes.rs index 55cc92f..fe1620d 100644 --- a/src/server/routes.rs +++ b/src/server/routes.rs @@ -4,9 +4,10 @@ * * Modules are nested for cleaner organization here */ -use crate::AppState; +use log::*; use tide::{Body, Request}; +use crate::AppState; use crate::models::Project; /** @@ -26,6 +27,7 @@ pub async fn index(req: Request>) -> Result { "projects" : Project::list(&req.state().db).await?, }); + debug!("Rendering home page with: {:?}", params); let mut body = req.state().render("index", ¶ms).await?; body.set_mime("text/html"); Ok(body)