postgresml · chillenberger · Jun 17, 2024 · Jun 7, 2024 · Jun 11, 2024 · Jun 12, 2024
diff --git a/pgml-dashboard/Cargo.lock b/pgml-dashboard/Cargo.lock
diff --git a/pgml-dashboard/src/api/deployment/deployment_models.rs b/pgml-dashboard/src/api/deployment/deployment_models.rs
@@ -2,6 +2,7 @@ use rocket::route::Route;
 use sailfish::TemplateOnce;
 
 use crate::{
+    guards::Cluster,
     guards::ConnectedCluster,
     responses::{Error, ResponseOk},
 };
@@ -17,8 +18,8 @@ use std::collections::HashMap;
 
 // Returns models page
 #[get("/models")]
-pub async fn deployment_models(cluster: ConnectedCluster<'_>) -> Result<ResponseOk, Error> {
-    let mut layout = crate::templates::WebAppBase::new("Dashboard", &cluster.inner.context);
+pub async fn deployment_models(cluster: &Cluster, _connected: ConnectedCluster<'_>) -> Result<ResponseOk, Error> {
+    let mut layout = crate::templates::WebAppBase::new("Dashboard", &cluster);
     layout.breadcrumbs(vec![NavLink::new("Models", &urls::deployment_models()).active()]);
 
     let tabs = vec![tabs::Tab {
@@ -28,16 +29,16 @@ pub async fn deployment_models(cluster: ConnectedCluster<'_>) -> Result<Response
 
     let nav_tabs = tabs::Tabs::new(tabs, Some("Models"), Some("Models"))?;
 
-    Ok(ResponseOk(layout.render(templates::Dashboard { tabs: nav_tabs })))
+    Ok(ResponseOk(layout.render(templates::Dashboard::new(nav_tabs))))
 }
 
 // Returns models page
 #[get("/models/<model_id>")]
-pub async fn model(cluster: ConnectedCluster<'_>, model_id: i64) -> Result<ResponseOk, Error> {
+pub async fn model(cluster: &Cluster, model_id: i64, _connected: ConnectedCluster<'_>) -> Result<ResponseOk, Error> {
     let model = models::Model::get_by_id(cluster.pool(), model_id).await?;
     let project = models::Project::get_by_id(cluster.pool(), model.project_id).await?;
 
-    let mut layout = crate::templates::WebAppBase::new("Dashboard", &cluster.inner.context);
+    let mut layout = crate::templates::WebAppBase::new("Dashboard", &cluster);
     layout.breadcrumbs(vec![
         NavLink::new("Models", &urls::deployment_models()),
         NavLink::new(&project.name, &urls::deployment_project_by_id(project.id)),
@@ -51,7 +52,7 @@ pub async fn model(cluster: ConnectedCluster<'_>, model_id: i64) -> Result<Respo
 
     let nav_tabs = tabs::Tabs::new(tabs, Some("Models"), Some("Models"))?;
 
-    Ok(ResponseOk(layout.render(templates::Dashboard { tabs: nav_tabs })))
+    Ok(ResponseOk(layout.render(templates::Dashboard::new(nav_tabs))))
 }
 
 #[get("/models_turboframe")]

diff --git a/pgml-dashboard/src/api/deployment/notebooks.rs b/pgml-dashboard/src/api/deployment/notebooks.rs
@@ -20,8 +20,8 @@ use crate::utils::urls;
 
 // Returns notebook page
 #[get("/notebooks")]
-pub async fn notebooks(cluster: ConnectedCluster<'_>) -> Result<ResponseOk, Error> {
-    let mut layout = crate::templates::WebAppBase::new("Dashboard", &cluster.inner.context);
+pub async fn notebooks(cluster: &Cluster, _connected: ConnectedCluster<'_>) -> Result<ResponseOk, Error> {
+    let mut layout = crate::templates::WebAppBase::new("Dashboard", &cluster);
     layout.breadcrumbs(vec![NavLink::new("Notebooks", &urls::deployment_notebooks()).active()]);
 
     let tabs = vec![tabs::Tab {
@@ -31,15 +31,19 @@ pub async fn notebooks(cluster: ConnectedCluster<'_>) -> Result<ResponseOk, Erro
 
     let nav_tabs = tabs::Tabs::new(tabs, Some("Notebooks"), Some("Notebooks"))?;
 
-    Ok(ResponseOk(layout.render(templates::Dashboard { tabs: nav_tabs })))
+    Ok(ResponseOk(layout.render(templates::Dashboard::new(nav_tabs))))
 }
 
 // Returns the specified notebook page.
 #[get("/notebooks/<notebook_id>")]
-pub async fn notebook(cluster: ConnectedCluster<'_>, notebook_id: i64) -> Result<ResponseOk, Error> {
+pub async fn notebook(
+    cluster: &Cluster,
+    notebook_id: i64,
+    _connected: ConnectedCluster<'_>,
+) -> Result<ResponseOk, Error> {
     let notebook = models::Notebook::get_by_id(cluster.pool(), notebook_id).await?;
 
-    let mut layout = crate::templates::WebAppBase::new("Dashboard", &cluster.inner.context);
+    let mut layout = crate::templates::WebAppBase::new("Dashboard", &cluster);
     layout.breadcrumbs(vec![
         NavLink::new("Notebooks", &urls::deployment_notebooks()),
         NavLink::new(notebook.name.as_str(), &urls::deployment_notebook_by_id(notebook_id)).active(),
@@ -52,7 +56,7 @@ pub async fn notebook(cluster: ConnectedCluster<'_>, notebook_id: i64) -> Result
 
     let nav_tabs = tabs::Tabs::new(tabs, Some("Notebooks"), Some("Notebooks"))?;
 
-    Ok(ResponseOk(layout.render(templates::Dashboard { tabs: nav_tabs })))
+    Ok(ResponseOk(layout.render(templates::Dashboard::new(nav_tabs))))
 }
 
 // Returns all the notebooks for a deployment in a turbo frame.

diff --git a/pgml-dashboard/src/api/deployment/projects.rs b/pgml-dashboard/src/api/deployment/projects.rs
@@ -2,6 +2,7 @@ use rocket::route::Route;
 use sailfish::TemplateOnce;
 
 use crate::{
+    guards::Cluster,
     guards::ConnectedCluster,
     responses::{Error, ResponseOk},
 };
@@ -15,8 +16,8 @@ use crate::utils::urls;
 
 // Returns the deployments projects page.
 #[get("/projects")]
-pub async fn projects(cluster: ConnectedCluster<'_>) -> Result<ResponseOk, Error> {
-    let mut layout = crate::templates::WebAppBase::new("Dashboard", &cluster.inner.context);
+pub async fn projects(cluster: &Cluster, _connected: ConnectedCluster<'_>) -> Result<ResponseOk, Error> {
+    let mut layout = crate::templates::WebAppBase::new("Dashboard", &cluster);
     layout.breadcrumbs(vec![NavLink::new("Projects", &urls::deployment_projects()).active()]);
 
     let tabs = vec![tabs::Tab {
@@ -26,15 +27,19 @@ pub async fn projects(cluster: ConnectedCluster<'_>) -> Result<ResponseOk, Error
 
     let nav_tabs = tabs::Tabs::new(tabs, Some("Notebooks"), Some("Projects"))?;
 
-    Ok(ResponseOk(layout.render(templates::Dashboard { tabs: nav_tabs })))
+    Ok(ResponseOk(layout.render(templates::Dashboard::new(nav_tabs))))
 }
 
 // Return the specified project page.
 #[get("/projects/<project_id>")]
-pub async fn project(cluster: ConnectedCluster<'_>, project_id: i64) -> Result<ResponseOk, Error> {
+pub async fn project(
+    cluster: &Cluster,
+    project_id: i64,
+    _connected: ConnectedCluster<'_>,
+) -> Result<ResponseOk, Error> {
     let project = models::Project::get_by_id(cluster.pool(), project_id).await?;
 
-    let mut layout = crate::templates::WebAppBase::new("Dashboard", &cluster.inner.context);
+    let mut layout = crate::templates::WebAppBase::new("Dashboard", &cluster);
     layout.breadcrumbs(vec![
         NavLink::new("Projects", &urls::deployment_projects()),
         NavLink::new(project.name.as_str(), &urls::deployment_project_by_id(project_id)).active(),
@@ -47,7 +52,7 @@ pub async fn project(cluster: ConnectedCluster<'_>, project_id: i64) -> Result<R
 
     let nav_tabs = tabs::Tabs::new(tabs, Some("Projects"), Some("Projects"))?;
 
-    Ok(ResponseOk(layout.render(templates::Dashboard { tabs: nav_tabs })))
+    Ok(ResponseOk(layout.render(templates::Dashboard::new(nav_tabs))))
 }
 
 // Returns all the deployments for the project in a turbo frame.

diff --git a/pgml-dashboard/src/api/deployment/snapshots.rs b/pgml-dashboard/src/api/deployment/snapshots.rs
@@ -2,6 +2,7 @@ use rocket::route::Route;
 use sailfish::TemplateOnce;
 
 use crate::{
+    guards::Cluster,
     guards::ConnectedCluster,
     responses::{Error, ResponseOk},
 };
@@ -16,8 +17,8 @@ use std::collections::HashMap;
 
 // Returns snapshots page
 #[get("/snapshots")]
-pub async fn snapshots(cluster: ConnectedCluster<'_>) -> Result<ResponseOk, Error> {
-    let mut layout = crate::templates::WebAppBase::new("Dashboard", &cluster.inner.context);
+pub async fn snapshots(cluster: &Cluster, _connected: ConnectedCluster<'_>) -> Result<ResponseOk, Error> {
+    let mut layout = crate::templates::WebAppBase::new("Dashboard", &cluster);
     layout.breadcrumbs(vec![NavLink::new("Snapshots", &urls::deployment_snapshots()).active()]);
 
     let tabs = vec![tabs::Tab {
@@ -27,15 +28,19 @@ pub async fn snapshots(cluster: ConnectedCluster<'_>) -> Result<ResponseOk, Erro
 
     let nav_tabs = tabs::Tabs::new(tabs, Some("Snapshots"), Some("Snapshots"))?;
 
-    Ok(ResponseOk(layout.render(templates::Dashboard { tabs: nav_tabs })))
+    Ok(ResponseOk(layout.render(templates::Dashboard::new(nav_tabs))))
 }
 
 // Returns the specific snapshot page
 #[get("/snapshots/<snapshot_id>")]
-pub async fn snapshot(cluster: ConnectedCluster<'_>, snapshot_id: i64) -> Result<ResponseOk, Error> {
+pub async fn snapshot(
+    cluster: &Cluster,
+    snapshot_id: i64,
+    _connected: ConnectedCluster<'_>,
+) -> Result<ResponseOk, Error> {
     let snapshot = models::Snapshot::get_by_id(cluster.pool(), snapshot_id).await?;
 
-    let mut layout = crate::templates::WebAppBase::new("Dashboard", &cluster.inner.context);
+    let mut layout = crate::templates::WebAppBase::new("Dashboard", &cluster);
     layout.breadcrumbs(vec![
         NavLink::new("Snapshots", &urls::deployment_snapshots()),
         NavLink::new(&snapshot.relation_name, &urls::deployment_snapshot_by_id(snapshot.id)).active(),
@@ -48,7 +53,7 @@ pub async fn snapshot(cluster: ConnectedCluster<'_>, snapshot_id: i64) -> Result
 
     let nav_tabs = tabs::Tabs::new(tabs, Some("Snapshots"), Some("Snapshots"))?;
 
-    Ok(ResponseOk(layout.render(templates::Dashboard { tabs: nav_tabs })))
+    Ok(ResponseOk(layout.render(templates::Dashboard::new(nav_tabs))))
 }
 
 // Returns all snapshots for the deployment in a turboframe.

diff --git a/pgml-dashboard/src/api/deployment/uploader.rs b/pgml-dashboard/src/api/deployment/uploader.rs
@@ -5,6 +5,7 @@ use rocket::route::Route;
 use sailfish::TemplateOnce;
 
 use crate::{
+    guards::Cluster,
     guards::ConnectedCluster,
     responses::{BadRequest, Error, ResponseOk},
 };
@@ -18,8 +19,8 @@ use crate::utils::urls;
 
 // Returns the uploader page.
 #[get("/uploader")]
-pub async fn uploader(cluster: ConnectedCluster<'_>) -> Result<ResponseOk, Error> {
-    let mut layout = crate::templates::WebAppBase::new("Dashboard", &cluster.inner.context);
+pub async fn uploader(cluster: &Cluster, _connected: ConnectedCluster<'_>) -> Result<ResponseOk, Error> {
+    let mut layout = crate::templates::WebAppBase::new("Dashboard", &cluster);
     layout.breadcrumbs(vec![NavLink::new("Upload Data", &urls::deployment_uploader()).active()]);
 
     let tabs = vec![tabs::Tab {
@@ -29,7 +30,7 @@ pub async fn uploader(cluster: ConnectedCluster<'_>) -> Result<ResponseOk, Error
 
     let nav_tabs = tabs::Tabs::new(tabs, Some("Upload Data"), Some("Upload Data"))?;
 
-    Ok(ResponseOk(layout.render(templates::Dashboard { tabs: nav_tabs })))
+    Ok(ResponseOk(layout.render(templates::Dashboard::new(nav_tabs))))
 }
 
 // Returns uploader module in a turboframe.

diff --git a/pgml-dashboard/src/components/layouts/head/mod.rs b/pgml-dashboard/src/components/layouts/head/mod.rs
@@ -134,7 +134,7 @@ mod default_head_template_test {
 
     #[test]
     fn set_head() {
-        let mut head = Head::new()
+        let head = Head::new()
             .title("test title")
             .description("test description")
             .image("image/test_image.jpg");