Skip to content

Commit 0d860d4

Browse files
vlad-dargelvlad-dargel
committed
Merge branch 'main' into fe/feature/RI-6451
2 parents 95652f6 + 617da0c commit 0d860d4

File tree

80 files changed

+1393
-640
lines changed

Some content is hidden

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

80 files changed

+1393
-640
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.64.0)
5+
-v - Semver (2.64.1)
66
-d - Build image repository (Ex: -d redisinsight)
77
-r - Target repository (Ex: -r redis/redisinsight)
88
"

‎.github/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.64.0)
5+
-v - Semver (2.64.1)
66
-d - Build image repository (Ex: -d redisinsight)
77
-r - Target repository (Ex: -r redis/redisinsight)
88
"

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
"word-wrap": "1.2.4",
8888
"**/semver": "^7.5.2",
8989
"rawproto/protobufjs": "^7.2.5",
90+
"@electron/notarize": "2.3.2",
9091
"webpack-bundle-analyzer/ws": "^7.5.10",
9192
"msw/path-to-regexp": "^6.3.0",
9293
"msw/cookie": "^0.7.0",

‎redisinsight/api/config/default.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export default {
8080
migrateOldFolders: process.env.RI_MIGRATE_OLD_FOLDERS ? process.env.RI_MIGRATE_OLD_FOLDERS === 'true' : true,
8181
autoBootstrap: process.env.RI_AUTO_BOOTSTRAP ? process.env.RI_AUTO_BOOTSTRAP === 'true' : true,
8282
buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
83-
appVersion: process.env.RI_APP_VERSION || '2.64.0',
83+
appVersion: process.env.RI_APP_VERSION || '2.64.1',
8484
requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
8585
excludeRoutes: [],
8686
excludeAuthRoutes: [],

‎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.64.0',
8+
version: '2.64.1',
99
},
1010
tags: [],
1111
};

‎redisinsight/api/package.json‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "redisinsight-api",
3-
"version": "2.64.0",
3+
"version": "2.64.1",
44
"description": "Redis Insight API",
55
"private": true,
66
"author": {
@@ -64,7 +64,6 @@
6464
"@nestjs/websockets": "^10.4.5",
6565
"@okta/okta-auth-js": "^7.8.1",
6666
"@segment/analytics-node": "^2.1.3",
67-
"@types/json-bigint": "^1.0.4",
6867
"adm-zip": "^0.5.9",
6968
"axios": "^1.7.4",
7069
"body-parser": "^1.20.3",
@@ -80,7 +79,6 @@
8079
"fs-extra": "^10.0.0",
8180
"ioredis": "^5.2.2",
8281
"is-glob": "^4.0.1",
83-
"json-bigint": "^1.0.0",
8482
"jsonwebtoken": "^9.0.2",
8583
"keytar": "^7.9.0",
8684
"lodash": "^4.17.20",
@@ -176,13 +174,10 @@
176174
},
177175
"reporters": [
178176
"default",
179-
[
180-
"jest-html-reporters",
181-
{
182-
"publicPath": "./report",
183-
"filename": "index.html"
184-
}
185-
]
177+
["jest-html-reporters", {
178+
"publicPath": "./report",
179+
"filename": "index.html"
180+
}]
186181
]
187182
}
188183
}

