From b8197aed5981c02522877782881850f0bc891f6c Mon Sep 17 00:00:00 2001
From: Nikhil Sinha <nikhil.sinha@cloudsurfex.com>
Date: Thu, 1 Aug 2024 00:04:58 +0530
Subject: [PATCH] update: dashboard APIs

1. remove stream field from tile struct
2. rename y_key to y_keys in graph config
3. fix to generate tile_id for each tile in POST /dashboards
4. fix to generate tile_id for new tiles where tile_id is not present
in the request in the PUT /dashboards/dashboard/<dashboard-id>
5. return dashboard json in PUT response
---
 server/src/handlers/http/users/dashboards.rs | 15 ++++++++++++---
 server/src/users/dashboards.rs               |  3 +--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/server/src/handlers/http/users/dashboards.rs b/server/src/handlers/http/users/dashboards.rs
index 6a558601e..89e47d614 100644
--- a/server/src/handlers/http/users/dashboards.rs
+++ b/server/src/handlers/http/users/dashboards.rs
@@ -57,7 +57,6 @@ pub async fn post(body: Bytes) -> Result<impl Responder, PostError> {
     let dashboard_id = format!("{}.{}", &dashboard.user_id, Utc::now().timestamp_millis());
     dashboard.dashboard_id = Some(dashboard_id.clone());
     dashboard.version = Some(CURRENT_DASHBOARD_VERSION.to_string());
-    DASHBOARDS.update(&dashboard);
     for tile in dashboard.tiles.iter_mut() {
         tile.tile_id = Some(format!(
             "{}.{}",
@@ -65,6 +64,7 @@ pub async fn post(body: Bytes) -> Result<impl Responder, PostError> {
             Utc::now().timestamp_micros()
         ));
     }
+    DASHBOARDS.update(&dashboard);
 
     let path = dashboard_path(&dashboard.user_id, &format!("{}.json", dashboard_id));
 
@@ -77,7 +77,7 @@ pub async fn post(body: Bytes) -> Result<impl Responder, PostError> {
     Ok((web::Json(dashboard), StatusCode::OK))
 }
 
-pub async fn update(req: HttpRequest, body: Bytes) -> Result<HttpResponse, PostError> {
+pub async fn update(req: HttpRequest, body: Bytes) -> Result<impl Responder, PostError> {
     let dashboard_id = req
         .match_info()
         .get("dashboard_id")
@@ -90,6 +90,15 @@ pub async fn update(req: HttpRequest, body: Bytes) -> Result<HttpResponse, PostE
     let mut dashboard: Dashboard = serde_json::from_slice(&body)?;
     dashboard.dashboard_id = Some(dashboard_id.to_string());
     dashboard.version = Some(CURRENT_DASHBOARD_VERSION.to_string());
+    for tile in dashboard.tiles.iter_mut() {
+        if tile.tile_id.is_none() {
+            tile.tile_id = Some(format!(
+                "{}.{}",
+                &dashboard.user_id,
+                Utc::now().timestamp_micros()
+            ));
+        }
+    }
     DASHBOARDS.update(&dashboard);
 
     let path = dashboard_path(&dashboard.user_id, &format!("{}.json", dashboard_id));
@@ -100,7 +109,7 @@ pub async fn update(req: HttpRequest, body: Bytes) -> Result<HttpResponse, PostE
         .put_object(&path, Bytes::from(dashboard_bytes))
         .await?;
 
-    Ok(HttpResponse::Ok().finish())
+    Ok((web::Json(dashboard), StatusCode::OK))
 }
 
 pub async fn delete(req: HttpRequest) -> Result<HttpResponse, PostError> {
diff --git a/server/src/users/dashboards.rs b/server/src/users/dashboards.rs
index c8c85d95e..5fd68cc2d 100644
--- a/server/src/users/dashboards.rs
+++ b/server/src/users/dashboards.rs
@@ -33,7 +33,6 @@ pub struct Tiles {
     name: String,
     pub tile_id: Option<String>,
     description: String,
-    stream: String,
     query: String,
     order: Option<u64>,
     visualization: Visualization,
@@ -57,7 +56,7 @@ pub struct CircularChartConfig {
 #[derive(Debug, Serialize, Deserialize, Default, Clone)]
 pub struct GraphConfig {
     x_key: String,
-    y_key: Vec<String>,
+    y_keys: Vec<String>,
 }
 
 #[derive(Debug, Serialize, Deserialize, Default, Clone)]