Merge branch 'feature/RI-4399-beta_features' into be/feature/RI-4489-beta_features

Author: Artem

redisinsight/ui/src/components/config/Config.spec.tsx

@@ -2,7 +2,7 @@ import React from 'react'
 import { cloneDeep } from 'lodash'
 import { BuildType } from 'uiSrc/constants/env'
 import { localStorageService } from 'uiSrc/services'
-import { setFeaturesToHighlight, setOnboarding } from 'uiSrc/slices/app/features'
+import { getFeatureFlags, setFeaturesToHighlight, setOnboarding } from 'uiSrc/slices/app/features'
 import { getNotifications } from 'uiSrc/slices/app/notifications'
 import { render, mockedStore, cleanup, MOCKED_HIGHLIGHTING_FEATURES } from 'uiSrc/utils/test-utils'
 
@@ -63,6 +63,7 @@ describe('Config', () => {
       getNotifications(),
       getWBGuides(),
       getWBTutorials(),
+      getFeatureFlags(),
       getUserConfigSettings(),
     ]
     expect(store.getActions()).toEqual([...afterRenderActions])
@@ -95,6 +96,7 @@ describe('Config', () => {
       getNotifications(),
       getWBGuides(),
       getWBTutorials(),
+      getFeatureFlags(),
       getUserConfigSettings(),
       setSettingsPopupState(true),
     ]

redisinsight/ui/src/telemetry/checkAnalytics.ts

@@ -5,4 +5,5 @@ import store from 'uiSrc/slices/store'
 export const checkIsAnalyticsGranted = () =>
   !!get(store.getState(), 'user.settings.config.agreements.analytics', false)
 
+export const getInfoServer = () => get(store.getState(), 'app.info.server', {})
 export const getAppType = () => get(store.getState(), 'app.info.server.appType')

redisinsight/ui/src/telemetry/interfaces.ts

@@ -8,7 +8,15 @@ export interface ITelemetryIdentify {
 
 export interface ITelemetryService {
   initialize(): Promise<void>
-  pageView(name: string, appType: string, databaseId?: string): Promise<void>
+  pageView(
+    name: string,
+    params: {
+      buildType?: string
+      controlNumber?: number
+      controlGroup?: string
+      databaseId?: string
+    }
+  ): Promise<void>
   identify(opts: ITelemetryIdentify): Promise<void>
   event(opts: ITelemetryEvent): Promise<void>
   anonymousId: string

redisinsight/ui/src/telemetry/segment.ts

@@ -51,12 +51,15 @@ export class SegmentTelemetryService implements ITelemetryService {
     return this._anonymousId
   }
 
-  async pageView(name: string, appType: string, databaseId?: string): Promise<void> {
+  async pageView(
+    name: string,
+    properties: object
+  ): Promise<void> {
     return new Promise((resolve, reject) => {
       try {
         const pageInfo = this._getPageInfo()
         const { page = {} } = { ...pageInfo }
-        window.analytics.page(name, { databaseId, buildType: appType, ...page }, {
+        window.analytics.page(name, { ...properties, ...page }, {
           context: {
             ip: '0.0.0.0',
             ...pageInfo

redisinsight/ui/src/telemetry/telemetryUtils.ts

@@ -10,7 +10,7 @@ import { localStorageService } from 'uiSrc/services'
 import { ApiEndpoints, BrowserStorageItem, KeyTypes, StreamViews } from 'uiSrc/constants'
 import { KeyViewType } from 'uiSrc/slices/interfaces/keys'
 import { StreamViewType } from 'uiSrc/slices/interfaces/stream'
-import { checkIsAnalyticsGranted, getAppType } from 'uiSrc/telemetry/checkAnalytics'
+import { checkIsAnalyticsGranted, getInfoServer } from 'uiSrc/telemetry/checkAnalytics'
 import { AdditionalRedisModule } from 'apiSrc/modules/database/models/additional.redis.module'
 import {
   ITelemetrySendEvent,
@@ -60,13 +60,15 @@ const sendEventTelemetry = (payload: ITelemetrySendEvent) => {
   const isAnalyticsGranted = checkIsAnalyticsGranted()
   setAnonymousId(isAnalyticsGranted)
 
-  const appType = getAppType()
+  const { appType: buildType, controlNumber, controlGroup } = getInfoServer() as Record<string, any>
 
   if (isAnalyticsGranted || nonTracking) {
     return telemetryService?.event({
       event,
       properties: {
-        buildType: appType,
+        buildType,
+        controlNumber,
+        controlGroup,
         ...eventData,
       },
     })
@@ -86,10 +88,19 @@ const sendPageViewTelemetry = (payload: ITelemetrySendPageView) => {
 
   const isAnalyticsGranted = checkIsAnalyticsGranted()
   setAnonymousId(isAnalyticsGranted)
-  const appType = getAppType()
+
+  const { appType: buildType, controlNumber, controlGroup } = getInfoServer() as Record<string, any>
 
   if (isAnalyticsGranted || nonTracking) {
-    telemetryService?.pageView(name, appType, databaseId)
+    telemetryService?.pageView(
+      name,
+      {
+        buildType,
+        controlNumber,
+        controlGroup,
+        databaseId
+      }
+    )
   }
 }
 

redisinsight/ui/src/utils/test-utils.tsx

@@ -216,7 +216,8 @@ jest.mock(
   'uiSrc/telemetry/checkAnalytics',
   () => ({
     checkIsAnalyticsGranted: jest.fn(),
-    getAppType: jest.fn()
+    getAppType: jest.fn(),
+    getInfoServer: jest.fn().mockReturnValue({}),
   })
 )