RI-6910: disable cloud ads based on flag

Author: KrumTy

src/webviews/src/actions/oauthCallback.ts

@@ -1,5 +1,5 @@
 import { INFINITE_MESSAGES } from 'uiSrc/components'
-import { CloudAuthStatus, CloudJobName, CloudJobStep, OAuthSocialAction, StorageItem } from 'uiSrc/constants'
+import { CLOUD_ADS, CloudAuthStatus, CloudJobName, CloudJobStep, OAuthSocialAction, StorageItem } from 'uiSrc/constants'
 import { CustomError } from 'uiSrc/interfaces'
 import { CloudAuthResponse } from 'uiSrc/modules/oauth/interfaces'
 import { localStorageService } from 'uiSrc/services'
@@ -9,6 +9,10 @@ import { getApiErrorMessage, parseCustomError, removeInfinityToast, showErrorInf
 let isFlowInProgress = false
 
 export const processOauthCallback = ({ status, message = '', error }: CloudAuthResponse) => {
+  if (!CLOUD_ADS) {
+    return
+  }
+
   const {
     ssoFlow,
     isRecommendedSettings,

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 { CLOUD_ADS, OAuthSocialAction, OAuthSocialSource, VscodeMessageAction } from 'uiSrc/constants'
+import { OAuthSocialAction, OAuthSocialSource, VscodeMessageAction } from 'uiSrc/constants'
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/utils'
 import { vscodeApi } from 'uiSrc/services'
 import styles from './styles.module.scss'
@@ -47,10 +47,6 @@ 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/AddDatabasePage/AddDatabasePage.tsx

@@ -2,7 +2,7 @@ import { VSCodeDivider } from '@vscode/webview-ui-toolkit/react'
 import React, { FC, useEffect } from 'react'
 import * as l10n from '@vscode/l10n'
 
-import { OAuthSocialSource } from 'uiSrc/constants'
+import { CLOUD_ADS, OAuthSocialSource } from 'uiSrc/constants'
 import { CommonAppSubscription, DatabasePanel } from 'uiSrc/modules'
 import { OAuthCreateFreeDb, OAuthSsoDialog, OAuthJobs, OAuthSelectPlan } from 'uiSrc/modules/oauth'
 import { fetchCerts } from 'uiSrc/store'
@@ -22,13 +22,17 @@ export const AddDatabasePage: FC<any> = () => {
         {l10n.t('Add Redis database')}
       </h1>
       <VSCodeDivider className="divider" />
-      <OAuthJobs />
-      <CommonAppSubscription />
-      <OAuthSsoDialog />
-      <OAuthCreateFreeDb source={OAuthSocialSource.AddDbForm} />
-      <VSCodeDivider className="divider" />
+      {CLOUD_ADS && (
+        <>
+          <OAuthJobs />
+          <CommonAppSubscription />
+          <OAuthSsoDialog />
+          <OAuthCreateFreeDb source={OAuthSocialSource.AddDbForm} />
+          <OAuthSelectPlan />
+          <VSCodeDivider className="divider" />
+        </>
+      )}
       <DatabasePanel />
-      <OAuthSelectPlan />
     </div>
   )
 }

src/webviews/src/pages/AddKeyPage/AddKeyPage.tsx

@@ -1,4 +1,5 @@
 import React, { FC } from 'react'
+import { CLOUD_ADS } from 'uiSrc/constants'
 import { AddKey } from 'uiSrc/modules'
 import { KeysStoreProvider } from 'uiSrc/modules/keys-tree/hooks/useKeys'
 import { OAuthSsoDialog } from 'uiSrc/modules/oauth'
@@ -9,7 +10,7 @@ export const AddKeyPage: FC<any> = () => (
     <ContextStoreProvider>
       <KeysStoreProvider>
         <AddKey />
-        <OAuthSsoDialog />
+        {CLOUD_ADS && <OAuthSsoDialog />}
       </KeysStoreProvider>
     </ContextStoreProvider>
   </div>

src/webviews/src/pages/SidebarPage/SidebarPage.tsx

@@ -5,7 +5,7 @@ import { DatabaseWrapper } from 'uiSrc/modules'
 import { useDatabasesStore } from 'uiSrc/store'
 import { useAppInfoStore } from 'uiSrc/store/hooks/use-app-info-store/useAppInfoStore'
 import { OAuthCreateFreeDb } from 'uiSrc/modules/oauth'
-import { OAuthSocialSource } from 'uiSrc/constants'
+import { CLOUD_ADS, OAuthSocialSource } from 'uiSrc/constants'
 
 export const SidebarPage: FC<any> = () => {
   const databases = useDatabasesStore((state) => state.data)
@@ -20,7 +20,7 @@ export const SidebarPage: FC<any> = () => {
 
   return (
     <div className="flex w-full flex-wrap flex-col min-h-full text-vscode-icon-foreground" data-testid="tree-view-page">
-      <OAuthCreateFreeDb compressed source={OAuthSocialSource.DatabasesList} />
+      {CLOUD_ADS && <OAuthCreateFreeDb compressed source={OAuthSocialSource.DatabasesList} />}
       {databases.map((database) => (
         <DatabaseWrapper database={database} key={database.id} />
       ))}