‎redisinsight/api/src/__mocks__/databases.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,6 @@ export const mockDatabaseModules = [
8080
semanticVersion: '1.2.5',
8181
},
8282
];
83-
84-
export const mockDatabaseWithModules = Object.assign(new Database(), {
85-
...mockDatabase,
86-
modules: mockDatabaseModules,
87-
});
88-
8983
export const mockDatabaseWithCloudDetails = Object.assign(new Database(), {
9084
...mockDatabase,
9185
cloudDetails: mockCloudDatabaseDetails,

‎redisinsight/api/src/modules/browser/keys/key-info/strategies/rejson-rl.key-info.strategy.spec.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ describe('RejsonRlKeyInfoStrategy', () => {
3535

3636
describe('getInfo', () => {
3737
const key = getKeyInfoResponse.name;
38+
const path = '.';
3839
beforeEach(() => {
3940
when(mockStandaloneRedisClient.sendPipeline)
4041
.calledWith([
@@ -47,13 +48,13 @@ describe('RejsonRlKeyInfoStrategy', () => {
4748
]);
4849
when(mockStandaloneRedisClient.sendCommand)
4950
.calledWith(
50-
[BrowserToolRejsonRlCommands.JsonType, key],
51+
[BrowserToolRejsonRlCommands.JsonType, key, path],
5152
{ replyEncoding: 'utf8' },
5253
)
5354
.mockResolvedValue('object');
5455
when(mockStandaloneRedisClient.sendCommand)
5556
.calledWith(
56-
[BrowserToolRejsonRlCommands.JsonObjLen, key],
57+
[BrowserToolRejsonRlCommands.JsonObjLen, key, path],
5758
{ replyEncoding: 'utf8' },
5859
)
5960
.mockResolvedValue(10);
@@ -70,13 +71,13 @@ describe('RejsonRlKeyInfoStrategy', () => {
7071
it('should return appropriate value for key that store string', async () => {
7172
when(mockStandaloneRedisClient.sendCommand)
7273
.calledWith(
73-
[BrowserToolRejsonRlCommands.JsonType, key],
74+
[BrowserToolRejsonRlCommands.JsonType, key, path],
7475
{ replyEncoding: 'utf8' },
7576
)
7677
.mockResolvedValue('string');
7778
when(mockStandaloneRedisClient.sendCommand)
7879
.calledWith(
79-
[BrowserToolRejsonRlCommands.JsonStrLen, key],
80+
[BrowserToolRejsonRlCommands.JsonStrLen, key, path],
8081
{ replyEncoding: 'utf8' },
8182
)
8283
.mockResolvedValue(10);
@@ -92,13 +93,13 @@ describe('RejsonRlKeyInfoStrategy', () => {
9293
it('should return appropriate value for key that store array', async () => {
9394
when(mockStandaloneRedisClient.sendCommand)
9495
.calledWith(
95-
[BrowserToolRejsonRlCommands.JsonType, key],
96+
[BrowserToolRejsonRlCommands.JsonType, key, path],
9697
{ replyEncoding: 'utf8' },
9798
)
9899
.mockResolvedValue('array');
99100
when(mockStandaloneRedisClient.sendCommand)
100101
.calledWith(
101-
[BrowserToolRejsonRlCommands.JsonArrLen, key],
102+
[BrowserToolRejsonRlCommands.JsonArrLen, key, path],
102103
{ replyEncoding: 'utf8' },
103104
)
104105
.mockResolvedValue(10);
@@ -114,7 +115,7 @@ describe('RejsonRlKeyInfoStrategy', () => {
114115
it('should return appropriate value for key that store not iterable type', async () => {
115116
when(mockStandaloneRedisClient.sendCommand)
116117
.calledWith(
117-
[BrowserToolRejsonRlCommands.JsonType, key],
118+
[BrowserToolRejsonRlCommands.JsonType, key, path],
118119
{ replyEncoding: 'utf8' },
119120
)
120121
.mockResolvedValue('boolean');

‎redisinsight/api/src/modules/browser/keys/key-info/strategies/rejson-rl.key-info.strategy.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,24 @@ export class RejsonRlKeyInfoStrategy extends KeyInfoStrategy {
3636
private async getLength(client: RedisClient, key: RedisString): Promise<number> {
3737
try {
3838
const objectKeyType = await client.sendCommand(
39-
[BrowserToolRejsonRlCommands.JsonType, key],
39+
[BrowserToolRejsonRlCommands.JsonType, key, '.'],
4040
{ replyEncoding: 'utf8' },
4141
);
4242

4343
switch (objectKeyType) {
4444
case 'object':
4545
return await client.sendCommand(
46-
[BrowserToolRejsonRlCommands.JsonObjLen, key],
46+
[BrowserToolRejsonRlCommands.JsonObjLen, key, '.'],
4747
{ replyEncoding: 'utf8' },
4848
) as number;
4949
case 'array':
5050
return await client.sendCommand(
51-
[BrowserToolRejsonRlCommands.JsonArrLen, key],
51+
[BrowserToolRejsonRlCommands.JsonArrLen, key, '.'],
5252
{ replyEncoding: 'utf8' },
5353
) as number;
5454
case 'string':
5555
return await client.sendCommand(
56-
[BrowserToolRejsonRlCommands.JsonStrLen, key],
56+
[BrowserToolRejsonRlCommands.JsonStrLen, key, '.'],
5757
{ replyEncoding: 'utf8' },
5858
) as number;
5959
default:

‎redisinsight/api/src/modules/browser/rejson-rl/dto/get.rejson-rl.dto.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ export class GetRejsonRlDto extends KeyDto {
66
@ApiPropertyOptional({
77
type: String,
88
description: 'Path to look for data',
9-
})
9+
})
1010
@IsString()
1111
@IsNotEmpty()
12-
path?: string = '$';
12+
path?: string = '.';
1313

1414
@ApiPropertyOptional({
1515
type: Boolean,
1616
description:
17-
"Don't check for json size and return whole json in path when enabled",
18-
})
17+
"Don't check for json size and return whole json in path when enabled",
18+
})
1919
@IsBoolean()
2020
forceRetrieve?: boolean;
2121
}

0 commit comments

Comments
 (0)