Merge branch 'main' into feature/RI-4325_Fix_dependabot_issues

# Conflicts:
#	package.json

Author: rsergeenko

.circleci/config.yml

@@ -91,7 +91,7 @@ aliases:
     - mods-preview        # OSS Standalone and all preview modules
     - oss-st-6-tls        # OSS Standalone v6 with TLS enabled
     - oss-st-6-tls-auth   # OSS Standalone v6 with TLS auth required
-    - oss-st-6-tls-auth-ssh   # OSS Standalone v6 with TLS auth required through ssh
+#    - oss-st-6-tls-auth-ssh   # OSS Standalone v6 with TLS auth required through ssh
     - oss-clu             # OSS Cluster
     - oss-clu-tls         # OSS Cluster with TLS enabled
     - oss-sent            # OSS Sentinel
@@ -565,7 +565,8 @@ jobs:
             - release/redisstack
   macosx:
     macos:
-      xcode: 14.2.0
+      xcode: 14.3.0
+    resource_class: macos.x86.medium.gen2
     parameters:
       env:
         description: Build environment (stage || prod)

electron-builder.json

@@ -33,7 +33,7 @@
     "type": "distribution",
     "hardenedRuntime": true,
     "darkModeSupport": true,
-    "bundleVersion": "3",
+    "bundleVersion": "9",
     "icon": "resources/icon.icns",
     "artifactName": "${productName}-${os}-${arch}.${ext}",
     "entitlements": "resources/entitlements.mac.plist",

package.json

@@ -152,7 +152,7 @@
     "cross-env": "^7.0.2",
     "css-loader": "^5.0.1",
     "css-minimizer-webpack-plugin": "^2.0.0",
-    "electron": "^19.0.7",
+    "electron": "19.0.7",
     "electron-builder": "^23.6.0",
     "electron-builder-notarize": "^1.5.1",
     "electron-debug": "^3.2.0",

redisinsight/about-panel.ts

@@ -8,7 +8,7 @@ const ICON_PATH = app.isPackaged
 export default {
   applicationName: 'RedisInsight-v2',
   applicationVersion:
-  `${app.getVersion() || '2.22.1'}${process.env.NODE_ENV !== 'production' ? `-dev-${process.getCreationTime()}` : ''}`,
+  `${app.getVersion() || '2.24.0'}${process.env.NODE_ENV !== 'production' ? `-dev-${process.getCreationTime()}` : ''}`,
   copyright: `Copyright © ${new Date().getFullYear()} Redis Ltd.`,
   iconPath: ICON_PATH,
 };

redisinsight/api/config/default.ts

@@ -57,7 +57,7 @@ export default {
     tlsKey: process.env.SERVER_TLS_KEY,
     staticContent: !!process.env.SERVER_STATIC_CONTENT || false,
     buildType: process.env.BUILD_TYPE || 'ELECTRON',
-    appVersion: process.env.APP_VERSION || '2.22.0',
+    appVersion: process.env.APP_VERSION || '2.24.0',
     requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],

redisinsight/api/config/swagger.ts

@@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit<OpenAPIObject, 'paths'> = {
   info: {
     title: 'RedisInsight Backend API',
     description: 'RedisInsight Backend API',
-    version: '2.22.1',
+    version: '2.24.0',
   },
   tags: [],
 };

redisinsight/api/src/modules/browser/dto/keys.dto.ts

@@ -176,6 +176,20 @@ export class GetKeysInfoDto {
   @IsRedisString({ each: true })
   @RedisStringType({ each: true })
   keys: RedisString[];
+
+  @ApiPropertyOptional({
+    description:
+      'Iterate through the database looking for keys of a specific type.',
+    enum: RedisDataType,
+    example: RedisDataType.Hash,
+  })
+  @IsEnum(RedisDataType, {
+    message: `destination must be a valid enum value. Valid values: ${Object.values(
+      RedisDataType,
+    )}.`,
+  })
+  @IsOptional()
+  type?: RedisDataType;
 }
 
 export class GetKeyInfoDto extends KeyDto {}

