Merge branch 'main' into feature/RI-4617-sign-in-users

# Conflicts:
#	redisinsight/ui/src/constants/dbAnalysisRecommendations.json
#	redisinsight/ui/src/pages/databaseAnalysis/components/recommendations-view/Recommendations.tsx
#	redisinsight/ui/src/slices/interfaces/content.ts
#	redisinsight/ui/src/utils/recommendation/utils.tsx
#	redisinsight/ui/src/utils/tests/recommendation/utils.spec.tsx
#	tests/e2e/tests/critical-path/triggers-and-functions/libraries.e2e.ts

Author: egor-zalenski

electron-builder.json

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

package.json

@@ -82,7 +82,9 @@
     "**/node-sass": "^8.0.0",
     "**/trim": "0.0.3",
     "word-wrap": "1.2.4",
-    "electron-builder/app-builder-lib/@electron/universal/dir-compare/minimatch": "^3.0.5"
+    "electron-builder/app-builder-lib/@electron/universal/dir-compare/minimatch": "^3.0.5",
+    "**/semver": "^7.5.2",
+    "rawproto/protobufjs": "^7.2.4"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",

redisinsight/api/package.json

@@ -41,7 +41,8 @@
     "nanoid": "^3.1.31",
     "word-wrap": "1.2.4",
     "mocha/minimatch": "^3.0.5",
-    "@nestjs/platform-socket.io/socket.io": "^4.7.1"
+    "@nestjs/platform-socket.io/socket.io": "^4.7.1",
+    "**/semver": "^7.5.2"
   },
   "dependencies": {
     "@nestjs/common": "^9.0.11",

redisinsight/api/src/__mocks__/feature.ts

@@ -18,6 +18,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

@@ -86,6 +86,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()),
     });
 

redisinsight/api/yarn.lock

@@ -7446,34 +7446,7 @@ schema-utils@^3.1.1, schema-utils@^3.1.2:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-"semver@2 || 3 || 4 || 5":
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-[email protected], semver@^7.2.1, semver@^7.3.5, semver@^7.3.8:
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0"
-  integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^5.5.0:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
-  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
-
-semver@^6.0.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-semver@^6.3.1:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
-  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-
-semver@^7.3.2:
+"semver@2 || 3 || 4 || 5", [email protected], semver@^5.5.0, semver@^6.0.0, semver@^6.3.0, semver@^6.3.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.5, semver@^7.3.8, semver@^7.5.2:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==