Working add search events

SilasMarvin · SilasMarvin · commit 6a6415d0168d · 2024-03-15T13:15:08.000-07:00
diff --git a/pgml-dashboard/src/api/cms.rs b/pgml-dashboard/src/api/cms.rs
@@ -650,8 +650,13 @@ impl Collection {
 
 #[post("/search_event", data = "<search_event>")]
 async fn search_event(search_event: Form<crate::forms::SearchEvent>, site_search: &State<crate::utils::markdown::SiteSearch>) -> ResponseOk {
-    eprintln!("WE GOT IT: {:?}", search_event.clicked);
-    ResponseOk("".to_string())
+    match site_search.add_search_event(search_event.search_id, search_event.clicked).await {
+        Ok(_) => ResponseOk("ok".to_string()),
+        Err(e) => {
+            eprintln!("{:?}", e);
+            ResponseOk("error".to_string())    
+        }
+    }
 }
 
 #[get("/search?<query>", rank = 20)]
diff --git a/pgml-dashboard/src/utils/markdown.rs b/pgml-dashboard/src/utils/markdown.rs
@@ -1286,6 +1286,13 @@ impl SiteSearch {
             .collect()
     }
 
+    pub async fn add_search_event(&self, search_id: i64, search_result: i64) -> anyhow::Result<()> {
+        self.collection.add_search_event(search_id, search_result + 1, serde_json::json!({
+            "clicked": true
+        }).into(), &self.pipeline).await?;
+        Ok(())
+    }
+
     pub async fn search(
         &self,
         query: &str,
diff --git a/pgml-dashboard/static/js/search.js b/pgml-dashboard/static/js/search.js
@@ -18,24 +18,22 @@ export default class extends Controller {
 
     this.timer;
 
-    // Listen to click events and store clicked results
-    document.addEventListener("click", function(e) {
-      const target = e.target.closest(".search-result");
-      if (target) {
-        const resultIndex = target.getAttribute("data-result-index");
-        const searchId = target.getAttribute("data-search-id");
-        fetch('/search_event', {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
-            search_id: searchId,
-            clicked: resultIndex,
-          }),
-        });
-      }
-    });
+    document.addEventListener("click", this.handle_search_click);
+  }
+
+  handle_search_click(e) {
+    const target = e.target.closest(".search-result");
+    if (target) {
+      const resultIndex = target.getAttribute("data-result-index");
+      const searchId = target.getAttribute("data-search-id");
+      const formData = new FormData();
+      formData.append("search_id", searchId);
+      formData.append("clicked", resultIndex);
+      fetch('/search_event', {
+        method: 'POST',
+        body: formData,
+      });
+    }
   }
 
   search(e) {
@@ -46,7 +44,7 @@ export default class extends Controller {
     }, 250);
   }
 
-  focusSearchInput = (e) => {
+  focusSearchInput = () => {
     this.searchInput.focus()
     this.searchTriggerTarget.blur()
   }
@@ -63,5 +61,6 @@ export default class extends Controller {
   disconnect() {
     this.searchTriggerTarget.removeEventListener('shown.bs.modal', this.focusSearchInput)
     this.searchTriggerTarget.removeEventListener('hidden.bs.modal', this.updateSearch)
+    document.removeEventListener("click", this.handle_search_click);
   }
 }
