Dashboard fix for 2.7.8 (#963)

levkk · web-flow · commit 764a6a646a1f · 2023-08-30T09:54:41.000-07:00
diff --git a/pgml-dashboard/sqlx-data.json b/pgml-dashboard/sqlx-data.json
@@ -566,7 +566,7 @@
       "nullable": [
         false,
         false,
-        false,
+        true,
         false,
         false,
         null,
@@ -864,7 +864,7 @@
       "nullable": [
         false,
         false,
-        false,
+        true,
         false,
         false,
         null,
@@ -1113,7 +1113,7 @@
       "nullable": [
         false,
         false,
-        false,
+        true,
         false,
         false,
         null,
diff --git a/pgml-dashboard/src/lib.rs b/pgml-dashboard/src/lib.rs
@@ -367,7 +367,12 @@ pub async fn models_index(cluster: ConnectedCluster<'_>) -> Result<ResponseOk, E
 #[get("/models/<id>")]
 pub async fn models_get(cluster: ConnectedCluster<'_>, id: i64) -> Result<ResponseOk, Error> {
     let model = models::Model::get_by_id(cluster.pool(), id).await?;
-    let snapshot = models::Snapshot::get_by_id(cluster.pool(), model.snapshot_id).await?;
+    let snapshot = if let Some(snapshot_id) = model.snapshot_id {
+        Some(models::Snapshot::get_by_id(cluster.pool(), snapshot_id).await?)
+    } else {
+        None
+    };
+
     let project = models::Project::get_by_id(cluster.pool(), model.project_id).await?;
 
     Ok(ResponseOk(
diff --git a/pgml-dashboard/src/models.rs b/pgml-dashboard/src/models.rs
@@ -444,7 +444,7 @@ pub enum Runtime {
 pub struct Model {
     pub id: i64,
     pub project_id: i64,
-    pub snapshot_id: i64,
+    pub snapshot_id: Option<i64>,
     pub num_features: i32,
     pub algorithm: String,
     pub runtime: Option<String>,
diff --git a/pgml-dashboard/src/templates/mod.rs b/pgml-dashboard/src/templates/mod.rs
@@ -397,7 +397,7 @@ pub struct Models {
 pub struct Model {
     pub model: models::Model,
     pub project: models::Project,
-    pub snapshot: models::Snapshot,
+    pub snapshot: Option<models::Snapshot>,
     pub deployed: bool,
 }
 
diff --git a/pgml-dashboard/templates/content/dashboard/panels/model.html b/pgml-dashboard/templates/content/dashboard/panels/model.html
@@ -13,8 +13,10 @@ <h1><span class="material-symbols-outlined">model_training</span>
       <dl>
         <dt>Project</dt>
         <dd><a href="/dashboard?tab=Project&id=<%= project.id %>" data-turbo="false"><%= project.name %></a></dd>
-          <dt>Snapshot</dt>
-          <dd><a href="/dashboard?tab=Snapshot&id=<%= snapshot.id %>" data-turbo="false"><%= snapshot.relation_name %></a></dd>
+        <% if let Some(snapshot) = snapshot { %>
+        <dt>Snapshot</dt>
+        <dd><a href="/dashboard?tab=Snapshot&id=<%= snapshot.id %>" data-turbo="false"><%= snapshot.relation_name %></a></dd>
+        <% } %>
         <dt>Created</dt>
         <dd><time datetime="<% model.created_at; %>"><% model.created_at; %></time></dd>
       </dl>

Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ pub struct Models {`
`397`	`397`	`pub struct Model {`
`398`	`398`	`pub model: models::Model,`
`399`	`399`	`pub project: models::Project,`
`400`		`- pub snapshot: models::Snapshot,`
	`400`	`+ pub snapshot: Option<models::Snapshot>,`
`401`	`401`	`pub deployed: bool,`
`402`	`402`	`}`
`403`	`403`