Merge branch 'main' of https://github.com/RedisInsight/RedisInsight into be/bugfix/RI-4882_modules_import

Author: AmirAllayarovSofteq

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/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();

redisinsight/api/src/modules/slow-log/slow-log-analytics.service.ts

@@ -37,8 +37,9 @@ export class SlowLogAnalyticsService extends TelemetryBaseService {
       TelemetryEvents.SlowlogSetLogSlowerThan,
       {
         databaseId,
-        previousValue,
-        currentValue,
+        // convert microseconds to milliseconds
+        previousValueInMSeconds: previousValue / 1_000,
+        currentValueInMSeconds: currentValue / 1_000,
       },
     );
   }

redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.spec.tsx

@@ -56,7 +56,7 @@ describe('QueryCardHeader', () => {
     })
     await waitForEuiToolTipVisible()
 
-    expect(screen.getByTestId('execution-time-tooltip')).toHaveTextContent('12 345 678.91 ms')
+    expect(screen.getByTestId('execution-time-tooltip')).toHaveTextContent('12 345 678.91 msec')
   })
 
   it('should render disabled copy button', async () => {

redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx

@@ -76,14 +76,14 @@ export interface Props {
 
 const getExecutionTimeString = (value: number): string => {
   if (value < 1) {
-    return '0.001 ms'
+    return '0.001 msec'
   }
-  return `${numberWithSpaces((parseFloat((value / 1000).toFixed(3))))} ms`
+  return `${numberWithSpaces((parseFloat((value / 1000).toFixed(3))))} msec`
 }
 
 const getTruncatedExecutionTimeString = (value: number): string => {
   if (value < 1) {
-    return '0.001 ms'
+    return '0.001 msec'
   }
 
   return truncateMilliseconds(parseFloat((value / 1000).toFixed(3)))

redisinsight/ui/src/constants/durationUnits.tsx

@@ -2,7 +2,8 @@ import { EuiSuperSelectOption } from '@elastic/eui'
 
 export enum DurationUnits {
   microSeconds = 'µs',
-  milliSeconds = 'ms'
+  milliSeconds = 'ms',
+  mSeconds = 'msec',
 }
 
 export const DURATION_UNITS: EuiSuperSelectOption<DurationUnits>[] = [
@@ -12,15 +13,15 @@ export const DURATION_UNITS: EuiSuperSelectOption<DurationUnits>[] = [
     'data-test-subj': 'unit-micro-second',
   },
   {
-    inputDisplay: DurationUnits.milliSeconds,
+    inputDisplay: 'msec',
     value: DurationUnits.milliSeconds,
     'data-test-subj': 'unit-milli-second',
   },
 ]
 
 export const MINUS_ONE = -1
 export const DEFAULT_SLOWLOG_MAX_LEN = 128
-export const DEFAULT_SLOWLOG_SLOWER_THAN = 10_000
-export const DEFAULT_SLOWLOG_DURATION_UNIT = DurationUnits.microSeconds
+export const DEFAULT_SLOWLOG_SLOWER_THAN = 10
+export const DEFAULT_SLOWLOG_DURATION_UNIT = DurationUnits.milliSeconds
 
 export default DURATION_UNITS