Merge branch 'bugfix/regresion-fixes' of https://github.com/RedisInsight/RedisInsight into bugfix/RI-3822/3742/3788_regression_bugs

Author: AmirAllayarovSofteq

.gitignore

@@ -46,6 +46,10 @@ renderer.prod.js.map
 redisinsight/ui/style.css
 redisinsight/ui/style.css.map
 redisinsight/ui/dist
+redisinsight/api/commands
+redisinsight/api/guides
+redisinsight/api/tutorials
+redisinsight/api/content
 dist
 distWeb
 dll

redisinsight/api/config/default.ts

@@ -56,6 +56,7 @@ export default {
     buildType: process.env.BUILD_TYPE || 'ELECTRON',
     appVersion: process.env.APP_VERSION || '2.0.0',
     requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 10000,
+    ftSearchRequestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 45_000,
     excludeRoutes: [],
   },
   sockets: {

redisinsight/api/config/test.ts

@@ -2,6 +2,7 @@ export default {
   server: {
     env: 'test',
     requestTimeout: 1000,
+    ftSearchRequestTimeout: 1000,
   },
   profiler: {
     logFileIdleThreshold: parseInt(process.env.PROFILER_LOG_FILE_IDLE_THRESHOLD, 10) || 1000 * 2, // 3sec

redisinsight/api/src/common/interceptors/timeout.interceptor.ts

@@ -18,7 +18,7 @@ export class TimeoutInterceptor implements NestInterceptor {
 
   private readonly message: string;
 
-  constructor(message?: string) {
+  constructor(message: string = 'Request timeout') {
     this.message = message;
   }
 

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

@@ -11,6 +11,7 @@ export default {
   WRONG_DATABASE_TYPE: 'Wrong database type.',
   CONNECTION_TIMEOUT:
     'The connection has timed out, please check the connection details.',
+  FT_SEARCH_COMMAND_TIMED_OUT: 'Command timed out.',
   AUTHENTICATION_FAILED: () => 'Failed to authenticate, please check the username or password.',
   INCORRECT_DATABASE_URL: (url) => `Could not connect to ${url}, please check the connection details.`,
   INCORRECT_CERTIFICATES: (url) => `Could not connect to ${url}, please check the CA or Client certificate.`,
@@ -52,4 +53,5 @@ export default {
   REDIS_MODULE_IS_REQUIRED: (module: string) => `Required ${module} module is not loaded.`,
   APP_SETTINGS_NOT_FOUND: () => 'Could not find application settings.',
   SERVER_INFO_NOT_FOUND: () => 'Could not find server info.',
+  INCREASE_MINIMUM_LIMIT: (count: string) => `Set MAXSEARCHRESULTS to at least ${count}.`,
 };

redisinsight/api/src/constants/redis-error-codes.ts

@@ -13,6 +13,7 @@ export enum RedisErrorCodes {
   BusyGroup = 'BUSYGROUP',
   NoGroup = 'NOGROUP',
   UnknownCommand = 'unknown command',
+  RedisearchLimit = 'LIMIT',
 }
 
 export enum CertificatesErrorCodes {

redisinsight/api/src/modules/analytics/telemetry.base.service.spec.ts

@@ -33,11 +33,11 @@ describe('TelemetryBaseService', () => {
 
   describe('sendEvent', () => {
     it('should emit event', () => {
-      service.sendEvent(TelemetryEvents.RedisInstanceAdded, { data: 'Some data' });
+      service.sendEvent(TelemetryEvents.RedisInstanceAdded, { data: 'Some data', command: 'lowercase' });
 
       expect(eventEmitter.emit).toHaveBeenCalledWith(AppAnalyticsEvents.Track, {
         event: TelemetryEvents.RedisInstanceAdded,
-        eventData: { data: 'Some data' },
+        eventData: { data: 'Some data', command: 'LOWERCASE' },
       });
     });
     it('should emit event with empty event data', () => {
@@ -87,13 +87,18 @@ describe('TelemetryBaseService', () => {
       });
     });
     it('should emit event with additional event data', () => {
-      service.sendFailedEvent(TelemetryEvents.RedisInstanceAddFailed, httpException, { data: 'Some data' });
+      service.sendFailedEvent(
+        TelemetryEvents.RedisInstanceAddFailed,
+        httpException,
+        { data: 'Some data', command: 'lowercase' },
+      );
 
       expect(eventEmitter.emit).toHaveBeenCalledWith(AppAnalyticsEvents.Track, {
         event: TelemetryEvents.RedisInstanceAddFailed,
         eventData: {
           error: 'Internal Server Error',
           data: 'Some data',
+          command: 'LOWERCASE',
         },
       });
     });

redisinsight/api/src/modules/analytics/telemetry.base.service.ts

@@ -1,3 +1,4 @@
+import { isString } from 'lodash';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { HttpException } from '@nestjs/common';
 import { AppAnalyticsEvents } from 'src/constants';
@@ -13,7 +14,10 @@ export abstract class TelemetryBaseService {
     try {
       this.eventEmitter.emit(AppAnalyticsEvents.Track, {
         event,
-        eventData,
+        eventData: {
+          ...eventData,
+          command: isString(eventData['command']) ? eventData['command'].toUpperCase() : eventData['command'],
+        },
       });
     } catch (e) {
       // continue regardless of error
@@ -27,6 +31,7 @@ export abstract class TelemetryBaseService {
         eventData: {
           error: exception.getResponse()['error'] || exception.message,
           ...eventData,
+          command: isString(eventData['command']) ? eventData['command'].toUpperCase() : eventData['command'],
         },
       });
     } catch (e) {

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

@@ -319,4 +319,12 @@ export class GetKeysWithDetailsResponse {
     description: 'Node port. In case when we are working with cluster',
   })
   port?: number;
+
+  @ApiPropertyOptional({
+    type: Number,
+    description:
+      'The maximum number of results.'
+      + ' For RediSearch this number is a value from "FT.CONFIG GET maxsearchresults" command.'
+  })
+  maxResults?: number;
 }

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

@@ -943,7 +943,7 @@ describe('Cluster Scanner Strategy', () => {
             scanned: 10,
           },
         ]);
-        expect(strategy.getKeyInfo).toHaveBeenCalledWith(clusterClient, key);
+        expect(strategy.getKeyInfo).toHaveBeenCalledWith(clusterClient, Buffer.from(key));
         expect(strategy.scanNodes).not.toHaveBeenCalled();
       });
       it('should find exact key when match is escaped glob patter', async () => {
@@ -973,7 +973,7 @@ describe('Cluster Scanner Strategy', () => {
             scanned: 10,
           },
         ]);
-        expect(strategy.getKeyInfo).toHaveBeenCalledWith(clusterClient, searchPattern);
+        expect(strategy.getKeyInfo).toHaveBeenCalledWith(clusterClient, Buffer.from(searchPattern));
         expect(strategy.scanNodes).not.toHaveBeenCalled();
       });
       it('should find exact key with correct type', async () => {