RI-7660: exclude "trial" messages from "free Redis Cloud database"

l10n/bundle.l10n.json

@@ -39,23 +39,23 @@
   "Structured querying and full-text search": "Structured querying and full-text search",
   "Native support for JSON": "Native support for JSON",
   "Scalable and fully managed": "Scalable and fully managed",
-  "Free trial database to get started immediately": "Free trial database to get started immediately",
+  "Free Redis Cloud database to get started immediately": "Free Redis Cloud database to get started immediately",
   "Cloud": "Cloud",
   "Get started with": "Get started with",
-  "Free Trial Cloud database": "Free Trial Cloud database",
+  "Free Redis Cloud database": "Free Redis Cloud database",
   "Get your": "Get your",
   "The database will be created automatically and can be changed from Redis Cloud.": "The database will be created automatically and can be changed from Redis Cloud.",
   "Create": "Create",
   "Choose a cloud vendor": "Choose a cloud vendor",
-  "Select a cloud vendor and region to complete the final step towards your free trial Redis database.": "Select a cloud vendor and region to complete the final step towards your free trial Redis database.",
+  "Select a cloud vendor and region to complete the final step towards your free Redis Cloud database.": "Select a cloud vendor and region to complete the final step towards your free Redis Cloud database.",
   "No credit card is required.": "No credit card is required.",
   "Region": "Region",
   "No regions available, try another vendor.": "No regions available, try another vendor.",
   "Cancel": "Cancel",
   "Create database": "Create database",
   "Includes native support for JSON, Query and Search and more.": "Includes native support for JSON, Query and Search and more.",
-  "Get free trial Redis Cloud database": "Get free trial Redis Cloud database",
-  "Create free trial Redis Cloud database": "Create free trial Redis Cloud database",
+  "Get free Redis Cloud database": "Get free Redis Cloud database",
+  "Create free Redis Cloud database": "Create free Redis Cloud database",
   "Try Redis Cloud database: your ultimate Redis starting point": "Try Redis Cloud database: your ultimate Redis starting point",
   "key(s)": "key(s)",
   "({0}{1} Scanned)": "({0}{1} Scanned)",
@@ -146,11 +146,11 @@
   "This database does not support the JSON data structure. Learn more about JSON support ": "This database does not support the JSON data structure. Learn more about JSON support ",
   "here. ": "here. ",
   "You can also create a ": "You can also create a ",
-  "free trial Redis Cloud database": "free trial Redis Cloud database",
+  "free Redis Cloud database": "free Redis Cloud database",
   " with built-in JSON support.": " with built-in JSON support.",
   "If you remove the single {0}, the whole Key will be deleted.": "If you remove the single {0}, the whole Key will be deleted.",
   "Removing multiple elements is available for Redis databases v. 6.2 or later. Update your Redis database or create a new ": "Removing multiple elements is available for Redis databases v. 6.2 or later. Update your Redis database or create a new ",
-  "free up-to-date trial": "free up-to-date trial",
+  "free up-to-date": "free up-to-date",
   " Redis database.": " Redis database.",
   "Database has been added": "Database has been added",
   " has been added to Redis for VS Code.": " has been added to Redis for VS Code.",
@@ -298,19 +298,19 @@
   "This may take several seconds, but it is totally worth it!": "This may take several seconds, but it is totally worth it!",
   "Processing Cloud API keys…": "Processing Cloud API keys…",
   "Processing Cloud subscriptions…": "Processing Cloud subscriptions…",
-  "Creating a free trial Cloud database…": "Creating a free trial Cloud database…",
-  "Importing a free trial Cloud database…": "Importing a free trial Cloud database…",
+  "Creating a free Redis Cloud database…": "Creating a free Redis Cloud database…",
+  "Importing a free Redis Cloud database…": "Importing a free Redis Cloud database…",
   "This may take several minutes, but it is totally worth it!": "This may take several minutes, but it is totally worth it!",
-  "You can now use your Redis Stack database in Redis Cloud": "You can now use your Redis Stack database in Redis Cloud",
+  "You can now use your Redis Cloud database in Redis Cloud": "You can now use your Redis Cloud database in Redis Cloud",
   " with pre-loaded sample data": " with pre-loaded sample data",
   "Congratulations!": "Congratulations!",
   "Notice: ": "Notice: ",
   "the database will be deleted after 15 days of inactivity.": "the database will be deleted after 15 days of inactivity.",
   "You already have a free Redis Cloud subscription.": "You already have a free Redis Cloud subscription.",
   "Do you want to import your existing database into Redis Insight?": "Do you want to import your existing database into Redis Insight?",
   "Import": "Import",
