RI-5905 create enableAnalyticsAction

Author: kchepikava

redisinsight/api/src/constants/agreements-spec.json

@@ -9,9 +9,9 @@
       "disabled": false,
       "category": "privacy",
       "since": "1.0.1",
-      "title": "Analytics",
-      "label": "Enable Analytics",
-      "description": "Select to help us make Redis Insight better. We aggregate anonymized user experience data and use it to fix bugs and improve experience for all users."
+      "title": "Telemetry",
+      "label": "Enable Telemetry",
+      "description": "Select to help us make Redis Insight better. Telemetry helps us better understand how Redis Insight features are being used, improve experience for all users, and prioritize new features."
     },
     "notifications": {
       "defaultValue": false,

redisinsight/ui/src/components/consents-settings/ConsentsPrivacy/ConsentsPrivacy.spec.tsx

@@ -91,7 +91,7 @@ describe('ConsentsPrivacy', () => {
         })
       })
 
-      const expectedActions = [{}].fill(updateUserConfigSettings(), 0)
+      const expectedActions = [updateUserConfigSettings()]
       expect(clearStoreActions(store.getActions().slice(0, expectedActions.length))).toEqual(
         clearStoreActions(expectedActions)
       )

redisinsight/ui/src/components/consents-settings/ConsentsPrivacy/ConsentsPrivacy.tsx

