feat: add searches from tsvector

Signed-off-by: Guillaume Hivert <[email protected]>
ghivert · May 14, 2024 · c863357 · c863357
1 parent 8a8815a
commit c863357
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 10 deletions.
diff --git a/apps/backend/src/backend/router.gleam b/apps/backend/src/backend/router.gleam
@@ -20,6 +20,7 @@ fn empty_json() {
 }
 
 fn search(query: String, ctx: Context) {
+  wisp.log_notice("Searching for " <> query)
   json.object([
     #("exact-matches", {
       queries.name_search(ctx.db, query)
@@ -31,8 +32,12 @@ fn search(query: String, ctx: Context) {
       |> result.unwrap([])
       |> json.preprocessed_array()
     }),
+    #("searches", {
+      queries.search(ctx.db, query)
+      |> result.unwrap([])
+      |> json.preprocessed_array()
+    }),
   ])
-  // queries.search(ctx.db, query),
 }
 
 pub fn handle_get(req: Request, ctx: Context) {

diff --git a/apps/frontend/src/data/model.gleam b/apps/frontend/src/data/model.gleam
@@ -47,10 +47,11 @@ fn compute_index(search_results: SearchResults) -> Index {
   case search_results {
     search_result.Start -> []
     search_result.NoSearchResults -> []
-    search_result.SearchResults(exact, others) -> {
+    search_result.SearchResults(exact, others, searches) -> {
       []
       |> insert_module_names(exact)
       |> insert_module_names(others)
+      |> insert_module_names(searches)
       |> list.map(fn(i) { pair.map_second(i, list.reverse) })
     }
   }

diff --git a/apps/frontend/src/data/search_result.gleam b/apps/frontend/src/data/search_result.gleam
@@ -19,7 +19,11 @@ pub type SearchResult {
 
 pub type SearchResults {
   Start
-  SearchResults(exact_matches: List(SearchResult), matches: List(SearchResult))
+  SearchResults(
+    exact_matches: List(SearchResult),
+    matches: List(SearchResult),
+    searches: List(SearchResult),
+  )
   NoSearchResults
 }
 
@@ -42,10 +46,11 @@ pub fn decode_search_results(dyn) {
     dynamic.decode1(fn(_) { NoSearchResults }, {
       dynamic.field("error", dynamic.string)
     }),
-    dynamic.decode2(
+    dynamic.decode3(
       SearchResults,
       dynamic.field("exact-matches", dynamic.list(decode_search_result)),
       dynamic.field("matches", dynamic.list(decode_search_result)),
+      dynamic.field("searches", dynamic.list(decode_search_result)),
     ),
   ])(dyn)
 }

diff --git a/apps/frontend/src/frontend/strings.gleam b/apps/frontend/src/frontend/strings.gleam
@@ -1,8 +1,10 @@
 pub const gloogle_description = "Gloogle can search through all public gleam packages, to help you find the function you're looking for! Enter a type or a function name to get some results."
 
-pub const exact_match = "Matched directly from the name of the functions, constants or types."
+pub const exact_match = "Matched directly from the name of functions, constants or types."
 
-pub const partial_match = "Partly matched from the signature of the functions, constants or types."
+pub const partial_match = "Partly matched from the signature of functions, constants or types."
+
+pub const searches_match = "Matched from a document search in functions, constants or types."
 
 pub const retry_query = "Retry with a different query. You can match functions, types or constants names, as well as functions types directly!"
 

diff --git a/apps/frontend/src/frontend/view/body/body.gleam b/apps/frontend/src/frontend/view/body/body.gleam
@@ -157,20 +157,30 @@ pub fn body(model: Model) {
           title: "Internal server error",
           content: frontend_strings.internal_server_error,
         )
-      search_result.SearchResults([], []) ->
+      search_result.SearchResults([], [], []) ->
         empty_state(
           image: images.shadow_lucy,
           title: "No match found!",
           content: frontend_strings.retry_query,
         )
-      search_result.SearchResults(exact, others) ->
+      search_result.SearchResults(exact, others, searches) ->
         s.search_results_wrapper([], [
           sidebar(model.index),
           s.items_wrapper([], [
             match_title(exact, "Exact matches", frontend_strings.exact_match),
             view_search_results(exact),
-            match_title(others, "Other matches", frontend_strings.partial_match),
+            match_title(
+              others,
+              "Signature matches",
+              frontend_strings.partial_match,
+            ),
             view_search_results(others),
+            match_title(
+              others,
+              "Searches matches",
+              frontend_strings.searches_match,
+            ),
+            view_search_results(searches),
           ]),
         ])
     },

diff --git a/apps/frontend/src/frontend/view/navbar/navbar.gleam b/apps/frontend/src/frontend/view/navbar/navbar.gleam
@@ -23,7 +23,7 @@ pub fn navbar(model: Model) {
   s.navbar([a.class("navbar")], [
     case model.search_results {
       search_result.Start -> h.div([], [])
-      search_result.NoSearchResults | search_result.SearchResults(_, _) ->
+      search_result.NoSearchResults | search_result.SearchResults(_, _, _) ->
         s.navbar_search([], [
           s.navbar_search_title([e.on_click(msg.Reset)], [
             s.search_lucy([a.src("/images/lucy.svg")]),