-  "Your subscription does not have a free trial Redis Cloud database.": "Your subscription does not have a free trial Redis Cloud database.",
-  "Do you want to create a free trial database in your existing subscription?": "Do you want to create a free trial database in your existing subscription?",
+  "Your subscription does not have a free Redis Cloud database.": "Your subscription does not have a free Redis Cloud database.",
+  "Do you want to create a free database in your existing subscription?": "Do you want to create a free database in your existing subscription?",
   "Keys are the foundation of Redis.": "Keys are the foundation of Redis.",
   "Add key": "Add key",
   "No results found.": "No results found.",
@@ -373,4 +373,4 @@
   "Add": "Add",
   "Release Notes": "Release Notes",
   "Redis for VS Code extension updated to {0}.": "Redis for VS Code extension updated to {0}."
-}
+}

scripts/downloadBackend.ts

@@ -17,6 +17,8 @@ const cdnPath = process.env.RI_CDN_PATH
 const backendPath = path.join(__dirname, '..', 'dist', 'redis-backend')
 const tutorialsPath = path.join(backendPath, 'dist-minified', 'defaults', 'tutorials')
 
+console.log('+++paths', cdnPath, backendPath, tutorialsPath)
+
 const downloadBackend = async () => {
   if (fs.existsSync(backendPath)) {
     console.debug('Backend folder already exists, deleting...')
@@ -59,6 +61,7 @@ async function downloadRedisBackendArchive(
 ): Promise<string> {
   ensureFolderExists(destDir)
   let downloadUrl = getDownloadUrl()
+  console.log('+++downloadUrl', downloadUrl)
 
   return new Promise((resolve, reject) => {
     const requestOptions: https.RequestOptions = parseUrl(downloadUrl)

src/webviews/src/components/notifications/infinite-messages/InfiniteMessages.tsx

@@ -52,8 +52,8 @@ export const INFINITE_MESSAGES = {
           <span className="text-[15px]">
             { (step === CloudJobStep.Credentials || !step) && l10n.t('Processing Cloud API keys…')}
             { step === CloudJobStep.Subscription && l10n.t('Processing Cloud subscriptions…')}
-            { step === CloudJobStep.Database && l10n.t('Creating a free trial Cloud database…')}
-            { step === CloudJobStep.Import && l10n.t('Importing a free trial Cloud database…')}
+            { step === CloudJobStep.Database && l10n.t('Creating a free Redis Cloud database…')}
+            { step === CloudJobStep.Import && l10n.t('Importing a free Redis Cloud database…')}
           </span>
           <Spacer size="m" />
           <div>
@@ -69,7 +69,7 @@ export const INFINITE_MESSAGES = {
   SUCCESS_CREATE_DB: (jobName: Maybe<CloudJobName>, onSuccess?: () => void) => {
     const withFeed = jobName
       && [CloudJobName.CreateFreeDatabase, CloudJobName.CreateFreeSubscriptionAndDatabase].includes(jobName)
-    const text = `${l10n.t('You can now use your Redis Stack database in Redis Cloud')}${withFeed ? l10n.t(' with pre-loaded sample data') : ''}.`
+    const text = `${l10n.t('You can now use your Redis Cloud database in Redis Cloud')}${withFeed ? l10n.t(' with pre-loaded sample data') : ''}.`
     return ({
       id: InfiniteMessagesIds.oAuthSuccess,
       Inner: (
@@ -158,10 +158,10 @@ export const INFINITE_MESSAGES = {
       >
         <Spinner type="clip" size="20px" className="min-w-5" />
         <div className="ml-2">
-          <div className="text-[15px]">{l10n.t('Your subscription does not have a free trial Redis Cloud database.')}</div>
+          <div className="text-[15px]">{l10n.t('Your subscription does not have a free Redis Cloud database.')}</div>
           <Spacer size="s" />
           <div>
-            {l10n.t('Do you want to create a free trial database in your existing subscription?')}
+            {l10n.t('Do you want to create a free database in your existing subscription?')}
           </div>
           <Spacer size="m" />
           <div className="flex justify-between">

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

@@ -32,7 +32,7 @@ export const helpTexts = {
             data-testid="no-json-module-create-free-db"
             to=""
           >
-            {l10n.t('free trial Redis Cloud database')}
+            {l10n.t('free Redis Cloud database')}
           </Link>
           {l10n.t(' with built-in JSON support.')}
         </>
@@ -63,7 +63,7 @@ export const helpTexts = {
         target="_blank"
         data-test-subj="no-json-module-try-free"
       >
-        {l10n.t('free up-to-date trial')}
+        {l10n.t('free up-to-date')}
       </Link>
       {l10n.t(' Redis database.')}
     </>

src/webviews/src/modules/add-key/components/AddKeyReJSON/AddKeyReJSON.spec.tsx

@@ -95,7 +95,7 @@ describe('AddKeyReJSON', () => {
     expect(queryByTestId(textId)).toBeInTheDocument()
   })
 
-  it('should open sso oauth dialog when free trial redis cloud database link clicked', () => {
+  it('should open sso oauth dialog when free redis cloud database link clicked', () => {
     useDatabasesStore.setState({
       ...customState,
       connectedDatabase: {

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

@@ -45,11 +45,11 @@ const OAuthCreateFreeDb = ({ source, compressed }: Props) => {
 
   const description = !compressed
     ? l10n.t('Includes native support for JSON, Query and Search and more.')
-    : l10n.t('Get free trial Redis Cloud database')
+    : l10n.t('Get free Redis Cloud database')
 
   return (
     <>
-      {!compressed && <h2 className="pt-8 text-[16px]">{l10n.t('Create free trial Redis Cloud database')}</h2>}
+      {!compressed && <h2 className="pt-8 text-[16px]">{l10n.t('Create free Redis Cloud database')}</h2>}
       <RiButton
         className={cx(styles.link, { [styles.compressed]: compressed })}
         onClick={handleClick}

src/webviews/src/modules/oauth/oauth-select-plan/OAuthSelectPlan.tsx

@@ -152,7 +152,7 @@ const OAuthSelectPlan = () => {
 
         <div className={styles.subTitle}>
           {l10n.t(
-            'Select a cloud vendor and region to complete the final step towards your free trial Redis database.',
+            'Select a cloud vendor and region to complete the final step towards your free Redis Cloud database.',
           )}
           &nbsp;
           {l10n.t(

src/webviews/src/modules/oauth/oauth-sso/oauth-create-db/OAuthCreateDb.tsx

@@ -95,7 +95,7 @@ const OAuthCreateDb = (props: Props) => {
             {(form: React.ReactNode) => (
               <>
                 <div className={styles.subTitle}>{l10n.t('Get started with')}</div>
-                <div className={styles.title}><h2>{l10n.t('Free Trial Cloud database')}</h2></div>
+                <div className={styles.title}><h2>{l10n.t('Free Redis Cloud database')}</h2></div>
                 {form}
                 <div>
                   <OAuthRecommendedSettings value={isRecommended} onChange={handleChangeRecommendedSettings} />
@@ -107,7 +107,7 @@ const OAuthCreateDb = (props: Props) => {
         ) : (
           <>
             <div className={styles.subTitle}>{l10n.t('Get your')}</div>
-            <div className={styles.title}><h2>{l10n.t('Free Trial Cloud database')}</h2></div>
+            <div className={styles.title}><h2>{l10n.t('Free Redis Cloud database')}</h2></div>
             <Spacer size="xl" />
             <div >
               {l10n.t('The database will be created automatically and can be changed from Redis Cloud.')}

src/webviews/src/modules/oauth/shared/oauth-advantages/constants.ts

@@ -11,6 +11,6 @@ export const OAUTH_ADVANTAGES_ITEMS = [
     title: l10n.t('Scalable and fully managed'),
   },
   {
-    title: l10n.t('Free trial database to get started immediately'),
+    title: l10n.t('Free Redis Cloud database to get started immediately'),
   },
 ]

src/webviews/src/utils/core/errors.tsx

@@ -177,7 +177,7 @@ export const parseCustomError = (err: CustomError | string = DEFAULT_ERROR_MESSA
       title = 'Database already exists'
       message = (
         <>
-          You already have a free trial Redis Cloud database running.
+          You already have a free Redis Cloud database running.
           <Spacer size="s" />
           Check out your
           <a