Put databaseId to eventData

Author: kchepikava

redisinsight/ui/src/pages/browser/BrowserPage.tsx

@@ -150,7 +150,9 @@ const BrowserPage = () => {
   const sendPageView = (instanceId: string) => {
     sendPageViewTelemetry({
       name: TelemetryPageView.BROWSER_PAGE,
-      databaseId: instanceId
+      eventData: {
+        databaseId: instanceId
+      }
     })
     setIsPageViewSent(true)
   }

redisinsight/ui/src/pages/cluster-details/ClusterDetailsPage.tsx

@@ -106,7 +106,9 @@ const ClusterDetailsPage = () => {
   const sendPageView = (instanceId: string) => {
     sendPageViewTelemetry({
       name: TelemetryPageView.CLUSTER_DETAILS_PAGE,
-      databaseId: instanceId
+      eventData: {
+        databaseId: instanceId
+      }
     })
     setIsPageViewSent(true)
   }

redisinsight/ui/src/pages/database-analysis/DatabaseAnalysisPage.tsx

@@ -75,7 +75,9 @@ const DatabaseAnalysisPage = () => {
   const sendPageView = (instanceId: string) => {
     sendPageViewTelemetry({
       name: TelemetryPageView.DATABASE_ANALYSIS,
-      databaseId: instanceId
+      eventData: {
+        databaseId: instanceId
+      }
     })
     setIsPageViewSent(true)
   }

redisinsight/ui/src/pages/pub-sub/PubSubPage.spec.tsx

@@ -35,7 +35,9 @@ describe('PubSubPage', () => {
 
     expect(sendPageViewTelemetry).toBeCalledWith({
       name: TelemetryPageView.PUBSUB_PAGE,
-      databaseId: 'instanceId'
+      eventData: {
+        databaseId: 'instanceId'
+      }
     })
   })
 })

redisinsight/ui/src/pages/pub-sub/PubSubPage.tsx

@@ -54,7 +54,9 @@ const PubSubPage = () => {
   const sendPageView = (instanceId: string) => {
     sendPageViewTelemetry({
       name: TelemetryPageView.PUBSUB_PAGE,
-      databaseId: instanceId
+      eventData: {
+        databaseId: instanceId
+      }
     })
     setIsPageViewSent(true)
   }

redisinsight/ui/src/pages/slow-log/SlowLogPage.tsx

@@ -86,7 +86,9 @@ const SlowLogPage = () => {
   const sendPageView = (instanceId: string) => {
     sendPageViewTelemetry({
       name: TelemetryPageView.SLOWLOG_PAGE,
-      databaseId: instanceId
+      eventData: {
+        databaseId: instanceId
+      }
     })
     setIsPageViewSent(true)
   }

redisinsight/ui/src/pages/workbench/WorkbenchPage.tsx

@@ -29,7 +29,9 @@ const WorkbenchPage = () => {
   const sendPageView = (instanceId: string) => {
     sendPageViewTelemetry({
       name: TelemetryPageView.WORKBENCH_PAGE,
-      databaseId: instanceId
+      eventData: {
+        databaseId: instanceId
+      }
     })
     setIsPageViewSent(true)
   }

redisinsight/ui/src/telemetry/interfaces.ts

@@ -22,7 +22,6 @@ export interface ITelemetrySendEvent {
 export interface ITelemetrySendPageView {
   name: string
   eventData?: EventData
-  databaseId?: string
   nonTracking?: boolean
 }
 

redisinsight/ui/src/telemetry/telemetryUtils.ts

@@ -44,17 +44,17 @@ const sendEventTelemetry = async ({ event, eventData = {}, traits = {} }: ITelem
   }
 }
 
-const sendPageViewTelemetry = async ({ name, databaseId, eventData = {} }: ITelemetrySendPageView) => {
+const sendPageViewTelemetry = async ({ name, eventData = {} }: ITelemetrySendPageView) => {
   try {
     const isAnalyticsGranted = checkIsAnalyticsGranted()
     if (!isAnalyticsGranted) {
       return
     }
-    if (!eventData.provider && databaseId) {
-      eventData.provider = getProvider(databaseId)
+    if (!eventData.provider && eventData.databaseId) {
+      eventData.provider = getProvider(eventData.databaseId)
     }
     await apiService.post(`${ApiEndpoints.ANALYTICS_SEND_PAGE}`,
-      { event: name, eventData: { ...eventData, databaseId } })
+      { event: name, eventData })
   } catch (e) {
     // continue regardless of error
   }