refactor: finalize query store api

Author: dancixx

src-tauri/src/dbs/query.rs

@@ -20,20 +20,20 @@ pub async fn query_db_select(app_state: State<'_, AppState>) -> Result<BTreeMap<
 }
 
 #[tauri::command(rename_all = "snake_case")]
-pub async fn query_db_insert(key: &str, sql: &str, app: AppHandle) -> Result<()> {
+pub async fn query_db_insert(query_id: &str, sql: &str, app: AppHandle) -> Result<()> {
   let app_state = app.state::<AppState>();
   let db = app_state.query_db.lock().await;
   if let Some(ref db_instance) = *db {
-    db_instance.insert(key, sql).unwrap();
+    db_instance.insert(query_id, sql).unwrap();
   }
   Ok(())
 }
 
 #[tauri::command(rename_all = "snake_case")]
-pub async fn query_db_delete(key: &str, app_state: State<'_, AppState>) -> Result<()> {
+pub async fn query_db_delete(query_id: &str, app_state: State<'_, AppState>) -> Result<()> {
   let query_db = app_state.query_db.lock().await;
   if let Some(ref query_db) = *query_db {
-    query_db.remove(key).unwrap();
+    query_db.remove(query_id).unwrap();
   };
   Ok(())
 }

src/app.rs

@@ -12,7 +12,7 @@ use crate::{
   store::{
     atoms::{QueryPerformanceAtom, QueryPerformanceContext, RunQueryAtom, RunQueryContext},
     projects::ProjectsStore,
-    query::QueryStore,
+    queries::QueriesStore,
     tabs::TabsStore,
   },
 };
@@ -22,8 +22,8 @@ use crate::{
 
 #[component]
 pub fn App() -> impl IntoView {
-  provide_context(QueryStore::default());
   provide_context(ProjectsStore::default());
+  provide_context(QueriesStore::default());
   provide_context(RwSignal::new(QueryTableLayout::Grid));
   provide_context::<QueryPerformanceContext>(
     RwSignal::new(VecDeque::<QueryPerformanceAtom>::new()),

src/dashboard/query_editor.rs

@@ -84,7 +84,7 @@ pub fn QueryEditor(index: usize) -> impl IntoView {
 
   view! {
       <div _ref=node_ref class="border-b-1 border-neutral-200 h-72 sticky">
-          // <AddCustomQuery show=show/>
+          <AddCustomQuery show=show/>
           <div class="absolute bottom-0 items-center text-xs flex justify-between px-4 left-0 w-full h-10 bg-gray-50">
               <Show when=move || active_project().is_some() fallback=|| view! { <div></div> }>
                   <div class="appearance-auto py-1 px-2 border-1 border-neutral-200 bg-white hover:bg-neutral-200 rounded-md">

src/invoke.rs

@@ -94,16 +94,13 @@ pub struct InvokeProjectDbDeleteArgs<'a> {
 }
 
 #[derive(Serialize, Deserialize)]
-pub struct InvokeInsertQueryArgs<'a> {
-  pub key: &'a str,
+pub struct InvokeQueryDbInsertArgs<'a> {
+  pub query_id: &'a str,
   pub sql: &'a str,
 }
 
 #[derive(Serialize, Deserialize)]
-pub struct InvokeSelectQueriesArgs;
-
-#[derive(Serialize, Deserialize)]
-pub struct InvokeDeleteQueryArgs<'a> {
-  pub key: &'a str,
+pub struct InvokeQueryDbDeleteArgs<'a> {
+  pub query_id: &'a str,
 }
 

src/modals/add_custom_query.rs

@@ -1,12 +1,12 @@
 use leptos::*;
 use thaw::{Modal, ModalFooter};
 
-use crate::store::{projects::ProjectsStore, query::QueryStore};
+use crate::store::{projects::ProjectsStore, queries::QueriesStore};
 
 #[component]
 pub fn AddCustomQuery(show: RwSignal<bool>) -> impl IntoView {
   let projects_store = expect_context::<ProjectsStore>();
-  let query_store = expect_context::<QueryStore>();
+  let query_store = expect_context::<QueriesStore>();
   let (query_title, set_query_title) = create_signal(String::new());
   //let projects = create_memo(move |_| projects_store.get_projects().unwrap());
 
@@ -18,15 +18,12 @@ pub fn AddCustomQuery(show: RwSignal<bool>) -> impl IntoView {
   //   });
 
   let insert_query = create_action(
-    move |(query_db, key, project_name): &(QueryStore, String, String)| {
+    move |(query_db, key, project_name): &(QueriesStore, String, String)| {
       let query_db_clone = *query_db;
       let key = key.clone();
       let project_name = project_name.clone();
       async move {
-        query_db_clone
-          .insert_query(&key, &project_name)
-          .await
-          .unwrap();
+        query_db_clone.insert_query(&key, &project_name).await;
       }
     },
   );

src/sidebar/index.rs

@@ -18,7 +18,7 @@ pub fn Sidebar() -> impl IntoView {
       show.set(false);
     }
   });
-  create_resource(
+  let _ = create_resource(
     || {},
     move |_| async move {
       projects_store.load_projects().await;

src/sidebar/queries.rs

@@ -1,19 +1,21 @@
-use crate::store::query::QueryStore;
+use crate::store::queries::QueriesStore;
 use leptos::*;
 
 use super::query::Query;
 
 #[component]
 pub fn Queries() -> impl IntoView {
-  let query_state = expect_context::<QueryStore>();
-  let queries = create_resource(
-    move || query_state.0.get(),
-    move |_| async move { query_state.select_queries().await.unwrap() },
+  let queries_store = expect_context::<QueriesStore>();
+  let _ = create_resource(
+    move || queries_store.0.get(),
+    move |_| async move {
+      queries_store.load_queries().await;
+    },
   );
 
   view! {
       <For
-          each=move || queries.get().unwrap_or_default()
+          each=move || queries_store.0.get()
           key=|(key, _)| key.clone()
           children=move |(key, _)| view! { <Query key=key/> }
       />

src/sidebar/query.rs

@@ -1,11 +1,11 @@
 use leptos::*;
 use leptos_icons::*;
 
-use crate::store::{query::QueryStore, tabs::TabsStore};
+use crate::store::{queries::QueriesStore, tabs::TabsStore};
 
 #[component]
 pub fn Query(key: String) -> impl IntoView {
-  let query_store = expect_context::<QueryStore>();
+  let query_store = expect_context::<QueriesStore>();
   let tabs_store = expect_context::<TabsStore>();
   let key_clone = key.clone();
   let splitted_key = create_memo(move |_| {
@@ -41,7 +41,7 @@ pub fn Query(key: String) -> impl IntoView {
                   move |_| {
                       let key = key.clone();
                       spawn_local(async move {
-                          query_store.delete_query(&key).await.unwrap();
+                          query_store.delete_query(&key).await;
                       })
                   }
               }

src/store/mod.rs

@@ -1,5 +1,5 @@
 pub mod atoms;
 pub mod projects;
-pub mod query;
+pub mod queries;
 pub mod tabs;
 

src/store/queries.rs

@@ -0,0 +1,57 @@
+use std::collections::BTreeMap;
+
+use leptos::*;
+use tauri_sys::tauri::invoke;
+
+use crate::invoke::{Invoke, InvokeQueryDbDeleteArgs, InvokeQueryDbInsertArgs};
+
+use super::tabs::TabsStore;
+
+#[derive(Clone, Copy, Debug)]
+pub struct QueriesStore(pub RwSignal<BTreeMap<String, String>>);
+
+impl Default for QueriesStore {
+  fn default() -> Self {
+    Self::new()
+  }
+}
+
+impl QueriesStore {
+  #[must_use]
+  pub fn new() -> Self {
+    Self(create_rw_signal(BTreeMap::new()))
+  }
+
+  pub async fn load_queries(&self) {
+    let saved_queries = invoke::<_, BTreeMap<String, String>>(Invoke::QueryDbSelect.as_ref(), &())
+      .await
+      .unwrap();
+    self.0.update(|prev| {
+      *prev = saved_queries.into_iter().collect();
+    });
+  }
+
+  pub async fn insert_query(&self, project_id: &str, title: &str) {
+    let tabs_store = expect_context::<TabsStore>();
+    let sql = tabs_store.select_active_editor_value();
+    let _ = invoke::<_, ()>(
+      Invoke::QueryDbInsert.as_ref(),
+      &InvokeQueryDbInsertArgs {
+        query_id: &format!("{}:{}", project_id, title),
+        sql: &sql,
+      },
+    )
+    .await;
+    self.load_queries().await;
+  }
+
+  pub async fn delete_query(&self, query_id: &str) {
+    let _ = invoke::<_, ()>(
+      Invoke::QueryDbDelete.as_ref(),
+      &InvokeQueryDbDeleteArgs { query_id },
+    )
+    .await;
+    self.load_queries().await;
+  }
+}
+