Skip to content

Commit a0cf6f7

Browse files
committed
* #RIVS-261 - [Regression] Error when trying to fetch create-redis.json is displayed after removing vs code folder
* #RIVS-262 - [Regression] Stage build from CI not connected to amplitude account * #RIVS-263 - [Regression] AppVersion in telemetry is 2.54.0 * #RIVS-265 - [Regression] Wrong links for welcome page and release notes
1 parent 6774306 commit a0cf6f7

File tree

13 files changed

+38
-27
lines changed

13 files changed

+38
-27
lines changed

.circleci/config.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,13 +183,17 @@ jobs:
183183
name: Build .vsix package
184184
command: |
185185
packagePath=./release/redis-for-vscode-extension-linux-x64.vsix
186+
envFile=".env"
186187
yarn download:backend
187188
188189
if [ << parameters.env >> == 'prod' ]; then
190+
echo "SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY" >> $envFile
189191
yarn package:prod --out ${packagePath}
190192
exit 0;
191193
fi
192194
195+
echo "SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE" >> $envFile
196+
sed -i '' 's/^RI_APP_FOLDER_NAME=.*/RI_APP_FOLDER_NAME=".redis-for-vscode-stage"/' .env
193197
yarn package:stage --out ${packagePath}
194198
- persist_to_workspace:
195199
root: .

.vscodeignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ node_modules
2222
!node_modules/debug
2323
vite.config.mjs
2424
*.zip
25+
.eslintignore
26+
.env.stage
2527

2628
# test
2729
coverage

l10n/bundle.l10n.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
"Last Refresh": "Last Refresh",
1111
"- Welcome": "- Welcome",
1212
"About Redis for VS Code": "About Redis for VS Code",
13-
"Take your productivity to the next level when developing with Redis or Redis Stack! Use Redis for VS Code to visualize and optimize Redis data.": "Take your productivity to the next level when developing with Redis or Redis Stack! Use Redis for VS Code to visualize and optimize Redis data.",
14-
"A powerful desktop manager, Redis for VS Code provides an intuitive and efficient UI for Redis and Redis Stack and supports CLI interaction in a fully-featured desktop UI client.": "A powerful desktop manager, Redis for VS Code provides an intuitive and efficient UI for Redis and Redis Stack and supports CLI interaction in a fully-featured desktop UI client.",
13+
"Redis for VS Code provides an intuitive and efficient UI to visualize and optimize your Redis data.": "Redis for VS Code provides an intuitive and efficient UI to visualize and optimize your Redis data.",
1514
"Start": "Start",
1615
"Connect your database": "Connect your database",
1716
"Create new database": "Create new database",
@@ -100,11 +99,11 @@
10099
"TTL: No limit": "TTL: No limit",
101100
"Key name*": "Key name*",
102101
"Encrypted data": "Encrypted data",
103-
"RedisJSON module should be loaded to add this key. Find ": "RedisJSON module should be loaded to add this key. Find ",
104-
"more information": "more information",
105-
" about RedisJSON or create your ": " about RedisJSON or create your ",
106-
"free Redis database": "free Redis database",
107-
" with RedisJSON on Redis Cloud.": " with RedisJSON on Redis Cloud.",
102+
"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 ",
103+
"here.": "here.",
104+
"You can also create a ": "You can also create a ",
105+
"free Redis Cloud database": "free Redis Cloud database",
106+
" with built-in JSON support.": " with built-in JSON support.",
108107
"If you remove the single {0}, the whole Key will be deleted.": "If you remove the single {0}, the whole Key will be deleted.",
109108
"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 ",
110109
"free up-to-date": "free up-to-date",

