Merge branch 'main' into feature/RI-4717-import_existing_free_cloud_database

# Conflicts:
#	redisinsight/ui/src/components/notifications/components/infinite-messages/InfiniteMessages.spec.tsx
#	redisinsight/ui/src/components/notifications/components/infinite-messages/InfiniteMessages.tsx

Author: egor-zalenski

package.json

@@ -42,7 +42,7 @@
     "start:web:public": "cross-env PUBLIC_DEV=true NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./configs/webpack.config.web.dev.ts",
     "test": "jest ./redisinsight/ui -w 1",
     "test:watch": "jest ./redisinsight/ui --watch -w 1",
-    "test:cov": "jest ./redisinsight/ui --coverage -w 1",
+    "test:cov": "jest ./redisinsight/ui --coverage --runInBand",
     "test:cov:unit": "jest ./redisinsight/ui --group=-component --coverage -w 1",
     "test:cov:component": "jest ./redisinsight/ui --group=component --coverage -w 1",
     "type-check:ui": "tsc --project redisinsight/ui --noEmit"

redisinsight/api/config/default.ts

@@ -212,7 +212,7 @@ export default {
     url: process.env.RI_FEATURES_CONFIG_URL
       // eslint-disable-next-line max-len
       || 'https://raw.githubusercontent.com/RedisInsight/RedisInsight/main/redisinsight/api/config/features-config.json',
-    syncInterval: parseInt(process.env.RI_FEATURES_CONFIG_SYNC_INTERVAL, 10) || 1_000 * 60 * 60 * 4, // 4h
+    syncInterval: parseInt(process.env.RI_FEATURES_CONFIG_SYNC_INTERVAL, 10) || 1_000 * 60 * 60 * 24, // 24h
   },
   cloud: {
     apiUrl: process.env.RI_CLOUD_API_URL || 'https://app-sm.k8s-cloudapi.sm-qa.qa.redislabs.com/api/v1',

redisinsight/api/src/constants/telemetry-events.ts

@@ -13,7 +13,6 @@ export enum TelemetryEvents {
   RedisInstanceDeleted = 'CONFIG_DATABASES_DATABASE_DELETED',
   RedisInstanceEditedByUser = 'CONFIG_DATABASES_DATABASE_EDITED_BY_USER',
   RedisInstanceConnectionFailed = 'DATABASE_CONNECTION_FAILED',
-  RedisInstanceListReceived = 'CONFIG_DATABASES_DATABASE_LIST_DISPLAYED',
 
   // Databases import
   DatabaseImportParseFailed = 'CONFIG_DATABASES_REDIS_IMPORT_PARSE_FAILED',

redisinsight/api/src/modules/database-import/database-import.service.spec.ts

@@ -165,7 +165,7 @@ describe('DatabaseImportService', () => {
       }, 0);
 
       expect(databaseRepository.create).toHaveBeenCalledWith({
-        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor']),
+        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor', 'modules']),
         provider: 'RE_CLOUD',
         new: true,
       });
@@ -177,7 +177,7 @@ describe('DatabaseImportService', () => {
       }, 0);
 
       expect(databaseRepository.create).toHaveBeenCalledWith({
-        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor']),
+        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor', 'modules']),
         name: `${mockDatabase.host}:${mockDatabase.port}`,
         new: true,
       });
@@ -189,7 +189,7 @@ describe('DatabaseImportService', () => {
       }, 0);
 
       expect(databaseRepository.create).toHaveBeenCalledWith({
-        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor']),
+        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor', 'modules']),
         compressor: Compressor.NONE,
         new: true,
       });
@@ -201,7 +201,7 @@ describe('DatabaseImportService', () => {
       }, 0);
 
       expect(databaseRepository.create).toHaveBeenCalledWith({
-        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor']),
+        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor', 'modules']),
         compressor: Compressor.GZIP,
         new: true,
       });
@@ -214,7 +214,7 @@ describe('DatabaseImportService', () => {
       }, 0);
 
       expect(databaseRepository.create).toHaveBeenCalledWith({
-        ...pick(mockDatabase, ['host', 'port', 'name', 'timeout', 'compressor']),
+        ...pick(mockDatabase, ['host', 'port', 'name', 'timeout', 'compressor', 'modules']),
         connectionType: ConnectionType.CLUSTER,
         new: true,
       });

redisinsight/api/src/modules/database-import/database-import.service.ts

@@ -62,6 +62,7 @@ export class DatabaseImportService {
     ['sshPassphrase', ['sshOptions.passphrase', 'sshKeyPassphrase']],
     ['sshAgentPath', ['ssh_agent_path']],
     ['compressor', ['compressor']],
+    ['modules', ['modules']],
   ];
 
   constructor(

redisinsight/api/src/modules/database-import/dto/import.database.dto.ts

@@ -14,7 +14,7 @@ import { UseClientCertificateDto } from 'src/modules/certificate/dto/use.client-
 export class ImportDatabaseDto extends PickType(Database, [
   'host', 'port', 'name', 'db', 'username', 'password',
   'connectionType', 'tls', 'verifyServerCert', 'sentinelMaster', 'nodes',
-  'new', 'ssh', 'sshOptions', 'provider', 'compressor',
+  'new', 'ssh', 'sshOptions', 'provider', 'compressor', 'modules',
 ] as const) {
   @Expose()
   @IsNotEmpty()

redisinsight/api/src/modules/database/database.analytics.spec.ts

@@ -30,54 +30,6 @@ describe('DatabaseAnalytics', () => {
     sendFailedEventSpy = jest.spyOn(service as any, 'sendFailedEvent');
   });
 
-  describe('sendInstanceListReceivedEvent', () => {
-    it('should emit event with one db in the list', () => {
-      service.sendInstanceListReceivedEvent([mockDatabaseWithTlsAuth]);
-
-      expect(sendEventSpy).toHaveBeenCalledWith(
-        TelemetryEvents.RedisInstanceListReceived,
-        {
-          numberOfDatabases: 1,
-        },
-      );
-    });
-    it('should emit event with several dbs in the list', () => {
-      service.sendInstanceListReceivedEvent([
-        mockDatabaseWithTlsAuth,
-        mockDatabaseWithTlsAuth,
-        mockDatabaseWithTlsAuth,
-      ]);
-
-      expect(sendEventSpy).toHaveBeenCalledWith(
-        TelemetryEvents.RedisInstanceListReceived,
-        {
-          numberOfDatabases: 3,
-        },
-      );
-    });
-    it('should emit event with several empty in the list', () => {
-      service.sendInstanceListReceivedEvent([]);
-
-      expect(sendEventSpy).toHaveBeenCalledWith(
-        TelemetryEvents.RedisInstanceListReceived,
-        {
-          numberOfDatabases: 0,
-        },
-      );
-    });
-    it('should emit event with additional data', () => {
-      service.sendInstanceListReceivedEvent([], { data: 'data' });
-
-      expect(sendEventSpy).toHaveBeenCalledWith(
-        TelemetryEvents.RedisInstanceListReceived,
-        {
-          numberOfDatabases: 0,
-          data: 'data',
-        },
-      );
-    });
-  });
-
   describe('sendInstanceAddedEvent', () => {
     it('should emit event with enabled tls and sni, and ssh', () => {
       service.sendInstanceAddedEvent({

redisinsight/api/src/modules/database/database.analytics.ts

@@ -13,23 +13,6 @@ export class DatabaseAnalytics extends TelemetryBaseService {
     super(eventEmitter);
   }
 
-  sendInstanceListReceivedEvent(
-    databases: Database[],
-    additionalData: object = {},
-  ): void {
-    try {
-      this.sendEvent(
-        TelemetryEvents.RedisInstanceListReceived,
-        {
-          numberOfDatabases: databases.length,
-          ...additionalData,
-        },
-      );
-    } catch (e) {
-      // continue regardless of error
-    }
-  }
-
   sendConnectionFailedEvent(instance: Database, exception: HttpException): void {
     this.sendFailedEvent(
       TelemetryEvents.RedisInstanceConnectionFailed,

redisinsight/api/src/modules/database/database.service.spec.ts

@@ -97,12 +97,10 @@ describe('DatabaseService', () => {
     it('should return databases and send analytics event', async () => {
       databaseRepository.list.mockResolvedValue([mockDatabase, mockDatabase]);
       expect(await service.list()).toEqual([mockDatabase, mockDatabase]);
-      expect(analytics.sendInstanceListReceivedEvent).toHaveBeenCalledWith([mockDatabase, mockDatabase]);
     });
     it('should throw InternalServerErrorException?', async () => {
       databaseRepository.list.mockRejectedValueOnce(new Error());
       await expect(service.list()).rejects.toThrow(InternalServerErrorException);
-      expect(analytics.sendInstanceListReceivedEvent).not.toHaveBeenCalled();
     });
   });
 

redisinsight/api/src/modules/database/database.service.ts

@@ -63,9 +63,7 @@ export class DatabaseService {
   async list(): Promise<Database[]> {
     try {
       this.logger.log('Getting databases list');
-      const result = await this.repository.list();
-      this.analytics.sendInstanceListReceivedEvent(result);
-      return result;
+      return await this.repository.list();
     } catch (e) {
       this.logger.error('Failed to get database instance list.', e);
       throw new InternalServerErrorException();