Merge pull request #3831 from RedisInsight/fe/feature/RI-6098_Change_Redis_Cloud_domain

#RI-6098 - Change the Redis Cloud domain to cloud.redis.io

Author: mariasergeenko

package.json

@@ -96,7 +96,6 @@
     "@testing-library/user-event": "^14.4.3",
     "@types/classnames": "^2.2.11",
     "@types/d3": "^7.4.0",
-    "@types/date-fns": "^2.6.0",
     "@types/detect-port": "^1.3.0",
     "@types/electron-store": "^3.2.0",
     "@types/express": "^4.17.3",
@@ -130,7 +129,7 @@
     "@vitejs/plugin-react": "^4.2.1",
     "@vitejs/plugin-react-swc": "^3.6.0",
     "assert": "^2.1.0",
-    "concurrently": "^5.3.0",
+    "concurrently": "^9.0.1",
     "construct-style-sheets-polyfill": "^3.1.0",
     "copyfiles": "^2.4.1",
     "core-js": "^3.6.5",

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://app.redislabs.com',
+    querySocketUrl: process.env.RI_AI_QUERY_SOCKET_URL || 'https://cloud.redis.io',
     querySocketPath: process.env.RI_AI_QUERY_SOCKET_PATH || '/api/v1/cloud-copilot-service/socket.io/',
   },
 };

redisinsight/ui/src/components/notifications/components/infinite-messages/InfiniteMessages.tsx

@@ -20,6 +20,8 @@ import { OAuthProviders } from 'uiSrc/components/oauth/oauth-select-plan/constan
 import { CloudSuccessResult } from 'uiSrc/slices/interfaces'
 
 import { Maybe } from 'uiSrc/utils'
+import { getUtmExternalLink } from 'uiSrc/utils/links'
+import { EXTERNAL_LINKS, UTM_CAMPAINGS, UTM_MEDIUMS } from 'uiSrc/constants/links'
 import styles from './styles.module.scss'
 
 export enum InfiniteMessagesIds {
@@ -32,8 +34,10 @@ export enum InfiniteMessagesIds {
   pipelineDeploySuccess = 'pipelineDeploySuccess'
 }
 
-// TODO: after merge insights - remove and change to function
-const MANAGE_DB_LINK = 'https://app.redislabs.com/#/databases/?utm_source=redisinsight&utm_medium=main&utm_campaign=main'
+const MANAGE_DB_LINK = getUtmExternalLink(
+  EXTERNAL_LINKS.cloudConsole,
+  { campaign: UTM_CAMPAINGS.Main, medium: UTM_MEDIUMS.Main }
+)
 
 export const INFINITE_MESSAGES = {
   AUTHENTICATING: () => ({

redisinsight/ui/src/constants/links.ts

@@ -9,7 +9,7 @@ export const EXTERNAL_LINKS = {
   recommendationFeedback: 'https://github.com/RedisInsight/RedisInsight/issues/new/choose',
   guidesRepo: 'https://github.com/RedisInsight/Tutorials',
   redisStack: 'https://redis.io/docs/latest/operate/oss_and_stack/install/install-stack/',
-  cloudConsole: 'https://app.redislabs.com/#/databases',
+  cloudConsole: 'https://cloud.redis.io/#/databases/',
   tryFree: 'https://redis.io/try-free',
   docker: 'https://redis.io/docs/install/install-stack/docker',
   rdiQuickStart: 'https://redis.io/docs/latest/integrate/redis-data-integration/ingest/quick-start-guide/',
@@ -23,10 +23,12 @@ export const UTM_CAMPAINGS: Record<any, string> = {
   [OAuthSocialSource.Workbench]: 'redisinsight_workbench',
   [CloudSsoUtmCampaign.BrowserFilter]: 'browser_filter',
   [OAuthSocialSource.EmptyDatabasesList]: 'empty_db_list',
+  Main: 'main',
 }
 
 export const UTM_MEDIUMS = {
   App: 'app',
+  Main: 'main',
   Rdi: 'rdi',
   Recommendation: 'recommendation',
 }

redisinsight/ui/src/utils/errors.tsx

@@ -5,7 +5,8 @@ import { EuiSpacer } from '@elastic/eui'
 import { CustomErrorCodes } from 'uiSrc/constants'
 import { DEFAULT_ERROR_MESSAGE } from 'uiSrc/utils'
 import { CustomError } from 'uiSrc/slices/interfaces'
-import { EXTERNAL_LINKS } from 'uiSrc/constants/links'
+import { EXTERNAL_LINKS, UTM_CAMPAINGS, UTM_MEDIUMS } from 'uiSrc/constants/links'
+import { getUtmExternalLink } from './links'
 
 export const getRdiValidationMessage = (message: string = '', loc?: Array<string | number>): string => {
   // first item is always "body"
@@ -178,7 +179,18 @@ export const parseCustomError = (err: CustomError | string = DEFAULT_ERROR_MESSA
         <>
           You already have a free Redis Cloud database running.
           <EuiSpacer size="s" />
-          Check out your <a href="https://app.redislabs.com/#/databases/?utm_source=redisinsight&utm_medium=main&utm_campaign=main" target="_blank" rel="noreferrer">Cloud console</a> for connection details.
+          Check out your
+          <a
+            href={getUtmExternalLink(
+              EXTERNAL_LINKS.cloudConsole,
+              { campaign: UTM_CAMPAINGS.Main, medium: UTM_MEDIUMS.Main }
+            )}
+            target="_blank"
+            rel="noreferrer"
+          >
+            {' Cloud console '}
+          </a>
+          for connection details.
         </>
       )
       break

redisinsight/ui/src/utils/tests/errors.spec.tsx

@@ -147,7 +147,7 @@ const parseCustomErrorTests = [
         <>
           You already have a free Redis Cloud database running.
           <EuiSpacer size="s" />
-          Check out your <a href="https://app.redislabs.com/#/databases/?utm_source=redisinsight&utm_medium=main&utm_campaign=main" target="_blank" rel="noreferrer">Cloud console</a> for connection details.
+          Check out your<a href="https://cloud.redis.io/?utm_source=redisinsight&utm_medium=main&utm_campaign=main#/databases/" target="_blank" rel="noreferrer"> Cloud console </a>for connection details.
         </>
       )
     })],