cleanup rough edges

Author: Eshanatnight

server/src/handlers/http/users/dashboards.rs

@@ -24,6 +24,7 @@ use crate::{
 };
 use actix_web::{http::header::ContentType, web, HttpRequest, HttpResponse, Responder};
 use bytes::Bytes;
+
 use http::StatusCode;
 use serde_json::{Error as SerdeError, Value as JsonValue};
 

server/src/users/dashboards.rs

@@ -35,26 +35,26 @@ pub struct Pannel {
     chart_type: String,
     columns: Vec<String>,
     headers: Vec<String>,
-    dimensions: (u64, u64),
+    dimensions: Vec<u64>,
 }
 
 #[derive(Debug, Serialize, Deserialize, Default, Clone)]
 pub struct Dashboard {
     version: String,
-    name: String,
-    id: String,
+    dashboard_name: String,
+    dashboard_id: String,
     time_filter: TimeFilter,
     refresh_interval: u64,
     pannels: Vec<Pannel>,
 }
 
 impl Dashboard {
     pub fn dashboard_id(&self) -> &str {
-        &self.id
+        &self.dashboard_id
     }
 }
 
-#[derive(Default)]
+#[derive(Default, Debug)]
 pub struct Dashboards(RwLock<Vec<Dashboard>>);
 
 impl Dashboards {
@@ -64,7 +64,8 @@ impl Dashboards {
         let store = CONFIG.storage().get_object_store();
         let objs = store
             .get_objects(Some(&path), Box::new(|path| path.ends_with(".json")))
-            .await?;
+            .await
+            .unwrap_or_default();
 
         for obj in objs {
             if let Ok(filter) = serde_json::from_slice::<Dashboard>(&obj) {

server/src/users/filters.rs

@@ -16,11 +16,10 @@
  *
  */
 
-use std::sync::RwLock;
-
 use once_cell::sync::Lazy;
 use relative_path::RelativePathBuf;
 use serde::{Deserialize, Serialize};
+use std::sync::RwLock;
 
 use super::TimeFilter;
 use crate::{handlers::http::users::USERS_ROOT_DIR, metadata::LOCK_EXPECT, option::CONFIG};
@@ -51,9 +50,11 @@ impl Filters {
         let mut this = vec![];
         let path = RelativePathBuf::from(USERS_ROOT_DIR);
         let store = CONFIG.storage().get_object_store();
+
         let objs = store
             .get_objects(Some(&path), Box::new(|path| path.ends_with(".json")))
-            .await?;
+            .await
+            .unwrap_or_default();
 
         for obj in objs {
             if let Ok(filter) = serde_json::from_slice::<Filter>(&obj) {