@@ -74,13 +74,8 @@ const ConsentsPrivacy = () => {
   return (
     <EuiForm component="form" onSubmit={formik.handleSubmit} data-testid="consents-settings-form">
       <div className={styles.consentsWrapper}>
-        <EuiText size="s" className={styles.smallText} color="subdued">
-          To optimize your experience, Redis Insight uses third-party tools.
-          All data collected is anonymized and will not be used for any purpose without your consent.
-        </EuiText>
-        <EuiSpacer size="l" />
         <EuiTitle size="xs">
-          <h4>Analytics</h4>
+          <h4>Telemetry</h4>
         </EuiTitle>
         {
           privacyConsents

redisinsight/ui/src/components/oauth/shared/oauth-agreement/OAuthAgreement.spec.tsx

@@ -10,9 +10,8 @@ import {
   screen,
 } from 'uiSrc/utils/test-utils'
 import { localStorageService } from 'uiSrc/services'
-import { oauthCloudPAgreementSelector, setAgreement } from 'uiSrc/slices/oauth/cloud'
+import { setAgreement } from 'uiSrc/slices/oauth/cloud'
 import { BrowserStorageItem } from 'uiSrc/constants'
-import { updateUserConfigSettings } from 'uiSrc/slices/user/user-settings'
 import OAuthAgreement from './OAuthAgreement'
 
 let store: typeof mockedStore
@@ -34,17 +33,6 @@ jest.mock('uiSrc/services', () => ({
   },
 }))
 
-jest.mock('uiSrc/slices/user/user-settings', () => ({
-  ...jest.requireActual('uiSrc/slices/user/user-settings'),
-  userSettingsConfigSelector: jest.fn().mockReturnValue({
-    agreements: {
-      eula: true,
-      version: '1.0.1',
-      analytics: false,
-    },
-  })
-}))
-
 describe('OAuthAgreement', () => {
   it('should render', () => {
     expect(render(<OAuthAgreement />)).toBeTruthy()
@@ -71,19 +59,4 @@ describe('OAuthAgreement', () => {
       false,
     )
   })
-
-  it('should update settings when checkbox checked if analytics is set to false', () => {
-    (oauthCloudPAgreementSelector as jest.Mock).mockReturnValueOnce(false)
-
-    render(<OAuthAgreement />)
-
-    const el = screen.getByTestId('oauth-agreement-checkbox') as HTMLInputElement
-    expect(el.checked).toBe(false)
-    fireEvent.click(el)
-
-    const expectedActions = [{}].fill(updateUserConfigSettings(), 0)
-    expect(clearStoreActions(store.getActions().slice(0, expectedActions.length))).toEqual(
-      clearStoreActions(expectedActions)
-    )
-  })
 })

redisinsight/ui/src/components/oauth/shared/oauth-agreement/OAuthAgreement.tsx

@@ -7,7 +7,7 @@ import { localStorageService } from 'uiSrc/services'
 import { BrowserStorageItem } from 'uiSrc/constants'
 import { setAgreement, oauthCloudPAgreementSelector } from 'uiSrc/slices/oauth/cloud'
 
-import { updateUserConfigSettingsAction, userSettingsConfigSelector } from 'uiSrc/slices/user/user-settings'
+import { enableUserAnalyticsAction } from 'uiSrc/slices/user/user-settings'
 import styles from './styles.module.scss'
 
 export interface Props {
@@ -17,13 +17,12 @@ export interface Props {
 const OAuthAgreement = (props: Props) => {
   const { size = 'm' } = props
   const agreement = useSelector(oauthCloudPAgreementSelector)
-  const config = useSelector(userSettingsConfigSelector)
 
   const dispatch = useDispatch()
 
   const handleCheck = (e: ChangeEvent<HTMLInputElement>) => {
-    if (e.target.checked && !config?.agreements?.analytics) {
-      dispatch(updateUserConfigSettingsAction({ agreements: { ...config?.agreements, analytics: true } }))
+    if (e.target.checked) {
+      dispatch(enableUserAnalyticsAction())
     }
     dispatch(setAgreement(e.target.checked))
     localStorageService.set(BrowserStorageItem.OAuthAgreement, e.target.checked)

redisinsight/ui/src/components/oauth/shared/oauth-form/OAuthForm.spec.tsx

@@ -1,10 +1,9 @@
 import React from 'react'
 import { cloneDeep } from 'lodash'
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
-import { render, cleanup, clearStoreActions, mockedStore, fireEvent, screen, act, waitFor } from 'uiSrc/utils/test-utils'
+import { render, cleanup, mockedStore, fireEvent, screen, act, waitFor } from 'uiSrc/utils/test-utils'
 import { OAuthStrategy } from 'uiSrc/slices/interfaces'
 import { MOCK_OAUTH_SSO_EMAIL } from 'uiSrc/mocks/data/oauth'
-import { updateUserConfigSettings, userSettingsConfigSelector } from 'uiSrc/slices/user/user-settings'
 import OAuthForm from './OAuthForm'
 
 jest.mock('uiSrc/telemetry', () => ({
@@ -20,17 +19,6 @@ jest.mock('uiSrc/slices/oauth/cloud', () => ({
   oauthCloudPAgreementSelector: jest.fn().mockReturnValue(true),
 }))
 
-jest.mock('uiSrc/slices/user/user-settings', () => ({
-  ...jest.requireActual('uiSrc/slices/user/user-settings'),
-  userSettingsConfigSelector: jest.fn().mockReturnValue({
-    agreements: {
-      eula: true,
-      version: '1.0.1',
-      analytics: true,
-    },
-  })
-}))
-
 const onClick = jest.fn()
 
 let store: typeof mockedStore
@@ -129,23 +117,4 @@ describe('OAuthForm', () => {
       fireEvent.click(screen.getByTestId('btn-submit'))
     })
   })
-
-  it('should updaten analytics if analytics is set to false', () => {
-    (userSettingsConfigSelector as jest.Mock).mockReturnValueOnce({
-      agreements: {
-        eula: true,
-        version: '1.0.1',
-        analytics: false,
-      },
-    })
-
-    render(<OAuthForm>{(children) => (<>{children}</>)}</OAuthForm>)
-
-    fireEvent.click(screen.getByTestId('google-oauth'))
-
-    const expectedActions = [{}].fill(updateUserConfigSettings(), 0)
-    expect(clearStoreActions(store.getActions().slice(0, expectedActions.length))).toEqual(
-      clearStoreActions(expectedActions)
-    )
-  })
 })

redisinsight/ui/src/components/oauth/shared/oauth-form/OAuthForm.tsx

@@ -1,10 +1,10 @@
 import React, { useState } from 'react'
-import { useDispatch, useSelector } from 'react-redux'
+import { useDispatch } from 'react-redux'
 import { signIn } from 'uiSrc/slices/oauth/cloud'
 import { OAuthSocialAction, OAuthStrategy } from 'uiSrc/slices/interfaces'
 import { ipcAuth } from 'uiSrc/electron/utils'
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
-import { updateUserConfigSettingsAction, userSettingsConfigSelector } from 'uiSrc/slices/user/user-settings'
+import { enableUserAnalyticsAction } from 'uiSrc/slices/user/user-settings'
 import OAuthSsoForm from './components/oauth-sso-form'
 import OAuthSocialButtons from '../oauth-social-buttons'
 import { Props as OAuthSocialButtonsProps } from '../oauth-social-buttons/OAuthSocialButtons'
@@ -25,17 +25,14 @@ const OAuthForm = ({
   const dispatch = useDispatch()
 
   const [authStrategy, setAuthStrategy] = useState('')
-  const config = useSelector(userSettingsConfigSelector)
 
   const initOAuthProcess = (strategy: OAuthStrategy, action: string, data?: {}) => {
     dispatch(signIn())
     ipcAuth(strategy, action, data)
   }
 
   const onSocialButtonClick = (authStrategy: OAuthStrategy) => {
-    if (!config?.agreements?.analytics) {
-      dispatch(updateUserConfigSettingsAction({ agreements: { ...config?.agreements, analytics: true } }))
-    }
+    dispatch(enableUserAnalyticsAction())
     setAuthStrategy(authStrategy)
     onClick?.(authStrategy)
 

redisinsight/ui/src/slices/user/user-settings.ts

@@ -182,3 +182,14 @@ export function updateUserConfigSettingsAction(
     }
   }
 }
+
+export function enableUserAnalyticsAction() {
+  return async (dispatch: AppDispatch, stateInit: () => RootState) => {
+    const state = stateInit()
+    const agreements = state?.user?.settings?.config?.agreements
+
+    if (agreements && !agreements.analytics) {
+      dispatch(updateUserConfigSettingsAction({ agreements: { ...agreements, analytics: true } }))
+    }
+  }
+}