Merge remote-tracking branch 'origin/main' into feature/RI-6265_update-list-of-databases

Author: mariasergeenko

.github/workflows/tests-integration.yml

@@ -106,13 +106,13 @@ jobs:
       if: inputs.build == 'docker'
       uses: actions/download-artifact@v4
       with:
-        name: docker
+        name: docker-builds
         path: ./release
 
     - name: Load built docker image from workspace
       if: inputs.build == 'docker'
       run: |
-        docker image load -i ./release/docker-linux-alpine.amd64.tar
+        docker image load -i ./release/docker/docker-linux-alpine.amd64.tar
 
     - name: Run tests
       run: |

redisinsight/api/package.json

@@ -63,6 +63,7 @@
     "@nestjs/websockets": "^10.4.5",
     "@okta/okta-auth-js": "^7.8.1",
     "@segment/analytics-node": "^2.1.3",
+    "@types/json-bigint": "^1.0.4",
     "adm-zip": "^0.5.9",
     "axios": "^1.7.4",
     "body-parser": "^1.20.3",
@@ -78,6 +79,7 @@
     "fs-extra": "^10.0.0",
     "ioredis": "^5.2.2",
     "is-glob": "^4.0.1",
+    "json-bigint": "^1.0.0",
     "jsonwebtoken": "^9.0.2",
     "keytar": "^7.9.0",
     "lodash": "^4.17.20",
@@ -173,10 +175,13 @@
     },
     "reporters": [
       "default",
-      ["jest-html-reporters", {
-        "publicPath": "./report",
-        "filename": "index.html"
-      }]
+      [
+        "jest-html-reporters",
+        {
+          "publicPath": "./report",
+          "filename": "index.html"
+        }
+      ]
     ]
   }
 }

redisinsight/api/src/__mocks__/databases.ts

@@ -17,6 +17,7 @@ import {
 import { CloudDatabaseDetailsEntity } from 'src/modules/cloud/database/entities/cloud-database-details.entity';
 import { mockCloudDatabaseDetails, mockCloudDatabaseDetailsEntity } from 'src/__mocks__/cloud-database';
 import { mockRedisClientListResult } from 'src/__mocks__/database-info';
+import { DatabaseOverviewKeyspace } from 'src/modules/database/constants/overview';
 
 export const mockDatabaseId = 'a77b23c1-7816-4ea4-b61f-d37795a0f805-db-id';
 
@@ -79,6 +80,12 @@ export const mockDatabaseModules = [
     semanticVersion: '1.2.5',
   },
 ];
