From bb561d7b98e4b9d57666f6e8aaa92f39f4671325 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Tue, 19 Mar 2024 10:23:21 -0700
Subject: [PATCH] Fix settings query store and analytics

---
 src-tauri/src/analytics.rs         | 1 +
 src-tauri/src/main.rs              | 7 +------
 src-web/hooks/useSettings.ts       | 5 +++--
 src-web/hooks/useUpdateSettings.ts | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src-tauri/src/analytics.rs b/src-tauri/src/analytics.rs
index d7c67d68..145a5bde 100644
--- a/src-tauri/src/analytics.rs
+++ b/src-tauri/src/analytics.rs
@@ -26,6 +26,7 @@ pub enum AnalyticsResource {
     KeyValue,
     Sidebar,
     Workspace,
+    Setting,
 }
 
 impl AnalyticsResource {
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index a0b3268a..244dab87 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -914,16 +914,11 @@ async fn cmd_track_event(
             analytics::track_event(&window.app_handle(), resource, action, attributes).await;
         }
         (r, a) => {
-            println!(
-                "HttpRequest: {:?}",
-                serde_json::to_string(&AnalyticsResource::HttpRequest)
-            );
-            println!("Send: {:?}", serde_json::to_string(&AnalyticsAction::Send));
             error!(
                 "Invalid action/resource for track_event: {resource}.{action} = {:?}.{:?}",
                 r, a
             );
-            return Err("Invalid event".to_string());
+            return Err("Invalid analytics event".to_string());
         }
     };
     Ok(())
diff --git a/src-web/hooks/useSettings.ts b/src-web/hooks/useSettings.ts
index ca521694..8a817e4f 100644
--- a/src-web/hooks/useSettings.ts
+++ b/src-web/hooks/useSettings.ts
@@ -11,8 +11,9 @@ export function useSettings() {
     useQuery({
       queryKey: settingsQueryKey(),
       queryFn: async () => {
-        return (await invoke('cmd_get_settings')) as Settings;
+        const settings = (await invoke('cmd_get_settings')) as Settings;
+        return [settings];
       },
-    }).data ?? undefined
+    }).data?.[0] ?? undefined
   );
 }
diff --git a/src-web/hooks/useUpdateSettings.ts b/src-web/hooks/useUpdateSettings.ts
index a3ee7bd6..140aeb1e 100644
--- a/src-web/hooks/useUpdateSettings.ts
+++ b/src-web/hooks/useUpdateSettings.ts
@@ -11,7 +11,7 @@ export function useUpdateSettings() {
       await invoke('cmd_update_settings', { settings });
     },
     onMutate: async (settings) => {
-      queryClient.setQueryData<Settings>(settingsQueryKey(), settings);
+      queryClient.setQueryData<Settings[]>(settingsQueryKey(), [settings]);
     },
   });
 }