Skip to content

Commit 6a35ef5

Browse files
KrumTyKrumTy
committed
RI-7660: exclude "trial" messages from "free Redis Cloud database"
1 parent c0a42de commit 6a35ef5

File tree

10 files changed

+29
-26
lines changed

10 files changed

+29
-26
lines changed

‎l10n/bundle.l10n.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,23 @@
3939
"Structured querying and full-text search": "Structured querying and full-text search",
4040
"Native support for JSON": "Native support for JSON",
4141
"Scalable and fully managed": "Scalable and fully managed",
42-
"Free trial database to get started immediately": "Free trial database to get started immediately",
42+
"Free Redis Cloud database to get started immediately": "Free Redis Cloud database to get started immediately",
4343
"Cloud": "Cloud",
4444
"Get started with": "Get started with",
45-
"Free Trial Cloud database": "Free Trial Cloud database",
45+
"Free Redis Cloud database": "Free Redis Cloud database",
4646
"Get your": "Get your",
4747
"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.",
4848
"Create": "Create",
4949
"Choose a cloud vendor": "Choose a cloud vendor",
50-
"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.",
50+
"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.",
5151
"No credit card is required.": "No credit card is required.",
5252
"Region": "Region",
5353
"No regions available, try another vendor.": "No regions available, try another vendor.",
5454
"Cancel": "Cancel",
5555
"Create database": "Create database",
5656
"Includes native support for JSON, Query and Search and more.": "Includes native support for JSON, Query and Search and more.",
57-
"Get free trial Redis Cloud database": "Get free trial Redis Cloud database",
58-
"Create free trial Redis Cloud database": "Create free trial Redis Cloud database",
57+
"Get free Redis Cloud database": "Get free Redis Cloud database",
58+
"Create free Redis Cloud database": "Create free Redis Cloud database",
5959
"Try Redis Cloud database: your ultimate Redis starting point": "Try Redis Cloud database: your ultimate Redis starting point",
6060
"key(s)": "key(s)",
6161
"({0}{1} Scanned)": "({0}{1} Scanned)",
@@ -146,11 +146,11 @@
146146
"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 ",
147147
"here. ": "here. ",
148148
"You can also create a ": "You can also create a ",
149-
"free trial Redis Cloud database": "free trial Redis Cloud database",
149+
"free Redis Cloud database": "free Redis Cloud database",
150150
" with built-in JSON support.": " with built-in JSON support.",
151151
"If you remove the single {0}, the whole Key will be deleted.": "If you remove the single {0}, the whole Key will be deleted.",
152152
"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 ",
153-
"free up-to-date trial": "free up-to-date trial",
153+
"free up-to-date": "free up-to-date",
154154
" Redis database.": " Redis database.",
155155
"Database has been added": "Database has been added",
156156
" has been added to Redis for VS Code.": " has been added to Redis for VS Code.",
@@ -298,8 +298,8 @@
298298
"This may take several seconds, but it is totally worth it!": "This may take several seconds, but it is totally worth it!",
299299
"Processing Cloud API keys…": "Processing Cloud API keys…",
300300
"Processing Cloud subscriptions…": "Processing Cloud subscriptions…",
301-
"Creating a free trial Cloud database…": "Creating a free trial Cloud database…",
302-
"Importing a free trial Cloud database…": "Importing a free trial Cloud database…",
301+
"Creating a free Redis Cloud database…": "Creating a free Redis Cloud database…",
302+
"Importing a free Redis Cloud database…": "Importing a free Redis Cloud database…",
303303
"This may take several minutes, but it is totally worth it!": "This may take several minutes, but it is totally worth it!",
304304
"You can now use your Redis Stack database in Redis Cloud": "You can now use your Redis Stack database in Redis Cloud",
305305
" with pre-loaded sample data": " with pre-loaded sample data",
@@ -309,8 +309,8 @@
309309
"You already have a free Redis Cloud subscription.": "You already have a free Redis Cloud subscription.",
310310
"Do you want to import your existing database into Redis Insight?": "Do you want to import your existing database into Redis Insight?",
311311
"Import": "Import",
312-
"Your subscription does not have a free trial Redis Cloud database.": "Your subscription does not have a free trial Redis Cloud database.",
313-
"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?",
312+
"Your subscription does not have a free Redis Cloud database.": "Your subscription does not have a free Redis Cloud database.",
313+
"Do you want to create a free database in your existing subscription?": "Do you want to create a free database in your existing subscription?",
314314
"Keys are the foundation of Redis.": "Keys are the foundation of Redis.",
315315
"Add key": "Add key",
316316
"No results found.": "No results found.",
@@ -373,4 +373,4 @@
373373
"Add": "Add",
374374
"Release Notes": "Release Notes",
375375
"Redis for VS Code extension updated to {0}.": "Redis for VS Code extension updated to {0}."
376-
}
376+
}

‎scripts/downloadBackend.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ const cdnPath = process.env.RI_CDN_PATH
1717
const backendPath = path.join(__dirname, '..', 'dist', 'redis-backend')
1818
const tutorialsPath = path.join(backendPath, 'dist-minified', 'defaults', 'tutorials')
1919

