Merge pull request #3882 from RedisInsight/latest

vlad-dargel · web-flow · commit 7a69960d2693 · 2024-10-02T14:26:10.000+02:00
Latest to main
diff --git a/.circleci/build/release-docker.sh b/.circleci/build/release-docker.sh
@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.56.0)
+-v - Semver (2.58.0)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "
diff --git a/redisinsight/api/config/default.ts b/redisinsight/api/config/default.ts
@@ -80,7 +80,7 @@ export default {
     migrateOldFolders: process.env.RI_MIGRATE_OLD_FOLDERS ? process.env.RI_MIGRATE_OLD_FOLDERS === 'true' : true,
     autoBootstrap: process.env.RI_AUTO_BOOTSTRAP ? process.env.RI_AUTO_BOOTSTRAP === 'true' : true,
     buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
-    appVersion: process.env.RI_APP_VERSION || '2.56.0',
+    appVersion: process.env.RI_APP_VERSION || '2.58.0',
     requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],
diff --git a/redisinsight/api/config/production.ts b/redisinsight/api/config/production.ts
@@ -40,7 +40,7 @@ export default {
   },
   ai: {
     convAiApiUrl: process.env.RI_AI_CONVAI_API_URL || 'https://redis.io/convai/api',
-    querySocketUrl: process.env.RI_AI_QUERY_SOCKET_URL || 'https://cloud.redis.io',
+    querySocketUrl: process.env.RI_AI_QUERY_SOCKET_URL || 'https://app.redislabs.com',
     querySocketPath: process.env.RI_AI_QUERY_SOCKET_PATH || '/api/v1/cloud-copilot-service/socket.io/',
   },
 };
diff --git a/redisinsight/api/config/swagger.ts b/redisinsight/api/config/swagger.ts
@@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit<OpenAPIObject, 'paths'> = {
   info: {
     title: 'Redis Insight Backend API',
     description: 'Redis Insight Backend API',
-    version: '2.56.0',
+    version: '2.58.0',
   },
   tags: [],
 };
