Merge pull request #2608 from RedisInsight/fe/bugfix/RI-4939_not_send_telemetry_event

#RI-4939, #RI-4934

Author: vlad-dargel

redisinsight/ui/src/components/oauth/oauth-select-plan/OAuthSelectPlan.tsx

@@ -161,12 +161,13 @@ const OAuthSelectPlan = () => {
     <EuiModal className={styles.container} onClose={handleOnClose} data-testid="oauth-select-plan-dialog">
       <EuiModalBody className={styles.modalBody}>
         <section className={styles.content}>
-          <EuiText className={styles.subTitle}>
-            Redis Enterprise Cloud
-          </EuiText>
           <EuiTitle size="s">
-            <h2 className={styles.title}>Select cloud vendor</h2>
+            <h2 className={styles.title}>Choose a cloud vendor</h2>
           </EuiTitle>
+          <EuiText className={styles.subTitle}>
+            Select a cloud vendor and region to complete the final step towards
+            your free Redis database. No credit card is required.
+          </EuiText>
           <section className={styles.providers}>
             { OAuthProviders.map(({ icon, id, label }) => (
               <div className={styles.provider} key={id}>

redisinsight/ui/src/components/oauth/oauth-select-plan/styles.module.scss

@@ -8,11 +8,11 @@
 .title {
   font-size: 28px !important;
   color: var(--htmlColor) !important;
+  padding-top: 16px;
 }
 
 .subTitle {
-  padding-top: 24px;
-  padding-bottom: 8px;
+  padding: 24px 40px 0;
   font-size: 14px !important;
 }
 

redisinsight/ui/src/components/oauth/oauth-sso-handler-dialog/OAuthSsoHandlerDialog.tsx

@@ -8,7 +8,10 @@ import { appFeatureFlagsFeaturesSelector } from 'uiSrc/slices/app/features'
 import { setSignInDialogState } from 'uiSrc/slices/oauth/cloud'
 
 export interface Props {
-  children: (ssoCloudHandlerClick: (e: React.MouseEvent, source: OAuthSocialSource) => void) => React.ReactElement
+  children: (
+    ssoCloudHandlerClick: (e: React.MouseEvent, source: OAuthSocialSource) => void,
+    isSSOEnabled: boolean,
+  ) => React.ReactElement
 }
 
 const OAuthSsoHandlerDialog = ({ children }: Props) => {
@@ -32,7 +35,7 @@ const OAuthSsoHandlerDialog = ({ children }: Props) => {
     })
   }
 
-  return children?.(ssoCloudHandlerClick)
+  return children?.(ssoCloudHandlerClick, !!feature?.flag)
 }
 
 export default OAuthSsoHandlerDialog

redisinsight/ui/src/pages/home/components/HomeHeader/HomeHeader.tsx

@@ -185,7 +185,7 @@ const HomeHeader = ({ onAddInstance, direction }: Props) => {
     const linkStyles = stylesCss ? stylesCss[theme] : {}
     const promoLink = (
       <OAuthSsoHandlerDialog>
-        {(ssoCloudHandlerClick) => (
+        {(ssoCloudHandlerClick, isSSOEnabled) => (
           <PromoLink
             title={title}
             description={description}
@@ -199,7 +199,10 @@ const HomeHeader = ({ onAddInstance, direction }: Props) => {
                 : undefined
             }}
             onClick={(e) => {
-              handleCreateDatabaseClick(HELP_LINKS.cloud.event, { source: 'My Redis databases' })
+              !isSSOEnabled && handleCreateDatabaseClick(
+                HELP_LINKS.cloud.event,
+                { source: HELP_LINKS.cloud.sources.databaseList },
+              )
               ssoCloudHandlerClick(e, OAuthSocialSource.ListOfDatabases)
             }}
           />