list by tags with dashboard listing api

Author: nikhilsinhaparseable

src/handlers/http/modal/server.rs

@@ -307,13 +307,6 @@ impl Server {
                         .authorize(Action::ListDashboard),
                 ),
             )
-            .service(
-                web::resource("/list_by_tag/{tags}").route(
-                    web::get()
-                        .to(dashboards::list_dashboards_by_tags)
-                        .authorize(Action::ListDashboard),
-                ),
-            )
             .service(
                 web::scope("/{dashboard_id}")
                     .service(

src/handlers/http/users/dashboards.rs

@@ -44,6 +44,23 @@ pub async fn list_dashboards(req: HttpRequest) -> Result<impl Responder, Dashboa
                 return Err(DashboardError::Metadata("Invalid limit value"));
             }
         }
+
+        if let Some(tags) = query_map.get("tags") {
+            let tags: Vec<String> = tags
+                .split(',')
+                .map(|s| s.trim().to_string())
+                .filter(|s| !s.is_empty())
+                .collect();
+            if tags.is_empty() {
+                return Err(DashboardError::Metadata("Tags cannot be empty"));
+            }
+            let dashboards = DASHBOARDS.list_dashboards_by_tags(tags).await;
+            let dashboard_summaries = dashboards
+                .iter()
+                .map(|dashboard| dashboard.to_summary())
+                .collect::<Vec<_>>();
+            return Ok((web::Json(dashboard_summaries), StatusCode::OK));
+        }
     }
     let dashboards = DASHBOARDS.list_dashboards(dashboard_limit).await;
     let dashboard_summaries = dashboards
@@ -215,29 +232,6 @@ pub async fn list_tags() -> Result<impl Responder, DashboardError> {
     Ok((web::Json(tags), StatusCode::OK))
 }
 
-pub async fn list_dashboards_by_tags(tags: Path<String>) -> Result<impl Responder, DashboardError> {
-    let tags = tags.into_inner();
-    if tags.is_empty() {
-        return Err(DashboardError::Metadata("Tags cannot be empty"));
-    }
-    // tags can be comma separated list of tags
-    let tags = tags
-        .split(',')
-        .map(|s| s.trim().to_string())
-        .filter(|s| !s.is_empty())
-        .collect::<Vec<_>>();
-    if tags.is_empty() {
-        return Err(DashboardError::Metadata("Tags cannot be empty"));
-    }
-    let dashboards = DASHBOARDS.list_dashboards_by_tags(tags).await;
-    let dashboard_summaries = dashboards
-        .iter()
-        .map(|dashboard| dashboard.to_summary())
-        .collect::<Vec<_>>();
-
-    Ok((web::Json(dashboard_summaries), StatusCode::OK))
-}
-
 #[derive(Debug, thiserror::Error)]
 pub enum DashboardError {
     #[error("Failed to connect to storage: {0}")]

src/users/dashboards.rs

@@ -375,14 +375,17 @@ impl Dashboards {
     }
 
     /// List dashboards by tag
-    /// This function returns a list of dashboards that have the specified tag
+    /// This function returns a list of dashboards that match any of the provided tags
+    /// If no tags are provided, it returns an empty list
     pub async fn list_dashboards_by_tags(&self, tags: Vec<String>) -> Vec<Dashboard> {
         let dashboards = self.0.read().await;
         dashboards
             .iter()
             .filter(|d| {
                 if let Some(dashboard_tags) = &d.tags {
-                    !tags.is_empty() && dashboard_tags.iter().any(|tag| tags.contains(tag))
+                    dashboard_tags
+                        .iter()
+                        .any(|dashboard_tag| tags.contains(dashboard_tag))
                 } else {
                     false
                 }