Fix analytics properties

Author: ValentaTomas

src/App/RootStore.tsx

@@ -29,9 +29,9 @@ class RootStore {
   private contructor() { }
   private static _instance: RootStore;
 
-  readonly searchStore = new SearchStore();
   readonly uiStore = new UIStore();
   readonly userStore = new UserStore();
+  readonly searchStore = new SearchStore(this.uiStore);
 
   static get instance() {
     return RootStore._instance || (RootStore._instance = new RootStore())

src/Search/search.store.ts

@@ -8,6 +8,7 @@ import { SearchSource } from 'services/search.service/searchSource';
 import SyncService, { StorageKey } from 'services/sync.service';
 import { HistoryEntry } from './historyEntry';
 import AnalyticsService, { AnalyticsEvent } from 'services/analytics.service';
+import UIStore from 'ui/ui.store';
 
 export function useSearchStore() {
   const { searchStore } = useRootStore();
@@ -80,7 +81,7 @@ class SearchStore {
     SyncService.markDirtyKey(StorageKey.LastQuery);
   }
 
-  constructor() {
+  constructor(private _uiStore: UIStore) {
     makeAutoObservable(this, {
       _maxHistorySize: false,
       _lastSearchInvocation: false,
@@ -137,7 +138,11 @@ class SearchStore {
         return reject(error);
       }
     });
-    AnalyticsService.track(AnalyticsEvent.Search, { query: this.query });
+    AnalyticsService.track(AnalyticsEvent.Search, {
+      query: this.query,
+      activeFilter: this._uiStore.searchSource,
+      activeDocSource: toJS(this.filters.Docs.selectedFilter),
+    });
     this._lastSearchInvocation = searchInvocation;
     return searchInvocation;
   }

src/main/index.ts

@@ -81,7 +81,6 @@ toDesktop.autoUpdater.on('update-downloaded', () => {
 });
 
 async function restartAndUpdate(location: UpdateLocation) {
-  console.log('update');
   try {
     await MainAnalyticsService.trackAndFlush(AnalyticsEvent.UpdateClicked, { location });
   } catch (error) { }

src/services/analytics.service/analyticsEvent.ts

@@ -1,4 +1,6 @@
 import { UpdateLocation } from 'services/appWindow';
+import { DocSource } from 'services/search.service/docSource';
+import { SearchSource } from 'services/search.service/searchSource';
 
 export enum AnalyticsEvent {
   ShowedApp = 'Showed app',
@@ -42,7 +44,7 @@ export enum AnalyticsEvent {
 
 export type AnalyticsPayload = {
   [AnalyticsEvent.ShortcutUsed]: { action: string };
-  [AnalyticsEvent.Search]: { query: string };
+  [AnalyticsEvent.Search]: { query: string, activeFilter: SearchSource, activeDocSource?: DocSource };
   [AnalyticsEvent.ModalOpened]: void;
   [AnalyticsEvent.SignInModalOpened]: void;
   [AnalyticsEvent.SignInModalClosed]: void;

src/services/analytics.service/mainAnalytics.service.ts

@@ -4,9 +4,8 @@ import Analytics from 'analytics-node';
 import { app } from 'electron';
 import { v4 as uuidv4 } from 'uuid';
 
-import { isDev, isStaging } from 'main/utils/environment';
+import { isDev } from 'main/utils/environment';
 import MainSyncService, { StorageKey } from 'services/sync.service/mainSync.service';
-import MainIPCService, { IPCSendChannel } from 'services/ipc.service/mainIPC.service';
 
 import { User } from 'user/user';
 import { AnalyticsEvent, AnalyticsPayload } from 'services/analytics.service/analyticsEvent';
@@ -29,11 +28,11 @@ class MainAnalyticsService {
     return anonymousID;
   }
 
-  static track<T extends AnalyticsEvent>(event: T, payload: AnalyticsPayload[T], options?: { userID?: string, searchWindow?: electron.BrowserWindow }) {
+  static track<T extends AnalyticsEvent>(event: T, payload: AnalyticsPayload[T], options?: { searchWindow?: electron.BrowserWindow }) {
     return MainAnalyticsService.analytics.track({
       event,
       anonymousId: MainAnalyticsService.anonymousID,
-      userId: options?.userID,
+      userId: MainAnalyticsService.userID,
       properties: {
         ...payload,
         isSignedIn: MainAnalyticsService.isSignedIn,
@@ -47,7 +46,7 @@ class MainAnalyticsService {
     });
   }
 
-  static trackAndFlush<T extends AnalyticsEvent>(event: T, payload: AnalyticsPayload[T], options?: { userID?: string, anonymousID: string, searchWindow?: electron.BrowserWindow }) {
+  static trackAndFlush<T extends AnalyticsEvent>(event: T, payload: AnalyticsPayload[T], options?: { searchWindow?: electron.BrowserWindow }) {
     return new Promise<void>((resolve, reject) => {
       MainAnalyticsService.track(event, payload, options)
         .flush((error) => {