Skip to content

Commit 880b5fc

Browse files
rsergeenkorsergeenko
committed
Merge branch 'main' into feature/RI-5566-update-electron+node
# Conflicts: # tests/e2e/static-server.Dockerfile
2 parents f6b30fd + 96fd750 commit 880b5fc

File tree

101 files changed

+1364
-267
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+1364
-267
lines changed

‎.circleci/build/release-docker.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -e
33

44
HELP="Args:
5-
-v - Semver (2.50.0)
5+
-v - Semver (2.52.0)
66
-d - Build image repository (Ex: -d redisinsight)
77
-r - Target repository (Ex: -r redis/redisinsight)
88
"

‎.circleci/config.yml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -393,9 +393,18 @@ jobs:
393393
at: .
394394
- run: sudo apt-get install net-tools
395395
- run:
396-
name: Clone mocked RDI server
396+
name: Install WM
397+
command: sudo apt install fluxbox
398+
- run:
399+
name: Run X11
397400
command: |
398-
git clone https://[email protected]/RedisInsight/RDI_server_mocked.git tests/e2e/rte/rdi
401+
Xvfb :99 -screen 0 1920x1080x24 &
402+
sleep 3
403+
fluxbox &
404+
# - run:
405+
# name: Clone mocked RDI server
406+
# command: |
407+
# git clone https://[email protected]/RedisInsight/RDI_server_mocked.git tests/e2e/rte/rdi
399408
- run:
400409
name: .AppImage tests
401410
command: |
@@ -488,10 +497,10 @@ jobs:
488497
name: Load built docker image from workspace
489498
command: |
490499
docker image load -i /tmp/release/docker/docker-linux-alpine.amd64.tar
491-
- run:
492-
name: Clone mocked RDI server
493-
command: |
494-
git clone https://[email protected]/RedisInsight/RDI_server_mocked.git tests/e2e/rte/rdi
500+
# - run:
501+
# name: Clone mocked RDI server
502+
# command: |
503+
# git clone https://[email protected]/RedisInsight/RDI_server_mocked.git tests/e2e/rte/rdi
495504
- run:
496505
name: Run tests
497506
command: |

