remove layout from dashboard, make fields optional

Author: nikhilsinhaparseable

src/handlers/http/users/dashboards.rs

@@ -48,7 +48,7 @@ pub async fn list() -> Result<impl Responder, DashboardError> {
             );
             map.insert(
                 "author".to_string(),
-                serde_json::Value::String(dashboard.author.clone()),
+                serde_json::Value::String(dashboard.author.as_ref().unwrap().clone()),
             );
             map.insert(
                 "modified".to_string(),
@@ -81,10 +81,10 @@ pub async fn post(
     let mut user_id = get_user_from_request(&req)?;
     user_id = get_hash(&user_id);
     let dashboard_id = Ulid::new();
-    dashboard.dashboard_id = dashboard_id;
+    dashboard.dashboard_id = Some(dashboard_id);
     dashboard.version = Some(CURRENT_DASHBOARD_VERSION.to_string());
     dashboard.modified = Some(Utc::now());
-    dashboard.author = user_id.clone();
+    dashboard.author = Some(user_id.clone());
     for tile in dashboard.tiles.iter_mut() {
         tile.tile_id = Ulid::new();
     }
@@ -117,8 +117,8 @@ pub async fn update(
     if DASHBOARDS.get_dashboard(dashboard_id).await.is_none() {
         return Err(DashboardError::Metadata("Dashboard does not exist"));
     }
-    dashboard.dashboard_id = dashboard_id;
-    dashboard.author = user_id.clone();
+    dashboard.dashboard_id = Some(dashboard_id);
+    dashboard.author = Some(user_id.clone());
     dashboard.modified = Some(Utc::now());
     dashboard.version = Some(CURRENT_DASHBOARD_VERSION.to_string());
     for tile in dashboard.tiles.iter_mut() {

src/prism/home/mod.rs

@@ -246,7 +246,7 @@ async fn get_dashboard_titles() -> Result<Vec<TitleAndId>, PrismHomeError> {
         .iter()
         .map(|dashboard| TitleAndId {
             title: dashboard.title.clone(),
-            id: dashboard.dashboard_id.to_string(),
+            id: dashboard.dashboard_id.as_ref().unwrap().to_string(),
         })
         .collect_vec();
 

src/users/dashboards.rs

@@ -34,22 +34,14 @@ pub struct Tile {
     #[serde(flatten)]
     pub other_fields: Option<serde_json::Map<String, Value>>,
 }
-
-#[derive(Debug, Serialize, Deserialize, Default, Clone)]
-pub struct Layout {
-    pub tile_id: Option<String>,
-    #[serde(flatten)]
-    pub other_fields: Option<serde_json::Map<String, Value>>,
-}
 #[derive(Debug, Serialize, Deserialize, Default, Clone)]
 pub struct Dashboard {
     pub version: Option<String>,
     pub title: String,
-    pub author: String,
-    pub dashboard_id: Ulid,
+    pub author: Option<String>,
+    pub dashboard_id: Option<Ulid>,
     pub modified: Option<DateTime<Utc>>,
     pub tiles: Vec<Tile>,
-    pub layout: Vec<Layout>,
 }
 
 #[derive(Default, Debug)]
@@ -87,15 +79,15 @@ impl Dashboards {
 
     pub async fn delete_dashboard(&self, dashboard_id: Ulid) {
         let mut s = self.0.write().await;
-        s.retain(|d| d.dashboard_id != dashboard_id);
+        s.retain(|d| *d.dashboard_id.as_ref().unwrap() != dashboard_id);
     }
 
     pub async fn get_dashboard(&self, dashboard_id: Ulid) -> Option<Dashboard> {
         self.0
             .read()
             .await
             .iter()
-            .find(|d| d.dashboard_id == dashboard_id)
+            .find(|d| *d.dashboard_id.as_ref().unwrap() == dashboard_id)
             .cloned()
     }