Merge branch 'main' into fe/bugfix/RI-4825-fix-deleting-key

# Conflicts:
#	redisinsight/ui/src/pages/browser/BrowserPage.tsx
#	redisinsight/ui/src/pages/browser/components/browser-left-panel/BrowserLeftPanel.tsx
#	redisinsight/ui/src/pages/browser/components/key-tree/KeyTree.tsx

Author: rsergeenko

electron-builder.json

@@ -99,6 +99,11 @@
       "Redis Labs Inc."
     ]
   },
+  "nsis": {
+    "oneClick": false,
+    "perMachine": false,
+    "allowToChangeInstallationDirectory": true
+  },
   "linux": {
     "icon": "./resources/icons",
     "target": [

redisinsight/api/src/__mocks__/feature.ts

@@ -17,6 +17,7 @@ export const mockFeaturesConfigId = '1';
 export const mockFeaturesConfigVersion = defaultConfig.version + 0.111;
 export const mockControlNumber = 7.68;
 export const mockControlGroup = '7';
+export const mockAppVersion = '2.1.0';
 
 export const mockFeaturesConfigJson = {
   version: mockFeaturesConfigVersion,

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

@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import {
   mockAppSettings,
-  mockAppSettingsWithoutPermissions, mockControlGroup, mockControlNumber,
+  mockAppSettingsWithoutPermissions, mockAppVersion, mockControlGroup, mockControlNumber,
   mockSettingsService,
   MockType,
 } from 'src/__mocks__';
@@ -59,6 +59,7 @@ describe('AnalyticsService', () => {
         appType: AppType.Electron,
         controlNumber: mockControlNumber,
         controlGroup: mockControlGroup,
+        appVersion: mockAppVersion,
       });
 
       const anonymousId = service.getAnonymousId();
@@ -76,6 +77,7 @@ describe('AnalyticsService', () => {
         appType: AppType.Electron,
         controlNumber: mockControlNumber,
         controlGroup: mockControlGroup,
+        appVersion: mockAppVersion,
       });
     });
     it('should send event with anonymousId if permission are granted', async () => {
@@ -95,6 +97,7 @@ describe('AnalyticsService', () => {
           buildType: AppType.Electron,
           controlNumber: mockControlNumber,
           controlGroup: mockControlGroup,
+          appVersion: mockAppVersion,
         },
       });
     });
@@ -126,6 +129,7 @@ describe('AnalyticsService', () => {
           buildType: AppType.Electron,
           controlNumber: mockControlNumber,
           controlGroup: mockControlGroup,
+          appVersion: mockAppVersion,
         },
       });
     });

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

@@ -21,6 +21,7 @@ export interface ITelemetryInitEvent {
   appType: string;
   controlNumber: number;
   controlGroup: string;
+  appVersion: string;
 }
 
 @Injectable()
@@ -35,6 +36,8 @@ export class AnalyticsService {
 
   private controlGroup: string = '-1';
 
+  private appVersion: string = '2.0.0';
+
   private analytics;
 
   constructor(
@@ -48,12 +51,13 @@ export class AnalyticsService {
   @OnEvent(AppAnalyticsEvents.Initialize)
   public initialize(payload: ITelemetryInitEvent) {
     const {
-      anonymousId, sessionId, appType, controlNumber, controlGroup,
+      anonymousId, sessionId, appType, controlNumber, controlGroup, appVersion,
     } = payload;
     this.sessionId = sessionId;
     this.anonymousId = anonymousId;
     this.appType = appType;
     this.controlGroup = controlGroup;
+    this.appVersion = appVersion;
     this.controlNumber = controlNumber;
     this.analytics = new Analytics(ANALYTICS_CONFIG.writeKey, {
       flushInterval: ANALYTICS_CONFIG.flushInterval,
@@ -87,6 +91,7 @@ export class AnalyticsService {
             buildType: this.appType,
             controlNumber: this.controlNumber,
             controlGroup: this.controlGroup,
+            appVersion: this.appVersion,
           },
         });
       }

redisinsight/api/src/modules/profiler/profiler.controller.ts

@@ -24,6 +24,7 @@ export class ProfilerController {
 
     res.setHeader('Content-Type', 'application/octet-stream');
     res.setHeader('Content-Disposition', `attachment;filename="${filename}.txt"`);
+    res.setHeader('Access-Control-Expose-Headers', 'Content-Disposition');
 
     stream
       .on('error', () => res.status(404).send())

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

@@ -90,6 +90,7 @@ describe('ServerService', () => {
           anonymousId: mockServer.id,
           sessionId,
           appType: SERVER_CONFIG.buildType,
+          appVersion: SERVER_CONFIG.appVersion,
           controlNumber: mockControlNumber,
           controlGroup: mockControlGroup,
         },

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

@@ -52,6 +52,7 @@ export class ServerService implements OnApplicationBootstrap {
       anonymousId: server.id,
       sessionId: this.sessionId,
       appType: ServerService.getAppType(SERVER_CONFIG.buildType),
+      appVersion: SERVER_CONFIG.appVersion,
       ...(await this.featuresConfigService.getControlInfo()),
     });