‎redisinsight/api/config/default.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export default {
7676
tlsKey: process.env.RI_SERVER_TLS_KEY,
7777
staticContent: !!process.env.RI_SERVE_STATICS || true,
7878
buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
79-
appVersion: process.env.RI_APP_VERSION || '2.50.0',
79+
appVersion: process.env.RI_APP_VERSION || '2.52.0',
8080
requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
8181
excludeRoutes: [],
8282
excludeAuthRoutes: [],

‎redisinsight/api/config/features-config.json‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": 2.52,
2+
"version": 2.5202,
33
"features": {
44
"rdi": {
55
"flag": true,
@@ -18,7 +18,7 @@
1818
},
1919
"documentationChat": {
2020
"flag": true,
21-
"perc": [[0,5]],
21+
"perc": [[0,20]],
2222
"filters": [
2323
{
2424
"name": "config.server.buildType",
@@ -29,7 +29,7 @@
2929
},
3030
"databaseChat": {
3131
"flag": true,
32-
"perc": [[0,5]],
32+
"perc": [[0,20]],
3333
"filters": [
3434
{
3535
"name": "config.server.buildType",
@@ -78,11 +78,6 @@
7878
"name": "config.server.buildType",
7979
"value": "ELECTRON",
8080
"cond": "eq"
81-
},
82-
{
83-
"name": "agreements.analytics",
84-
"value": true,
85-
"cond": "eq"
8681
}
8782
]
8883
},

‎redisinsight/api/config/swagger.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit<OpenAPIObject, 'paths'> = {
55
info: {
66
title: 'Redis Insight Backend API',
77
description: 'Redis Insight Backend API',
8-
version: '2.50.0',
8+
version: '2.52.0',
99
},
1010
tags: [],
1111
};

‎redisinsight/api/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "redisinsight-api",
3-
"version": "2.50.0",
3+
"version": "2.52.0",
44
"description": "Redis Insight API",
55
"private": true,
66
"author": {

‎redisinsight/api/src/constants/error-messages.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,5 @@ export default {
111111
RDI_DEPLOY_PIPELINE_FAILURE: 'Failed to deploy pipeline',
112112
RDI_TIMEOUT_ERROR: 'Encountered a timeout error while attempting to retrieve data',
113113
RDI_VALIDATION_ERROR: 'Validation error',
114+
INVALID_RDI_INSTANCE_ID: 'Invalid rdi instance id.',
114115
};

‎redisinsight/api/src/modules/browser/keys/scanner/strategies/cluster.scanner.strategy.spec.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ describe('Cluster Scanner Strategy', () => {
633633
scanned: 10,
634634
},
635635
]);
636-
expect(strategy.getKeysInfo).toHaveBeenCalledWith(mockClusterRedisClient, [Buffer.from(key)], dto.type);
636+
expect(strategy.getKeysInfo).toHaveBeenCalledWith(mockClusterRedisClient, [Buffer.from(key)]);
637637
expect(strategy['scanNodes']).not.toHaveBeenCalled();
638638
});
639639
it('should find exact key when match is escaped glob patter', async () => {
@@ -666,7 +666,6 @@ describe('Cluster Scanner Strategy', () => {
666666
expect(strategy.getKeysInfo).toHaveBeenCalledWith(
667667
mockClusterRedisClient,
668668
[Buffer.from(searchPattern)],
669-
dto.type,
670669
);
671670
expect(strategy['scanNodes']).not.toHaveBeenCalled();
672671
});
@@ -704,7 +703,6 @@ describe('Cluster Scanner Strategy', () => {
704703
expect(strategy.getKeysInfo).toHaveBeenCalledWith(
705704
mockClusterRedisClient,
706705
[Buffer.from(key)],
707-
dto.type,
708706
);
709707
expect(strategy['scanNodes']).not.toHaveBeenCalled();
710708
});
@@ -741,7 +739,6 @@ describe('Cluster Scanner Strategy', () => {
741739
expect(strategy.getKeysInfo).toHaveBeenCalledWith(
742740
mockClusterRedisClient,
743741
[Buffer.from(key)],
744-
dto.type,
745742
);
746743
expect(strategy['scanNodes']).not.toHaveBeenCalled();
747744
});
@@ -779,7 +776,6 @@ describe('Cluster Scanner Strategy', () => {
779776
expect(strategy.getKeysInfo).toHaveBeenCalledWith(
780777
mockClusterRedisClient,
781778
[Buffer.from(key)],
782-
dto.type,
783779
);
784780
expect(strategy['scanNodes']).not.toHaveBeenCalled();
785781
});

‎redisinsight/api/src/modules/browser/keys/scanner/strategies/cluster.scanner.strategy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export class ClusterScannerStrategy extends ScannerStrategy {
121121
// eslint-disable-next-line no-param-reassign
122122
node.scanned = isNull(node.total) ? 1 : node.total;
123123
});
124-
nodes[0].keys = await this.getKeysInfo(client, [keyName], args.type);
124+
nodes[0].keys = await this.getKeysInfo(client, [keyName]);
125125
nodes[0].keys = nodes[0].keys.filter((key: GetKeyInfoResponse) => {
126126
if (key.ttl === -2) {
127127
return false;

‎redisinsight/api/src/modules/browser/keys/scanner/strategies/standalone.scanner.strategy.spec.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,6 @@ describe('StandaloneScannerStrategy', () => {
389389
expect(strategy.getKeysInfo).toHaveBeenCalledWith(
390390
mockStandaloneRedisClient,
391391
[Buffer.from(key)],
392-
dto.type,
393392
);
394393
expect(strategy['scan']).not.toHaveBeenCalled();
395394
});
@@ -413,7 +412,6 @@ describe('StandaloneScannerStrategy', () => {
413412
expect(strategy.getKeysInfo).toHaveBeenCalledWith(
414413
mockStandaloneRedisClient,
415414
[Buffer.from(mockSearchPattern)],
416-
dto.type,
417415
);
418416
expect(strategy['scan']).not.toHaveBeenCalled();
419417
});

0 commit comments

Comments
 (0)