Merge pull request #2898 from RedisInsight/release/2.40.0

Release/2.40.0

Author: mariasergeenko

redisinsight/api/config/default.ts

@@ -60,7 +60,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.38.0',
+    appVersion: process.env.APP_VERSION || '2.40.0',
     requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],

redisinsight/api/config/features-config.json

@@ -1,5 +1,5 @@
 {
-  "version": 2.3402,
+  "version": 2.3403,
   "features": {
     "insightsRecommendations": {
       "flag": true,
@@ -47,6 +47,22 @@
         }
       }
     },
+    "cloudSsoRecommendedSettings": {
+      "flag": true,
+      "perc": [[0, 50]],
+      "filters": [
+        {
+          "name": "config.server.buildType",
+          "value": "ELECTRON",
+          "cond": "eq"
+        },
+        {
+          "name": "agreements.analytics",
+          "value": true,
+          "cond": "eq"
+        }
+      ]
+    },
     "redisModuleFilter": {
       "flag": true,
       "perc": [[0, 100]],

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.38.0',
+    version: '2.40.0',
   },
   tags: [],
 };

redisinsight/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redisinsight-api",
-  "version": "2.38.0",
+  "version": "2.40.0",
   "description": "RedisInsight API",
   "private": true,
   "author": {
@@ -60,6 +60,7 @@
     "analytics-node": "^4.0.1",
     "axios": "^0.25.0",
     "body-parser": "^1.19.0",
+    "busboy": "^1.6.0",
     "class-transformer": "^0.2.3",
     "class-validator": "^0.14.0",
     "connect-timeout": "^1.9.0",

redisinsight/api/src/__mocks__/feature.ts

@@ -182,12 +182,12 @@ export const mockFeatureSso = Object.assign(new Feature(), {
         redisStackPreview: [
           {
             provider: 'AWS',
-            regions: ['us-east-2', 'ap-southeast-1', 'sa-east-1']
+            regions: ['us-east-2', 'ap-southeast-1', 'sa-east-1'],
           },
           {
             provider: 'GCP',
-            regions: ['asia-northeast1', 'europe-west1', 'us-central1']
-          }
+            regions: ['asia-northeast1', 'europe-west1', 'us-central1'],
+          },
         ],
       },
     },

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

@@ -196,6 +196,10 @@ describe('AnalyticsService', () => {
         event: TelemetryEvents.ApplicationStarted,
         eventData: {},
         nonTracking: false,
+        traits: {
+          telemetry: 'will be overwritten',
+          custom: 'trait',
+        },
       });
 
       expect(mockAnalyticsPage).toHaveBeenCalledWith({
@@ -205,6 +209,7 @@ describe('AnalyticsService', () => {
         context: {
           traits: {
             telemetry: Telemetry.Enabled,
+            custom: 'trait',
           },
         },
         properties: {

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

@@ -13,6 +13,7 @@ export interface ITelemetryEvent {
   event: string;
   eventData: Object;
   nonTracking: boolean;
+  traits?: Object;
 }
 
 export interface ITelemetryInitEvent {
@@ -43,7 +44,7 @@ export class AnalyticsService {
 
   private appVersion: string = '2.0.0';
 
-  private analytics;
+  private analytics: Analytics;
 
   constructor(
     private settingsService: SettingsService,
@@ -80,7 +81,9 @@ export class AnalyticsService {
       // for analytics is granted or not.
       // If permissions not granted
       // anonymousId will includes "00000000-0000-0000-0000-000000000001" value without any user identifiers.
-      const { event, eventData, nonTracking } = payload;
+      const {
+        event, eventData, nonTracking, traits = {},
+      } = payload;
       const isAnalyticsGranted = await this.checkIsAnalyticsGranted();
 
       if (isAnalyticsGranted || nonTracking) {
@@ -90,8 +93,9 @@ export class AnalyticsService {
           event,
           context: {
             traits: {
+              ...traits,
               telemetry: isAnalyticsGranted ? Telemetry.Enabled : Telemetry.Disabled,
-            }
+            },
           },
           properties: {
             ...eventData,
@@ -118,7 +122,9 @@ export class AnalyticsService {
       // user in any way. When `nonTracking` is True, the event is sent regardless of whether the user's permission
       // for analytics is granted or not.
       // If permissions not granted anonymousId includes "UNSET" value without any user identifiers.
-      const { event, eventData, nonTracking } = payload;
+      const {
+        event, eventData, nonTracking, traits = {},
+      } = payload;
       const isAnalyticsGranted = await this.checkIsAnalyticsGranted();
 
       if (isAnalyticsGranted || nonTracking) {
@@ -128,8 +134,9 @@ export class AnalyticsService {
           integrations: { Amplitude: { session_id: this.sessionId } },
           context: {
             traits: {
+              ...traits,
               telemetry: isAnalyticsGranted ? Telemetry.Enabled : Telemetry.Disabled,
-            }
+            },
           },
           properties: {
             ...eventData,

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

@@ -36,4 +36,13 @@ export class SendEventDto {
   @IsOptional()
   @IsBoolean()
   nonTracking: boolean = false;
+
+  @ApiPropertyOptional({
+    description: 'User data.',
+    type: Object,
+    example: { telemetry: true },
+  })
+  @IsOptional()
+  @ValidateNested()
+  traits: Object = {};
 }

redisinsight/api/src/modules/browser/utils/clusterCursor.spec.ts

@@ -15,6 +15,7 @@ const isClusterCursorValidTests = [
   },
   { input: '172.17.0.1:7001@-1', expected: true },
   { input: 'domain.com:7001@-1', expected: true },
+  { input: 'domain-with-hyphens.com:7001@-1', expected: true },
   { input: '172.17.0.1:7001@1228822', expected: true },
   { input: '172.17.0.1:7001@', expected: false },
   { input: '172.17.0.1:7001@text', expected: false },

redisinsight/api/src/modules/browser/utils/clusterCursor.ts

@@ -4,7 +4,7 @@ import { IGetNodeKeysResult } from 'src/modules/browser/services/keys-business/s
 const NODES_SEPARATOR = '||';
 const CURSOR_SEPARATOR = '@';
 // Correct format 172.17.0.1:7001@-1||172.17.0.1:7002@33
-const CLUSTER_CURSOR_REGEX = /^(([a-z0-9.])+:[0-9]+(@-?\d+)(?:\|{2}(?!$)|$))+$/;
+const CLUSTER_CURSOR_REGEX = /^(([a-z0-9.-])+:[0-9]+(@-?\d+)(?:\|{2}(?!$)|$))+$/;
 
 export const isClusterCursorValid = (cursor) => CLUSTER_CURSOR_REGEX.test(cursor);