Merge pull request #2122 from RedisInsight/feature/RI-4399-beta_features

Feature/ri 4399 beta features

Author: vlad-dargel

.github/CODEOWNERS

@@ -1,3 +1,4 @@
 # Add reviewers for the most sensitive folders
 /.github/ [email protected] [email protected]
 /.circleci/ [email protected] [email protected]
+/redisinsight/api/config/features-config.json [email protected] [email protected] [email protected]

.gitignore

@@ -59,6 +59,8 @@ vendor
 
 # E2E tests report
 /tests/e2e/report
+/tests/e2e/results
+/tests/e2e/remote
 /tests/e2e/.redisinsight-v2
 
 # Parcel

redisinsight/api/config/default.ts

@@ -195,12 +195,18 @@ export default {
     },
   ],
   connections: {
-    timeout: parseInt(process.env.CONNECTIONS_TIMEOUT_DEFAULT, 10) || 30 * 1_000 // 30 sec
+    timeout: parseInt(process.env.CONNECTIONS_TIMEOUT_DEFAULT, 10) || 30 * 1_000, // 30 sec
   },
   redisStack: {
     id: process.env.BUILD_TYPE === 'REDIS_STACK' ? process.env.REDIS_STACK_DATABASE_ID || 'redis-stack' : undefined,
     name: process.env.REDIS_STACK_DATABASE_NAME,
     host: process.env.REDIS_STACK_DATABASE_HOST,
     port: process.env.REDIS_STACK_DATABASE_PORT,
   },
+  features_config: {
+    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
+  },
 };

redisinsight/api/config/features-config.json

@@ -0,0 +1,21 @@
+{
+  "version": 1,
+  "features": {
+    "insightsRecommendations": {
+      "flag": true,
+      "perc": [],
+      "filters": [
+        {
+          "name": "agreements.analytics",
+          "value": true,
+          "cond": "eq"
+        },
+        {
+          "name": "config.server.buildType",
+          "value": "ELECTRON",
+          "cond": "eq"
+        }
+      ]
+    }
+  }
+}

redisinsight/api/config/ormconfig.ts

@@ -15,6 +15,8 @@ import { DatabaseEntity } from 'src/modules/database/entities/database.entity';
 import { SshOptionsEntity } from 'src/modules/ssh/entities/ssh-options.entity';
 import { BrowserHistoryEntity } from 'src/modules/browser/entities/browser-history.entity';
 import { CustomTutorialEntity } from 'src/modules/custom-tutorial/entities/custom-tutorial.entity';
+import { FeatureEntity } from 'src/modules/feature/entities/feature.entity';
+import { FeaturesConfigEntity } from 'src/modules/feature/entities/features-config.entity';
 import migrations from '../migration';
 import * as config from '../src/utils/config';
 
@@ -40,6 +42,8 @@ const ormConfig = {
     BrowserHistoryEntity,
     SshOptionsEntity,
     CustomTutorialEntity,
+    FeatureEntity,
+    FeaturesConfigEntity,
   ],
   migrations,
 };

redisinsight/api/config/test.ts

@@ -1,12 +1,21 @@
 export default {
   server: {
     env: 'test',
-    requestTimeout: 1000,
+    requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 1000,
+  },
+  db: {
+    synchronize: process.env.DB_SYNC ? process.env.DB_SYNC === 'true' : true,
+    migrationsRun: process.env.DB_MIGRATIONS ? process.env.DB_MIGRATIONS === 'true' : false,
   },
   profiler: {
     logFileIdleThreshold: parseInt(process.env.PROFILER_LOG_FILE_IDLE_THRESHOLD, 10) || 1000 * 2, // 3sec
   },
   notifications: {
-    updateUrl: 'https://s3.amazonaws.com/redisinsight.test/public/tests/notifications.json',
+    updateUrl: process.env.NOTIFICATION_UPDATE_URL
+      || 'https://s3.amazonaws.com/redisinsight.test/public/tests/notifications.json',
+  },
+  features_config: {
+    url: process.env.RI_FEATURES_CONFIG_URL
+      || 'http://localhost:5551/remote/features-config.json',
   },
 };

redisinsight/api/migration/1684931530343-feature.ts

@@ -0,0 +1,16 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class Feature1684931530343 implements MigrationInterface {
+    name = 'Feature1684931530343'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "features" ("name" varchar PRIMARY KEY NOT NULL, "flag" boolean NOT NULL)`);
+        await queryRunner.query(`CREATE TABLE "features_config" ("id" varchar PRIMARY KEY NOT NULL, "controlNumber" float, "data" varchar NOT NULL, "updatedAt" datetime NOT NULL DEFAULT (datetime('now')))`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP TABLE "features_config"`);
+        await queryRunner.query(`DROP TABLE "features"`);
+    }
+
+}

redisinsight/api/migration/index.ts

@@ -31,6 +31,7 @@ import { databaseCompressor1678182722874 } from './1678182722874-database-compre
 import { customTutorials1677135091633 } from './1677135091633-custom-tutorials';
 import { databaseRecommendations1681900503586 } from './1681900503586-database-recommendations';
 import { databaseRecommendationParams1683006064293 } from './1683006064293-database-recommendation-params';
+import { Feature1684931530343 } from './1684931530343-feature';
 
 export default [
   initialMigration1614164490968,
@@ -66,4 +67,5 @@ export default [
   customTutorials1677135091633,
   databaseRecommendations1681900503586,
   databaseRecommendationParams1683006064293,
+  Feature1684931530343,
 ];

redisinsight/api/package.json

@@ -31,7 +31,7 @@
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand -w 1",
     "test:e2e": "jest --config ./test/jest-e2e.json -w 1",
     "typeorm": "ts-node -r tsconfig-paths/register ./node_modules/typeorm/cli.js -d ./config/ormconfig.ts",
-    "test:api": "ts-mocha --paths -p test/api/api.tsconfig.json --config ./test/api/.mocharc.yml",
+    "test:api": "cross-env NODE_ENV=test ts-mocha --paths -p test/api/api.tsconfig.json --config ./test/api/.mocharc.yml",
     "test:api:cov": "nyc --reporter=html --reporter=text --reporter=text-summary yarn run test:api",
     "test:api:ci:cov": "nyc -r text -r text-summary -r html yarn run test:api --reporter mocha-multi-reporters --reporter-options configFile=test/api/reporters.json && nyc merge .nyc_output ./coverage/test-run-coverage.json",
     "typeorm:migrate": "cross-env NODE_ENV=staging yarn typeorm migration:generate ./migration/migration",

redisinsight/api/src/__mocks__/common.ts

@@ -61,6 +61,7 @@ export const mockRepository = jest.fn(() => ({
   save: jest.fn(),
   insert: jest.fn(),
   update: jest.fn(),
+  upsert: jest.fn(),
   delete: jest.fn(),
   remove: jest.fn(),
   createQueryBuilder: mockCreateQueryBuilder,