20+
console.log('+++paths', cdnPath, backendPath, tutorialsPath)
21+
2022
const downloadBackend = async () => {
2123
if (fs.existsSync(backendPath)) {
2224
console.debug('Backend folder already exists, deleting...')
@@ -59,6 +61,7 @@ async function downloadRedisBackendArchive(
5961
): Promise<string> {
6062
ensureFolderExists(destDir)
6163
let downloadUrl = getDownloadUrl()
64+
console.log('+++downloadUrl', downloadUrl)
6265

6366
return new Promise((resolve, reject) => {
6467
const requestOptions: https.RequestOptions = parseUrl(downloadUrl)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ export const INFINITE_MESSAGES = {
5252
<span className="text-[15px]">
5353
{ (step === CloudJobStep.Credentials || !step) && l10n.t('Processing Cloud API keys…')}
5454
{ step === CloudJobStep.Subscription && l10n.t('Processing Cloud subscriptions…')}
55-
{ step === CloudJobStep.Database && l10n.t('Creating a free trial Cloud database…')}
56-
{ step === CloudJobStep.Import && l10n.t('Importing a free trial Cloud database…')}
55+
{ step === CloudJobStep.Database && l10n.t('Creating a free Redis Cloud database…')}
56+
{ step === CloudJobStep.Import && l10n.t('Importing a free Redis Cloud database…')}
5757
</span>
5858
<Spacer size="m" />
5959
<div>
@@ -158,10 +158,10 @@ export const INFINITE_MESSAGES = {
158158
>
159159
<Spinner type="clip" size="20px" className="min-w-5" />
160160
<div className="ml-2">
161-
<div className="text-[15px]">{l10n.t('Your subscription does not have a free trial Redis Cloud database.')}</div>
161+
<div className="text-[15px]">{l10n.t('Your subscription does not have a free Redis Cloud database.')}</div>
162162
<Spacer size="s" />
163163
<div>
164-
{l10n.t('Do you want to create a free trial database in your existing subscription?')}
164+
{l10n.t('Do you want to create a free database in your existing subscription?')}
165165
</div>
166166
<Spacer size="m" />
167167
<div className="flex justify-between">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export const helpTexts = {
3232
data-testid="no-json-module-create-free-db"
3333
to=""
3434
>
35-
{l10n.t('free trial Redis Cloud database')}
35+
{l10n.t('free Redis Cloud database')}
3636
</Link>
3737
{l10n.t(' with built-in JSON support.')}
3838
</>
@@ -63,7 +63,7 @@ export const helpTexts = {
6363
target="_blank"
6464
data-test-subj="no-json-module-try-free"
6565
>
66-
{l10n.t('free up-to-date trial')}
66+
{l10n.t('free up-to-date')}
6767
</Link>
6868
{l10n.t(' Redis database.')}
6969
</>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ describe('AddKeyReJSON', () => {
9595
expect(queryByTestId(textId)).toBeInTheDocument()
9696
})
9797

98-
it('should open sso oauth dialog when free trial redis cloud database link clicked', () => {
98+
it('should open sso oauth dialog when free redis cloud database link clicked', () => {
9999
useDatabasesStore.setState({
100100
...customState,
101101
connectedDatabase: {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ const OAuthCreateFreeDb = ({ source, compressed }: Props) => {
4545

4646
const description = !compressed
4747
? l10n.t('Includes native support for JSON, Query and Search and more.')
48-
: l10n.t('Get free trial Redis Cloud database')
48+
: l10n.t('Get free Redis Cloud database')
4949

5050
return (
5151
<>
52-
{!compressed && <h2 className="pt-8 text-[16px]">{l10n.t('Create free trial Redis Cloud database')}</h2>}
52+
{!compressed && <h2 className="pt-8 text-[16px]">{l10n.t('Create free Redis Cloud database')}</h2>}
5353
<RiButton
5454
className={cx(styles.link, { [styles.compressed]: compressed })}
5555
onClick={handleClick}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ const OAuthSelectPlan = () => {
152152

153153
<div className={styles.subTitle}>
154154
{l10n.t(
155-
'Select a cloud vendor and region to complete the final step towards your free trial Redis database.',
155+
'Select a cloud vendor and region to complete the final step towards your free Redis Cloud database.',
156156
)}
157157
&nbsp;
158158
{l10n.t(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ const OAuthCreateDb = (props: Props) => {
9595
{(form: React.ReactNode) => (
9696
<>
9797
<div className={styles.subTitle}>{l10n.t('Get started with')}</div>
98-
<div className={styles.title}><h2>{l10n.t('Free Trial Cloud database')}</h2></div>
98+
<div className={styles.title}><h2>{l10n.t('Free Redis Cloud database')}</h2></div>
9999
{form}
100100
<div>
101101
<OAuthRecommendedSettings value={isRecommended} onChange={handleChangeRecommendedSettings} />
@@ -107,7 +107,7 @@ const OAuthCreateDb = (props: Props) => {
107107
) : (
108108
<>
109109
<div className={styles.subTitle}>{l10n.t('Get your')}</div>
110-
<div className={styles.title}><h2>{l10n.t('Free Trial Cloud database')}</h2></div>
110+
<div className={styles.title}><h2>{l10n.t('Free Redis Cloud database')}</h2></div>
111111
<Spacer size="xl" />
112112
<div >
113113
{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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ export const OAUTH_ADVANTAGES_ITEMS = [
1111
title: l10n.t('Scalable and fully managed'),
1212
},
1313
{
14-
title: l10n.t('Free trial database to get started immediately'),
14+
title: l10n.t('Free Redis Cloud database to get started immediately'),
1515
},
1616
]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ export const parseCustomError = (err: CustomError | string = DEFAULT_ERROR_MESSA
177177
title = 'Database already exists'
178178
message = (
179179
<>
180-
You already have a free trial Redis Cloud database running.
180+
You already have a free Redis Cloud database running.
181181
<Spacer size="s" />
182182
Check out your
183183
<a

0 commit comments

Comments
 (0)