Merge pull request #3611 from RedisInsight/fe/feature/RI-5675-add-provider-to-all-frontend-telemetry-events

Add provider to all frontend telemetry events #5675

Author: mariasergeenko

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/browser/modules/key-details/KeyDetails.tsx

@@ -45,7 +45,7 @@ const KeyDetails = (props: Props) => {
   const { viewType } = useSelector(keysSelector)
   const { loading, error = '', data } = useSelector(selectedKeySelector)
   const isKeySelected = !isNull(useSelector(selectedKeyDataSelector))
-  const { type: keyType, name: keyName, length: keyLength } = useSelector(selectedKeyDataSelector) ?? {
+  const { type: keyType, length: keyLength } = useSelector(selectedKeyDataSelector) ?? {
     type: KeyTypes.String,
   }
 
@@ -55,14 +55,7 @@ const KeyDetails = (props: Props) => {
     if (keyProp === null) {
       return
     }
-    // Restore key details from context in future
-    // (selectedKey.data?.name !== keyProp)
-    dispatch(fetchKeyInfo(keyProp))
-    dispatch(setSelectedKeyRefreshDisabled(false))
-  }, [keyProp])
-
-  useEffect(() => {
-    if (!isUndefined(keyName)) {
+    if (keyProp?.data) {
       sendEventTelemetry({
         event: getBasedOnViewTypeEvent(
           viewType,
@@ -76,7 +69,11 @@ const KeyDetails = (props: Props) => {
         }
       })
     }
-  }, [keyName])
+    // Restore key details from context in future
+    // (selectedKey.data?.name !== keyProp)
+    dispatch(fetchKeyInfo(keyProp))
+    dispatch(setSelectedKeyRefreshDisabled(false))
+  }, [keyProp])
 
   const onCloseAddItemPanel = () => {
     sendEventTelemetry({

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/home/components/database-list-component/DatabasesListWrapper.tsx

@@ -145,14 +145,15 @@ const DatabasesListWrapper = ({ width, onEditInstance, editedInstance, onDeleteI
         ...modulesSummary,
       }
     })
-    dispatch(checkConnectToInstanceAction(id, connectToInstance))
+    dispatch(checkConnectToInstanceAction(id, connectToInstance, undefined, contextInstanceId !== id))
   }
 
-  const handleClickDeleteInstance = (id: string) => {
+  const handleClickDeleteInstance = ({ id, provider }: Instance) => {
     sendEventTelemetry({
       event: TelemetryEvent.CONFIG_DATABASES_SINGLE_DATABASE_DELETE_CLICKED,
       eventData: {
-        databaseId: id
+        databaseId: id,
+        provider
       }
     })
     showPopover(id)
@@ -162,7 +163,8 @@ const DatabasesListWrapper = ({ width, onEditInstance, editedInstance, onDeleteI
     sendEventTelemetry({
       event: TelemetryEvent.CONFIG_DATABASES_DATABASE_EDIT_CLICKED,
       eventData: {
-        databaseId: instance.id
+        databaseId: instance.id,
+        provider: instance.provider,
       }
     })
     onEditInstance(instance)
@@ -394,7 +396,7 @@ const DatabasesListWrapper = ({ width, onEditInstance, editedInstance, onDeleteI
               updateLoading={false}
               showPopover={showPopover}
               handleDeleteItem={() => handleDeleteInstance(instance)}
-              handleButtonClick={() => handleClickDeleteInstance(instance.id)}
+              handleButtonClick={() => handleClickDeleteInstance(instance)}
               testid={`delete-instance-${instance.id}`}
             />
           </>

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/rdi/pipeline-management/pages/config/Config.spec.tsx

@@ -64,6 +64,9 @@ describe('Config', () => {
 
     expect(sendPageViewTelemetry).toBeCalledWith({
       name: TelemetryPageView.RDI_CONFIG,
+      eventData: {
+        rdiInstanceId: 'rdiInstanceId',
+      }
     })
   })
 

redisinsight/ui/src/pages/rdi/pipeline-management/pages/config/Config.tsx

@@ -38,6 +38,9 @@ const Config = () => {
   useEffect(() => {
     sendPageViewTelemetry({
       name: TelemetryPageView.RDI_CONFIG,
+      eventData: {
+        rdiInstanceId
+      }
     })
 
     return () => {

redisinsight/ui/src/pages/rdi/pipeline-management/pages/job/JobWrapper.tsx

@@ -40,6 +40,9 @@ const JobWrapper = () => {
   useEffect(() => {
     sendPageViewTelemetry({
       name: TelemetryPageView.RDI_JOBS,
+      eventData: {
+        rdiInstanceId
+      }
     })
   }, [])