+
+export const mockDatabaseWithModules = Object.assign(new Database(), {
+  ...mockDatabase,
+  modules: mockDatabaseModules,
+});
+
 export const mockDatabaseWithCloudDetails = Object.assign(new Database(), {
   ...mockDatabase,
   cloudDetails: mockCloudDatabaseDetails,
@@ -220,6 +227,8 @@ export const mockDatabaseOverview: DatabaseOverview = {
   cpuUsagePercentage: null,
 };
 
+export const mockDatabaseOverviewCurrentKeyspace = DatabaseOverviewKeyspace.Current;
+
 export const mockRedisServerInfoDto = {
   redis_version: '7.0.5',
   redis_mode: 'standalone',

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

@@ -35,7 +35,6 @@ describe('RejsonRlKeyInfoStrategy', () => {
 
   describe('getInfo', () => {
     const key = getKeyInfoResponse.name;
-    const path = '.';
     beforeEach(() => {
       when(mockStandaloneRedisClient.sendPipeline)
         .calledWith([
@@ -48,13 +47,13 @@ describe('RejsonRlKeyInfoStrategy', () => {
         ]);
       when(mockStandaloneRedisClient.sendCommand)
         .calledWith(
-          [BrowserToolRejsonRlCommands.JsonType, key, path],
+          [BrowserToolRejsonRlCommands.JsonType, key],
           { replyEncoding: 'utf8' },
         )
         .mockResolvedValue('object');
       when(mockStandaloneRedisClient.sendCommand)
         .calledWith(
-          [BrowserToolRejsonRlCommands.JsonObjLen, key, path],
+          [BrowserToolRejsonRlCommands.JsonObjLen, key],
           { replyEncoding: 'utf8' },
         )
         .mockResolvedValue(10);
@@ -71,13 +70,13 @@ describe('RejsonRlKeyInfoStrategy', () => {
     it('should return appropriate value for key that store string', async () => {
       when(mockStandaloneRedisClient.sendCommand)
         .calledWith(
-          [BrowserToolRejsonRlCommands.JsonType, key, path],
+          [BrowserToolRejsonRlCommands.JsonType, key],
           { replyEncoding: 'utf8' },
         )
         .mockResolvedValue('string');
       when(mockStandaloneRedisClient.sendCommand)
         .calledWith(
-          [BrowserToolRejsonRlCommands.JsonStrLen, key, path],
+          [BrowserToolRejsonRlCommands.JsonStrLen, key],
           { replyEncoding: 'utf8' },
         )
         .mockResolvedValue(10);
@@ -93,13 +92,13 @@ describe('RejsonRlKeyInfoStrategy', () => {
     it('should return appropriate value for key that store array', async () => {
       when(mockStandaloneRedisClient.sendCommand)
         .calledWith(
-          [BrowserToolRejsonRlCommands.JsonType, key, path],
+          [BrowserToolRejsonRlCommands.JsonType, key],
           { replyEncoding: 'utf8' },
         )
         .mockResolvedValue('array');
       when(mockStandaloneRedisClient.sendCommand)
         .calledWith(
-          [BrowserToolRejsonRlCommands.JsonArrLen, key, path],
+          [BrowserToolRejsonRlCommands.JsonArrLen, key],
           { replyEncoding: 'utf8' },
         )
         .mockResolvedValue(10);
@@ -115,7 +114,7 @@ describe('RejsonRlKeyInfoStrategy', () => {
     it('should return appropriate value for key that store not iterable type', async () => {
       when(mockStandaloneRedisClient.sendCommand)
         .calledWith(
-          [BrowserToolRejsonRlCommands.JsonType, key, path],
+          [BrowserToolRejsonRlCommands.JsonType, key],
           { replyEncoding: 'utf8' },
         )
         .mockResolvedValue('boolean');

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

@@ -36,24 +36,24 @@ export class RejsonRlKeyInfoStrategy extends KeyInfoStrategy {
   private async getLength(client: RedisClient, key: RedisString): Promise<number> {
     try {
       const objectKeyType = await client.sendCommand(
-        [BrowserToolRejsonRlCommands.JsonType, key, '.'],
+        [BrowserToolRejsonRlCommands.JsonType, key],
         { replyEncoding: 'utf8' },
       );
 
       switch (objectKeyType) {
         case 'object':
           return await client.sendCommand(
-            [BrowserToolRejsonRlCommands.JsonObjLen, key, '.'],
+            [BrowserToolRejsonRlCommands.JsonObjLen, key],
             { replyEncoding: 'utf8' },
           ) as number;
         case 'array':
           return await client.sendCommand(
-            [BrowserToolRejsonRlCommands.JsonArrLen, key, '.'],
+            [BrowserToolRejsonRlCommands.JsonArrLen, key],
             { replyEncoding: 'utf8' },
           ) as number;
         case 'string':
           return await client.sendCommand(
-            [BrowserToolRejsonRlCommands.JsonStrLen, key, '.'],
+            [BrowserToolRejsonRlCommands.JsonStrLen, key],
             { replyEncoding: 'utf8' },
           ) as number;
         default:

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

@@ -6,16 +6,16 @@ export class GetRejsonRlDto extends KeyDto {
   @ApiPropertyOptional({
     type: String,
     description: 'Path to look for data',
-  })
+    })
   @IsString()
   @IsNotEmpty()
-  path?: string = '.';
+  path?: string = '$';
 
   @ApiPropertyOptional({
     type: Boolean,
     description:
-      "Don't check for json size and return whole json in path when enabled",
-  })
+    "Don't check for json size and return whole json in path when enabled",
+    })
   @IsBoolean()
   forceRetrieve?: boolean;
 }