redisinsight/api/src/modules/browser/services/keys-business/keys-business.service.ts

@@ -176,7 +176,7 @@ export class KeysBusinessService {
     try {
       const client = await this.browserTool.getRedisClient(clientMetadata);
       const scanner = this.scanner.getStrategy(client.isCluster ? ConnectionType.CLUSTER : ConnectionType.STANDALONE);
-      const result = await scanner.getKeysInfo(client, dto.keys);
+      const result = await scanner.getKeysInfo(client, dto.keys, dto.type);
 
       return plainToClass(GetKeyInfoResponse, result);
     } catch (error) {

redisinsight/api/src/modules/browser/services/keys-business/scanner/strategies/cluster.strategy.ts

@@ -94,7 +94,7 @@ export class ClusterStrategy extends AbstractStrategy {
           );
         } else {
           // eslint-disable-next-line no-param-reassign
-          node.keys = node.keys.map((name) => ({ name }));
+          node.keys = node.keys.map((name) => ({ name, type: args.type || undefined  }));
         }
       }),
     );

redisinsight/api/src/modules/browser/services/keys-business/scanner/strategies/standalone.strategy.spec.ts

@@ -101,7 +101,7 @@ describe('Standalone Scanner Strategy', () => {
         null,
       );
     });
-    it('should return keys names only', async () => {
+    it('should return keys names and type only', async () => {
       const args = {
         ...getKeysDto, type: 'string', match: 'pattern*', keysInfo: false,
       };
@@ -126,7 +126,7 @@ describe('Standalone Scanner Strategy', () => {
           ...mockNodeEmptyResult,
           total: 1,
           scanned: getKeysDto.count,
-          keys: [{ name: getKeyInfoResponse.name }],
+          keys: [{ name: getKeyInfoResponse.name, type: getKeyInfoResponse.type }],
         },
       ]);
     });
@@ -384,7 +384,7 @@ describe('Standalone Scanner Strategy', () => {
           .fn()
           .mockResolvedValue([getKeyInfoResponse]);
 
-        const result = await strategy.getKeys(mockBrowserClientMetadata, dto);
+        const result = await strategy.getKeys(mockBrowserClientMetadata, dto, dto.type);
 
         expect(result).toEqual([
           {
@@ -394,9 +394,11 @@ describe('Standalone Scanner Strategy', () => {
             keys: [getKeyInfoResponse],
           },
         ]);
-        expect(strategy.getKeysInfo).toHaveBeenCalledWith(nodeClient, [
-          Buffer.from(key),
-        ]);
+        expect(strategy.getKeysInfo).toHaveBeenCalledWith(
+          nodeClient,
+          [Buffer.from(key)],
+          dto.type,
+        );
         expect(strategy.scan).not.toHaveBeenCalled();
       });
       it('should find exact key when match is escaped glob patter', async () => {
@@ -406,7 +408,7 @@ describe('Standalone Scanner Strategy', () => {
           .fn()
           .mockResolvedValue([{ ...getKeyInfoResponse, name: mockSearchPattern }]);
 
-        const result = await strategy.getKeys(mockBrowserClientMetadata, dto);
+        const result = await strategy.getKeys(mockBrowserClientMetadata, dto, dto.type);
 
         expect(result).toEqual([
           {
@@ -416,7 +418,11 @@ describe('Standalone Scanner Strategy', () => {
             keys: [{ ...getKeyInfoResponse, name: mockSearchPattern }],
           },
         ]);
-        expect(strategy.getKeysInfo).toHaveBeenCalledWith(nodeClient, [Buffer.from(mockSearchPattern)]);
+        expect(strategy.getKeysInfo).toHaveBeenCalledWith(
+          nodeClient,
+          [Buffer.from(mockSearchPattern)],
+          dto.type,
+        );
         expect(strategy.scan).not.toHaveBeenCalled();
       });
       it('should find exact key with correct type', async () => {