RI-6910: hide cloud ads based on env variable

Author: KrumTy

.env

@@ -19,5 +19,6 @@ RI_ANALYTICS_START_EVENTS=true
 RI_AGREEMENTS_PATH='../../webviews/resources/agreements-spec.json'
 RI_ENCRYPTION_KEYTAR_SERVICE="redis-for-vscode"
 RI_SOCKETS_CORS=true
+RI_FEATURES_CLOUD_ADS_DEFAULT_FLAG=true
 # RI_SEGMENT_WRITE_KEY='SEGMENT_WRITE_KEY'
 

src/webviews/src/components/no-databases/NoDatabases.tsx

@@ -4,7 +4,7 @@ import * as l10n from '@vscode/l10n'
 
 import { PromoLink } from 'uiSrc/ui'
 import { vscodeApi } from 'uiSrc/services'
-import { OAuthSocialSource, VscodeMessageAction } from 'uiSrc/constants'
+import { CLOUD_ADS, OAuthSocialSource, VscodeMessageAction } from 'uiSrc/constants'
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/utils'
 import { useAppInfoStore } from 'uiSrc/store/hooks/use-app-info-store/useAppInfoStore'
 import DockerIcon from 'uiSrc/assets/database/docker.svg?react'
@@ -64,7 +64,7 @@ export const NoDatabases: FC = () => {
         <h2 className="pb-3 text-[24px]">
           {l10n.t('Links')}
         </h2>
-        {contentCloud && (
+        {CLOUD_ADS && contentCloud && (
           <PromoLink Icon={LogoSvg} onClick={handleClickFree} {...contentCloud} />
         )}
         {contentDocker && (

src/webviews/src/constants/environment/environment.ts

@@ -4,6 +4,7 @@ import { toNumber } from 'lodash'
 export const BASE_APP_URL = import.meta.env.RI_BASE_APP_URL || 'http://localhost'
 export const APP_PORT = toNumber(window.ri?.appPort) || import.meta.env.RI_APP_PORT || 5541
 export const APP_PREFIX = import.meta.env.RI_APP_PREFIX || 'api'
+export const CLOUD_ADS = import.meta.env.RI_FEATURES_CLOUD_ADS_DEFAULT_FLAG !== 'false'
 
 const isDevelopment = import.meta.env.NODE_ENV === 'development'
 const hostedApiBaseUrl = import.meta.env.RI_HOSTED_API_BASE_URL

src/webviews/src/constants/window/helpTexts.tsx

@@ -4,7 +4,7 @@ import * as l10n from '@vscode/l10n'
 import { Link } from 'react-router-dom'
 
 import { getUtmExternalLink } from 'uiSrc/utils'
-import { EXTERNAL_LINKS, UTM_CAMPAIGNS } from 'uiSrc/constants'
+import { CLOUD_ADS, EXTERNAL_LINKS, UTM_CAMPAIGNS } from 'uiSrc/constants'
 import styles from 'uiSrc/components/popover-delete/styles.module.scss'
 
 export const helpTexts = {
@@ -23,16 +23,20 @@ export const helpTexts = {
       >
         {l10n.t('here. ')}
       </Link>
-      {l10n.t('You can also create a ')}
-      <Link
-        onClick={onFreeTrialDbClick}
-        className="underline hover:no-underline"
-        data-testid="no-json-module-create-free-db"
-        to=""
+      {CLOUD_ADS && (
+        <>
+          {l10n.t('You can also create a ')}
+          <Link
+            onClick={onFreeTrialDbClick}
+            className="underline hover:no-underline"
+            data-testid="no-json-module-create-free-db"
+            to=""
       >
-        {l10n.t('free trial Redis Cloud database')}
-      </Link>
-      {l10n.t(' with built-in JSON support.')}
+            {l10n.t('free trial Redis Cloud database')}
+          </Link>
+          {l10n.t(' with built-in JSON support.')}
+        </>
+      )}
     </>
   ),
   REMOVE_LAST_ELEMENT: (fieldType: string) => (

src/webviews/src/modules/oauth/oauth-create-free-db/OAuthCreateFreeDb.tsx

@@ -5,7 +5,7 @@ import { VscChevronRight, VscCloud } from 'react-icons/vsc'
 
 import { RiButton } from 'uiSrc/ui'
 import { useOAuthStore } from 'uiSrc/store'
-import { OAuthSocialAction, OAuthSocialSource, VscodeMessageAction } from 'uiSrc/constants'
+import { CLOUD_ADS, OAuthSocialAction, OAuthSocialSource, VscodeMessageAction } from 'uiSrc/constants'
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/utils'
 import { vscodeApi } from 'uiSrc/services'
 import styles from './styles.module.scss'
@@ -47,6 +47,10 @@ const OAuthCreateFreeDb = ({ source, compressed }: Props) => {
     ? l10n.t('Includes native support for JSON, Query and Search and more.')
     : l10n.t('Get free trial Redis Cloud database')
 
+  if (!CLOUD_ADS) {
+    return null
+  }
+
   return (
     <>
       {!compressed && <h2 className="pt-8 text-[16px]">{l10n.t('Create free trial Redis Cloud database')}</h2>}

src/webviews/src/pages/WelcomePage/WelcomePage.tsx

@@ -5,7 +5,7 @@ import { VscAdd } from 'react-icons/vsc'
 import { Link, PromoLink, Separator, Spacer } from 'uiSrc/ui'
 import { vscodeApi } from 'uiSrc/services'
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/utils'
-import { OAuthSocialSource, VscodeMessageAction } from 'uiSrc/constants'
+import { CLOUD_ADS, OAuthSocialSource, VscodeMessageAction } from 'uiSrc/constants'
 import { useAppInfoStore } from 'uiSrc/store/hooks/use-app-info-store/useAppInfoStore'
 import DockerIcon from 'uiSrc/assets/database/docker.svg?react'
 import GithubIcon from 'uiSrc/assets/database/github.svg?react'
@@ -69,7 +69,7 @@ export const WelcomePage: FC = () => {
               <Spacer size="xl" />
 
               <h3>{l10n.t('Create new database')}</h3>
-              {contentCloud && (
+              {CLOUD_ADS && contentCloud && (
                 <PromoLink Icon={ShortLogoSvg} onClick={handleClickFree} {...contentCloud} />
               )}
               {contentDocker && (