package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@
88
"l10n": "./l10n",
99
"publisher": "Redis",
1010
"pricing": "Free",
11-
"categories": ["Visualization", "Programming Languages"],
11+
"categories": [
12+
"Visualization",
13+
"Programming Languages"
14+
],
1215
"icon": "dist/webviews/resources/256x256.png",
1316
"author": {
1417
"name": "Redis Ltd.",
15-
"email": "support@redis.com",
16-
"url": "https://redis.com/redis-enterprise/redis-insight"
18+
"email": "support@redis.io",
19+
"url": "https://redis.io/insight/"
1720
},
1821
"repository": {
1922
"type": "git",

scripts/downloadBackend.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dotenv.config({
1313
const target = process.argv[2];
1414
const cdnPath = process.env.RI_CDN_PATH
1515
const backendPath = path.join(__dirname, '..', 'dist', 'redis-backend')
16-
const staticPath = path.join(backendPath, 'static')
16+
const tutorialsPath = path.join(backendPath, 'dist-minified', 'defaults', 'tutorials')
1717

1818
const downloadBackend = async () => {
1919
if (fs.existsSync(backendPath)) {
@@ -86,8 +86,8 @@ function unzipRedisServer(redisInsideArchivePath: string, extractDir: string) {
8686

8787
cp.spawnSync('tar', ['-xf', redisInsideArchivePath, '-C', extractDir, '--strip-components', '1', 'api'])
8888

89-
// remove plugins
90-
fs.rmSync(staticPath, { recursive: true, force: true });
89+
// remove tutorials
90+
fs.rmSync(tutorialsPath, { recursive: true, force: true });
9191
}
9292

9393
downloadBackend()

src/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ export const MAX_TITLE_KEY_LENGTH = 30
1212
export const EXTENSION_ID = 'Redis.redis-for-vscode'
1313

1414
export const EXTERNAL_LINKS = {
15-
releaseNotes: 'https://github.com/RedisInsight/RedisInsight/releases',
15+
releaseNotes: 'https://github.com/RedisInsight/Redis-for-VS-Code/releases',
1616
}

src/resources/256x256.png

2.47 KB
Loading

src/server/bootstrapBackend.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import { sleep } from '../utils'
99
let gracefulShutdown: Function
1010
let beApp: any
1111

12-
const backendPath = path.join(__dirname, '..', 'redis-backend/dist-minified')
12+
const backendPath = path.join(__dirname, '..', 'redis-backend', 'dist-minified')
13+
process.env.RI_DEFAULTS_DIR = path.join(backendPath, 'defaults')
1314

1415
export async function startBackend(logger: CustomLogger): Promise<any> {
1516
const appPort = process.env.RI_APP_PORT

src/server/bootstrapBackendE2E.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ const appPrefix = process.env.RI_APP_PREFIX
1717
const appFolder = process.env.RI_APP_FOLDER
1818
const appHost = process.env.RI_APP_HOST
1919

20-
const backendPath = path.join(__dirname, '..', 'redis-backend/dist-minified')
20+
const backendPath = path.join(__dirname, '..', 'redis-backend', 'dist-minified')
21+
const defaultDirPath = path.join(backendPath, 'defaults')
2122
let PSinst: ChildProcessWithoutNullStreams
2223

2324
export async function startBackendE2E(logger: CustomLogger): Promise<any> {
@@ -52,6 +53,7 @@ export async function startBackendE2E(logger: CustomLogger): Promise<any> {
5253
+ `$env:RI_BUILD_TYPE=${process.env.RI_BUILD_TYPE};`
5354
+ `$env:RI_SEGMENT_WRITE_KEY=${process.env.RI_SEGMENT_WRITE_KEY};`
5455
+ `$env:RI_MIGRATE_OLD_FOLDERS=${process.env.RI_MIGRATE_OLD_FOLDERS};`
56+
+ `$env:RI_DEFAULTS_DIR=${defaultDirPath};`
5557
+ '$env:RI_AUTO_BOOTSTRAP=true;'
5658
+ `node ${backendSrcPath}`,
5759
])
@@ -69,6 +71,7 @@ export async function startBackendE2E(logger: CustomLogger): Promise<any> {
6971
RI_BUILD_TYPE: process.env.RI_BUILD_TYPE,
7072
RI_SEGMENT_WRITE_KEY: process.env.RI_SEGMENT_WRITE_KEY,
7173
RI_MIGRATE_OLD_FOLDERS: process.env.RI_MIGRATE_OLD_FOLDERS,
74+
RI_DEFAULTS_DIR: defaultDirPath,
7275
RI_AUTO_BOOTSTRAP: 'true',
7376
PATH: process.env.PATH,
7477
},

src/webviews/src/constants/external/links.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export const EXTERNAL_LINKS = {
2-
riAppDownload: 'https://redis.com/redis-enterprise/redis-insight/',
2+
riAppDownload: 'https://redis.io/insight/',
33
jsonModule: 'https://redis.io/docs/latest/operate/oss_and_stack/stack-with-enterprise/json/',
4-
tryFree: 'https://redis.com/try-free/',
4+
tryFree: 'https://redis.io/try-free/',
55
}
66

77
export const UTM_CAMPAIGNS = {

0 commit comments

Comments
 (0)