From 2b674a6f5cedfd88bc0b790322e4774891888d67 Mon Sep 17 00:00:00 2001 From: Naden Date: Sun, 3 Mar 2024 19:21:33 +1100 Subject: [PATCH] Updates --- src-tauri/src/handler_application.rs | 4 ++-- src-tauri/src/handlers.rs | 2 +- .../com/harana/search/client/search/SearchHandler.scala | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src-tauri/src/handler_application.rs b/src-tauri/src/handler_application.rs index 8a371ec..8f19fef 100644 --- a/src-tauri/src/handler_application.rs +++ b/src-tauri/src/handler_application.rs @@ -4,10 +4,10 @@ use tauri; use crate::globals::APPLICATION_MANAGER; #[tauri::command] -pub async fn search_applications(query: String) -> Vec { +pub async fn search_application(query: String) -> Option { if query.len() >= 3 { APPLICATION_MANAGER.get().unwrap().search(query.as_str()).await } else { - vec!() + None } } \ No newline at end of file diff --git a/src-tauri/src/handlers.rs b/src-tauri/src/handlers.rs index ac60485..cbe70c8 100644 --- a/src-tauri/src/handlers.rs +++ b/src-tauri/src/handlers.rs @@ -10,7 +10,7 @@ pub fn invoke_handler(invoke: tauri::Invoke) { crate::handler_account::logout, crate::handler_ai_models::list_ai_models, crate::handler_ai_models::update_ai_model, - crate::handler_application::search_applications, + crate::handler_application::search_application, crate::handler_auth::show_signup, crate::handler_auth::hide_signup, crate::handler_billing::list_invoices, diff --git a/src/main/scala/com/harana/search/client/search/SearchHandler.scala b/src/main/scala/com/harana/search/client/search/SearchHandler.scala index ffcb54a..5918078 100644 --- a/src/main/scala/com/harana/search/client/search/SearchHandler.scala +++ b/src/main/scala/com/harana/search/client/search/SearchHandler.scala @@ -65,15 +65,15 @@ class SearchHandler extends ActionHandler(zoomTo(_.searchState)) { }} ) + Effect( - Tauri.invoke("search_applications", Map("query" -> term.get)).map { (results: js.Array[RawApplication]) => { - UpdateSearchApplication(results.headOption.map(Application.apply)) + Tauri.invoke("search_application", Map("query" -> term.get)).map { (result: js.UndefOr[RawApplication]) => { + UpdateSearchApplication(result.toOption.map(Application.apply)) }} ) + action( ActionBatch( UpdateSelectedIntegration(None), UpdateSelectedDocument(None), - UpdateSearchApplication(None), + //UpdateSearchApplication(None), UpdateSearchTerm(term) ) ) @@ -238,7 +238,7 @@ class SearchHandler extends ActionHandler(zoomTo(_.searchState)) { } case UpdateSearchApplication(application) => - //println("Updating search application to: " + application) + println("Updating search application to: " + application) updated(value.copy(searchApplication = application)) case UpdateSearchResults(results) =>