diff --git a/redisinsight/api/package.json b/redisinsight/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redisinsight-api",
-  "version": "2.56.0",
+  "version": "2.58.0",
   "description": "Redis Insight API",
   "private": true,
   "author": {
diff --git a/redisinsight/api/src/constants/agreements-spec.json b/redisinsight/api/src/constants/agreements-spec.json
@@ -9,9 +9,9 @@
       "disabled": false,
       "category": "privacy",
       "since": "1.0.1",
-      "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."
+      "title": "Usage Data",
+      "label": "Usage Data",
+      "description": "Select the usage data option to help us improve Redis Insight. We use such usage data to understand how Redis Insight features are used, prioritize new features, and enhance the user experience."
     },
     "notifications": {
       "defaultValue": false,
diff --git a/redisinsight/desktop/src/lib/aboutPanel/aboutPanel.ts b/redisinsight/desktop/src/lib/aboutPanel/aboutPanel.ts
@@ -8,7 +8,7 @@ const ICON_PATH = app.isPackaged
 
 export const AboutPanelOptions = {
   applicationName: 'Redis Insight',
-  applicationVersion: `${app.getVersion() || '2.56.0'}${
+  applicationVersion: `${app.getVersion() || '2.58.0'}${
     !config.isProduction ? `-dev-${process.getCreationTime()}` : ''
   }`,
   copyright: `Copyright © ${new Date().getFullYear()} Redis Ltd.`,
diff --git a/redisinsight/package.json b/redisinsight/package.json
@@ -3,7 +3,7 @@
   "appName": "Redis Insight",
   "productName": "RedisInsight",
   "private": true,
-  "version": "2.56.0",
+  "version": "2.58.0",
   "description": "Redis Insight",
   "main": "./dist/main/main.js",
   "author": {
diff --git a/redisinsight/ui/package.json b/redisinsight/ui/package.json
@@ -2,7 +2,7 @@
   "name": "redisinsight",
   "appName": "Redis Insight",
   "productName": "RedisInsight",
-  "version": "2.56.0",
+  "version": "2.58.0",
   "description": "Redis Insight",
   "author": {
     "name": "Redis Ltd.",
diff --git a/redisinsight/ui/src/components/consents-settings/ConsentsPrivacy/ConsentsPrivacy.tsx b/redisinsight/ui/src/components/consents-settings/ConsentsPrivacy/ConsentsPrivacy.tsx
@@ -74,8 +74,12 @@ 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.
+        </EuiText>
+        <EuiSpacer size="l" />
         <EuiTitle size="xs">
-          <h4>Telemetry</h4>
+          <h4>Usage Data</h4>
         </EuiTitle>
         {
           privacyConsents
diff --git a/redisinsight/ui/src/components/consents-settings/ConsentsSettings.tsx b/redisinsight/ui/src/components/consents-settings/ConsentsSettings.tsx
@@ -233,7 +233,6 @@ const ConsentsSettings = ({ onSubmitted }: Props) => {
             <EuiSpacer size="m" />
             <EuiText className={styles.smallText} size="s" 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" />
           </>
diff --git a/redisinsight/ui/src/components/global-url-handler/GlobalUrlHandler.spec.tsx b/redisinsight/ui/src/components/global-url-handler/GlobalUrlHandler.spec.tsx
@@ -1,11 +1,12 @@
 import React from 'react'
 import { cloneDeep } from 'lodash'
 import reactRouterDom from 'react-router-dom'
-import { cleanup, mockedStore, render, act } from 'uiSrc/utils/test-utils'
+import { act, cleanup, mockedStore, render } from 'uiSrc/utils/test-utils'
 
 import {
   appRedirectionSelector,
-  setFromUrl, setUrlDbConnection,
+  setFromUrl,
+  setUrlDbConnection,
   setUrlHandlingInitialState,
   setUrlProperties
 } from 'uiSrc/slices/app/url-handling'
@@ -15,6 +16,10 @@ import { INFINITE_MESSAGES } from 'uiSrc/components/notifications/components'
 import { Pages } from 'uiSrc/constants'
 import { ADD_NEW, ADD_NEW_CA_CERT } from 'uiSrc/pages/home/constants'
 import { UrlHandlingActions } from 'uiSrc/slices/interfaces/urlHandling'
+import { changeSidePanel } from 'uiSrc/slices/panels/sidePanels'
+import { SidePanels } from 'uiSrc/slices/interfaces/insights'
+import { setOnboarding } from 'uiSrc/slices/app/features'
+import { ONBOARDING_FEATURES } from 'uiSrc/components/onboarding-features'
 import GlobalUrlHandler from './GlobalUrlHandler'
 
 jest.mock('uiSrc/slices/user/user-settings', () => ({
@@ -32,6 +37,11 @@ jest.mock('uiSrc/slices/app/url-handling', () => ({
   }),
 }))
 
+jest.mock('uiSrc/utils/routing', () => ({
+  ...jest.requireActual('uiSrc/slices/app/url-handling'),
+  getRedirectionPage: jest.fn().mockImplementation((page) => page),
+}))
+
 let store: typeof mockedStore
 beforeEach(() => {
   cleanup()
@@ -43,8 +53,9 @@ const fromUrl = 'redisinsight://databases/connect?redisUrl=redis://default:passw
 
 describe('GlobalUrlHandler', () => {
   beforeEach(() => {
-    reactRouterDom.useLocation = jest.fn().mockReturnValueOnce({ search: '' })
+    reactRouterDom.useLocation = jest.fn().mockReturnValue({ search: '', pathname: '' })
   })
+
   it('should render', () => {
     expect(render(<GlobalUrlHandler />)).toBeTruthy()
   })
@@ -67,6 +78,67 @@ describe('GlobalUrlHandler', () => {
     expect(replaceMock).toBeCalledWith({ search: '' })
   })
 
+  it('should call proper actions to open page', async () => {
+    const fromUrl = 'redisinsight://open?redirect=/integrate'
+
+    const pushMock = jest.fn()
+    reactRouterDom.useHistory = jest.fn().mockReturnValueOnce({ push: pushMock });
+    (userSettingsSelector as jest.Mock).mockReturnValueOnce({
+      config: {},
+      isShowConsents: false
+    });
+
+    (appRedirectionSelector as jest.Mock).mockReturnValueOnce({ fromUrl })
+
+    await act(async () => {
+      render(<GlobalUrlHandler />)
+    })
+
+    const actionUrl = new URL(fromUrl)
+    const fromParams = new URLSearchParams(actionUrl.search)
+    // @ts-ignore
+    const urlProperties = Object.fromEntries(fromParams) || {}
+
+    expect(store.getActions()).toEqual([
+      setUrlProperties(urlProperties),
+      setFromUrl(null),
+    ])
+
+    expect(pushMock).toBeCalledWith(Pages.rdi)
+  })
+
+  it('should call proper actions to open page and copilot, onboarding', async () => {
+    const fromUrl = 'redisinsight://open?redirect=/integrate&copilot=true&onboarding=true'
+
+    const pushMock = jest.fn()
+    reactRouterDom.useHistory = jest.fn().mockReturnValueOnce({ push: pushMock });
+    (userSettingsSelector as jest.Mock).mockReturnValueOnce({
+      config: {},
+      isShowConsents: false
+    });
+
+    (appRedirectionSelector as jest.Mock).mockReturnValueOnce({ fromUrl })
+
+    await act(async () => {
+      render(<GlobalUrlHandler />)
+    })
+
+    const actionUrl = new URL(fromUrl)
+    const fromParams = new URLSearchParams(actionUrl.search)
+    // @ts-ignore
+    const urlProperties = Object.fromEntries(fromParams) || {}
+
+    const onboardingTotalSteps = Object.keys(ONBOARDING_FEATURES)?.length
+    expect(store.getActions()).toEqual([
+      setUrlProperties(urlProperties),
+      setFromUrl(null),
+      changeSidePanel(SidePanels.AiAssistant),
+      setOnboarding({ currentStep: 0, totalSteps: onboardingTotalSteps })
+    ])
+
+    expect(pushMock).toBeCalledWith(Pages.rdi)
+  })
+
   it('should call proper actions only after consents popup is accepted', async () => {
     (userSettingsSelector as jest.Mock).mockReturnValueOnce({
       config: {},
diff --git a/redisinsight/ui/src/components/global-url-handler/GlobalUrlHandler.tsx b/redisinsight/ui/src/components/global-url-handler/GlobalUrlHandler.tsx
@@ -15,7 +15,11 @@ import { userSettingsSelector } from 'uiSrc/slices/user/user-settings'
 import { UrlHandlingActions } from 'uiSrc/slices/interfaces/urlHandling'
 import { autoCreateAndConnectToInstanceAction } from 'uiSrc/slices/instances/instances'
 import { getRedirectionPage } from 'uiSrc/utils/routing'
-import { Nullable, transformQueryParamsObject, parseRedisUrl } from 'uiSrc/utils'
+import { Nullable, transformQueryParamsObject, parseRedisUrl, Maybe } from 'uiSrc/utils'
+import { changeSidePanel } from 'uiSrc/slices/panels/sidePanels'
+import { SidePanels } from 'uiSrc/slices/interfaces/insights'
+import { setOnboarding } from 'uiSrc/slices/app/features'
+import { ONBOARDING_FEATURES } from 'uiSrc/components/onboarding-features'
 
 const GlobalUrlHandler = () => {
   const { fromUrl } = useSelector(appRedirectionSelector)
@@ -24,6 +28,7 @@ const GlobalUrlHandler = () => {
 
   const history = useHistory()
   const dispatch = useDispatch()
+  const location = useLocation()
 
   useEffect(() => {
     // start handling only after closing consent popup
@@ -33,21 +38,26 @@ const GlobalUrlHandler = () => {
     try {
       const actionUrl = new URL(fromUrl)
       const fromParams = new URLSearchParams(actionUrl.search)
+      const pathname = actionUrl.hostname + actionUrl.pathname
+      const action = pathname?.replace(/^(\/\/?)|\/$/g, '')
 
       // @ts-ignore
       const urlProperties = Object.fromEntries(fromParams) || {}
 
       // rename cloudBdbId to cloudId
-      urlProperties.cloudId = urlProperties.cloudBdbId
-      delete urlProperties.cloudBdbId
+      if (action === UrlHandlingActions.Connect) {
+        urlProperties.cloudId = urlProperties.cloudBdbId
+        delete urlProperties.cloudBdbId
+      }
 
       dispatch(setUrlProperties(urlProperties))
       dispatch(setFromUrl(null))
 
-      const pathname = actionUrl.hostname + actionUrl.pathname
-      if (pathname?.replace(/^(\/\/?)/g, '') === UrlHandlingActions.Connect) {
-        connectToDatabase(urlProperties)
-      }
+      const transformedProperties = transformQueryParamsObject(urlProperties)
+      handleCommonProperties(transformedProperties)
+
+      if (action === UrlHandlingActions.Connect) connectToDatabase(urlProperties)
+      if (action === UrlHandlingActions.Open) openPage(transformedProperties)
     } catch (_e) {
       //
     }
@@ -69,17 +79,21 @@ const GlobalUrlHandler = () => {
     }
   }, [search])
 
-  const onSuccessConnectToDb = (id: string, redirectPage: Nullable<string>) => {
+  const redirectToPage = (
+    id: Maybe<string>,
+    redirectPage: Nullable<string>,
+    currentPathname?: string
+  ) => {
     if (redirectPage) {
-      const pageToRedirect = getRedirectionPage(redirectPage, id)
+      const pageToRedirect = getRedirectionPage(redirectPage, id || undefined, currentPathname)
 
       if (pageToRedirect) {
         history.push(pageToRedirect)
         return
       }
     }
 
-    history.push(Pages.browser(id))
+    history.push(id ? Pages.browser(id) : Pages.home)
   }
 
   const connectToDatabase = (properties: Record<string, any>) => {
@@ -130,7 +144,7 @@ const GlobalUrlHandler = () => {
           db.cloudDetails = cloudDetails
         }
         dispatch(setUrlHandlingInitialState())
-        dispatch(autoCreateAndConnectToInstanceAction(db, (id) => onSuccessConnectToDb(id, redirect)))
+        dispatch(autoCreateAndConnectToInstanceAction(db, (id) => redirectToPage(id, redirect)))
 
         return
       }
@@ -152,6 +166,21 @@ const GlobalUrlHandler = () => {
     }
   }
 
+  const handleCommonProperties = (properties: Record<string, any>) => {
+    if (properties.copilot) {
+      dispatch(changeSidePanel(SidePanels.AiAssistant))
+    }
+
+    if (properties.onboarding) {
+      const totalSteps = Object.keys(ONBOARDING_FEATURES || {}).length
+      dispatch(setOnboarding({ currentStep: 0, totalSteps }))
+    }
+  }
+
+  const openPage = (properties: Record<string, any>) => {
+    redirectToPage(undefined, properties.redirect || '/_', location.pathname)
+  }
+
   return null
 }
 
diff --git a/redisinsight/ui/src/components/oauth/shared/oauth-agreement/OAuthAgreement.tsx b/redisinsight/ui/src/components/oauth/shared/oauth-agreement/OAuthAgreement.tsx
@@ -68,7 +68,7 @@ const OAuthAgreement = (props: Props) => {
           that Redis Insight will generate Redis Cloud API account and user keys, and store them locally on your machine
         </li>
         <li className={styles.listItem}>
-          Analytics will be enabled to aggregate anonymized user data to improve user experience. You can disable it anytime on the Settings page.
+          that usage data will be enabled to help us understand and improve how Redis Insight features are used
         </li>
       </ul>
     </div>
diff --git a/redisinsight/ui/src/pages/pub-sub/components/subscription-panel/components/patternsInfo/PatternsInfo.tsx b/redisinsight/ui/src/pages/pub-sub/components/subscription-panel/components/patternsInfo/PatternsInfo.tsx
@@ -1,7 +1,6 @@
-import { EuiText } from '@elastic/eui'
+import { EuiIcon, EuiText, EuiToolTip } from '@elastic/eui'
 import React from 'react'
 import { DEFAULT_SEARCH_MATCH } from 'uiSrc/constants/api'
-import AppendInfo from '../append-info'
 
 import styles from './styles.module.scss'
 
@@ -18,7 +17,17 @@ const PatternsInfo = ({ channels }: PatternsInfoProps) => {
   return (
     <div className={styles.patternsContainer}>
       <EuiText color="subdued" size="s" data-testid="patterns-count">Patterns:&nbsp;{getChannelsCount()} </EuiText>
-      <AppendInfo title={<>{channels?.trim().split(' ').map((ch) => <p>{ch}</p>)}</>} />
+      <EuiToolTip
+        anchorClassName={styles.appendIcon}
+        position="right"
+        title={<>{channels?.trim().split(' ').map((ch) => <p>{ch}</p>)}</>}
+      >
+        <EuiIcon
+          type="iInCircle"
+          style={{ cursor: 'pointer' }}
+          data-testid="append-info-icon"
+        />
+      </EuiToolTip>
     </div>
   )
 }
diff --git a/redisinsight/ui/src/pages/pub-sub/components/subscription-panel/components/patternsInfo/styles.module.scss b/redisinsight/ui/src/pages/pub-sub/components/subscription-panel/components/patternsInfo/styles.module.scss
@@ -2,3 +2,8 @@
   display: flex;
   align-items: center;
 }
+
+.appendIcon {
+  color: var(--iconsDefaultColor) !important;
+  margin-left: 4px;
+}
diff --git a/redisinsight/ui/src/pages/rdi/instance/components/header/RdiPipelineHeader.tsx b/redisinsight/ui/src/pages/rdi/instance/components/header/RdiPipelineHeader.tsx
diff --git a/redisinsight/ui/src/pages/rdi/instance/components/header/components/current-pipeline-status/CurrentPipelineStatus.tsx b/redisinsight/ui/src/pages/rdi/instance/components/header/components/current-pipeline-status/CurrentPipelineStatus.tsx
diff --git a/redisinsight/ui/src/slices/interfaces/urlHandling.ts b/redisinsight/ui/src/slices/interfaces/urlHandling.ts
diff --git a/redisinsight/ui/src/slices/rdi/pipeline.ts b/redisinsight/ui/src/slices/rdi/pipeline.ts
diff --git a/tests/e2e/pageObjects/components/myRedisDatabase/add-redis-database.ts b/tests/e2e/pageObjects/components/myRedisDatabase/add-redis-database.ts
diff --git a/tests/e2e/tests/web/critical-path/url-handling/url-handling.e2e.ts b/tests/e2e/tests/web/critical-path/url-handling/url-handling.e2e.ts
diff --git a/tests/e2e/tests/web/regression/database-overview/database-tls-certificates.e2e.ts b/tests/e2e/tests/web/regression/database-overview/database-tls-certificates.e2e.ts

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`set -e`
`3`	`3`
`4`	`4`	`HELP="Args:`
`5`		`--v - Semver (2.56.0)`
	`5`	`+-v - Semver (2.58.0)`
`6`	`6`	`-d - Build image repository (Ex: -d redisinsight)`
`7`	`7`	`-r - Target repository (Ex: -r redis/redisinsight)`
`8`	`8`	`"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "redisinsight-api",`
`3`		`- "version": "2.56.0",`
	`3`	`+ "version": "2.58.0",`
`4`	`4`	`"description": "Redis Insight API",`
`5`	`5`	`"private": true,`
`6`	`6`	`"author": {`