Merge pull request #3199 from RedisInsight/feature/dynamic-dependencies

Feature/dynamic dependencies

Author: ArtemHoruzhenko

redisinsight/api/config/default.ts

@@ -112,6 +112,7 @@ export default {
   redis_scan: {
     countDefault: parseInt(process.env.RI_SCAN_COUNT_DEFAULT, 10) || 200,
     countThreshold: parseInt(process.env.RI_SCAN_COUNT_THRESHOLD, 10) || 10000,
+    countThresholdMax: parseInt(process.env.RI_SCAN_COUNT_THRESHOLD_MAX, 10) || Number.MAX_VALUE,
   },
   modules: {
     json: {
@@ -218,7 +219,8 @@ export default {
     timeout: parseInt(process.env.RI_CONNECTIONS_TIMEOUT_DEFAULT, 10) || 30 * 1_000, // 30 sec
   },
   redisStack: {
-    id: process.env.RI_BUILD_TYPE === 'REDIS_STACK' ? process.env.RI_REDIS_STACK_DATABASE_ID || 'redis-stack' : undefined,
+    id: process.env.RI_BUILD_TYPE === 'REDIS_STACK'
+      ? process.env.RI_REDIS_STACK_DATABASE_ID || 'redis-stack' : undefined,
     name: process.env.RI_REDIS_STACK_DATABASE_NAME,
     host: process.env.RI_REDIS_STACK_DATABASE_HOST,
     port: process.env.RI_REDIS_STACK_DATABASE_PORT,

redisinsight/api/src/__mocks__/browser-history.ts

@@ -16,7 +16,7 @@ export const mockBrowserHistoryService = () => ({
   bulkDelete: jest.fn(),
 });
 
-export const mockBrowserHistoryProvider = jest.fn(() => ({
+export const mockBrowserHistoryRepository = jest.fn(() => ({
   create: jest.fn(),
   get: jest.fn(),
   list: jest.fn(),

redisinsight/api/src/__mocks__/common.ts

@@ -1,12 +1,14 @@
 import { ClientContext, ClientMetadata, SessionMetadata } from 'src/common/models';
 import { mockDatabase } from 'src/__mocks__/databases';
 import { v4 as uuidv4 } from 'uuid';
+import { mockUserId } from 'src/__mocks__/user';
 
 export type MockType<T> = {
   [P in keyof T]: jest.Mock<any>;
 };
 
 export const mockQueryBuilderWhere = jest.fn().mockReturnThis();
+export const mockQueryBuilderSelect = jest.fn().mockReturnThis();
 export const mockQueryBuilderGetOne = jest.fn();
 export const mockQueryBuilderGetMany = jest.fn();
 export const mockQueryBuilderGetManyRaw = jest.fn();
@@ -17,7 +19,7 @@ export const mockCreateQueryBuilder = jest.fn(() => ({
   where: mockQueryBuilderWhere,
   orWhere: mockQueryBuilderWhere,
   update: jest.fn().mockReturnThis(),
-  select: jest.fn().mockReturnThis(),
+  select: mockQueryBuilderSelect,
   set: jest.fn().mockReturnThis(),
   orderBy: jest.fn().mockReturnThis(),
   groupBy: jest.fn().mockReturnThis(),
@@ -52,10 +54,16 @@ export const mockRepository = jest.fn(() => ({
 }));
 
 export const mockSessionMetadata: SessionMetadata = {
-  userId: uuidv4(),
+  userId: mockUserId,
   sessionId: uuidv4(),
 };
 
+export const mockClientMetadata: ClientMetadata = {
+  sessionMetadata: mockSessionMetadata,
+  databaseId: mockDatabase.id,
+  context: ClientContext.Common,
+};
+
 export const mockCliClientMetadata: ClientMetadata = {
   sessionMetadata: mockSessionMetadata,
   databaseId: mockDatabase.id,

redisinsight/api/src/__mocks__/constants.ts

@@ -0,0 +1,5 @@
+import { mockSessionMetadata } from 'src/__mocks__/common';
+
+export const mockConstantsProvider = jest.fn(() => ({
+  getSystemSessionMetadata: jest.fn().mockReturnValue(mockSessionMetadata),
+}));

redisinsight/api/src/__mocks__/database-recommendation.ts

@@ -10,7 +10,7 @@ export const mockRecommendationName = 'string';
 
 export const mockDatabaseRecommendationParamsEncrypted = 'recommendation.params_ENCRYPTED';
 
-export const mockDatabaseRecommendationParamsPlain = [];
+export const mockDatabaseRecommendationParamsPlain = {};
 
 export const mockDatabaseRecommendation = Object.assign(new DatabaseRecommendation(), {
   id: mockDatabaseRecommendationId,
@@ -40,3 +40,23 @@ export const mockDatabaseRecommendationService = () => ({
 export const mockDatabaseRecommendationProvider = jest.fn(() => ({
   getStrategy: jest.fn(),
 }));
+
+export const mockDatabaseRecommendationRepository = jest.fn(() => ({
+  create: jest.fn(),
+  list: jest.fn(),
+  read: jest.fn(),
+  update: jest.fn(),
+  isExist: jest.fn(),
+  get: jest.fn(),
+  sync: jest.fn(),
+  delete: jest.fn(),
+  getTotalUnread: jest.fn(),
+}));
+
+export const mockRecommendationScanner = jest.fn(() => ({
+  determineRecommendation: jest.fn(),
+}));
+
+export const mockDatabaseRecommendationAnalytics = jest.fn(() => ({
+  sendCreatedRecommendationEvent: jest.fn(),
+}));

redisinsight/api/src/__mocks__/databases.ts

@@ -8,7 +8,6 @@ import { mockSentinelMasterDto } from 'src/__mocks__/redis-sentinel';
 import { pick } from 'lodash';
 import { RedisDatabaseInfoResponse } from 'src/modules/database/dto/redis-info.dto';
 import { DatabaseOverview } from 'src/modules/database/models/database-overview';
-import { ClientContext, ClientMetadata } from 'src/common/models';
 import {
   mockSshOptionsBasic,
   mockSshOptionsBasicEntity,
@@ -207,12 +206,6 @@ export const mockNewDatabase = Object.assign(new Database(), {
   new: true,
 });
 
-export const mockClientMetadata: ClientMetadata = {
-  sessionMetadata: undefined,
-  databaseId: mockDatabase.id,
-  context: ClientContext.Common,
-};
-
 export const mockDatabaseOverview: DatabaseOverview = {
   version: '6.2.4',
   usedMemory: 1,

redisinsight/api/src/__mocks__/index.ts

@@ -2,6 +2,7 @@ export * from './ai';
 export * from './certificates';
 export * from './commands';
 export * from './common';
+export * from './constants';
 export * from './encryption';
 export * from './errors';
 // export * from './redis-databases';
@@ -27,6 +28,7 @@ export * from './ssh';
 export * from './browser-history';
 export * from './database-recommendation';
 export * from './feature';
+export * from './notification';
 export * from './cloud-autodiscovery';
 export * from './cloud-capi-key';
 export * from './cloud-database';

redisinsight/api/src/__mocks__/notification.ts

@@ -0,0 +1,66 @@
+import { NotificationEntity } from 'src/modules/notification/entities/notification.entity';
+import { NotificationType } from 'src/modules/notification/constants';
+import { Notification } from 'src/modules/notification/models/notification';
+import { NotificationsDto } from 'src/modules/notification/dto';
+
+export const mockGlobalNotificationsJson = {
+  notifications: [
+    {
+      title: 'RedisGraph End of Life',
+      body: 'Redis Inc. has announced the end-of-life of <b>RedisGraph</b>. '
+        + 'We will carry out the process gradually, and in accordance with our commitment to our customers. '
+        + '<p> If you are using RedisGraph - please read the '
+        + '<a href="https://redis.com/blog/redisgraph-eol" target="_blank">following</a> carefully.',
+      category: 'important',
+      categoryColor: '#800D0D',
+      timestamp: 1688549037,
+    },
+    {
+      title: 'Missing a feature or found a bug?',
+      body: 'Would you like to see specific features added or have a bug to report? '
+        + '<p>'
+        + ' <a href="https://github.com/RedisInsight/RedisInsight/issues" target="_blank">Share</a> '
+        + 'it with us! <p> '
+        + 'And <b>star</b> the repository if you like RedisInsight!',
+      category: 'feedback',
+      categoryColor: '#330D80',
+      timestamp: 1662381434,
+    },
+  ],
+};
+
+export const mockNotification1 = Object.assign(new Notification(), {
+  ...mockGlobalNotificationsJson.notifications[0],
+  type: NotificationType.Global,
+  read: true,
+});
+
+export const mockNotification1Entity = Object.assign(new NotificationEntity(), mockNotification1);
+
+export const mockNotification1UPD = Object.assign(new Notification(), {
+  ...mockNotification1,
+  title: 'UPD RedisGraph End of Life',
+});
+
+export const mockNotification1UPDEntity = Object.assign(new NotificationEntity(), mockNotification1UPD);
+
+export const mockNotification2 = Object.assign(new Notification(), {
+  ...mockGlobalNotificationsJson.notifications[1],
+  type: NotificationType.Global,
+  read: false,
+});
+export const mockNotification2Entity = Object.assign(new NotificationEntity(), mockNotification2);
+
+export const mockNotificationsDto = Object.assign(new NotificationsDto(), {
+  notifications: [mockNotification1, mockNotification2],
+  totalUnread: 1,
+});
+
+export const mockNotificationRepository = jest.fn(() => ({
+  getNotifications: jest.fn().mockResolvedValue([mockNotification1Entity, mockNotification2Entity]),
+  getTotalUnread: jest.fn().mockResolvedValue(mockNotificationsDto.totalUnread),
+  readNotifications: jest.fn().mockResolvedValue([]),
+  insertNotifications: jest.fn(),
+  getGlobalNotifications: jest.fn(),
+  deleteGlobalNotifications: jest.fn(),
+}));

redisinsight/api/src/__mocks__/redis-client.ts

@@ -2,6 +2,8 @@ import { ClientMetadata } from 'src/common/models';
 import { RedisClient, RedisClientConnectionType } from 'src/modules/redis/client';
 import { RedisClientLib } from 'src/modules/redis/redis.client.factory';
 import { mockCommonClientMetadata } from 'src/__mocks__/common';
+import { BadRequestException } from '@nestjs/common';
+import ERROR_MESSAGES from 'src/constants/error-messages';
 
 export interface IRedisClientInstance {
   id: string,
@@ -10,6 +12,9 @@ export interface IRedisClientInstance {
   lastTimeUsed: number;
 }
 
+export const mockInvalidClientMetadataError = new BadRequestException(ERROR_MESSAGES.INVALID_CLIENT_METADATA);
+export const mockInvalidSessionMetadataError = new BadRequestException(ERROR_MESSAGES.INVALID_SESSION_METADATA);
+
 // todo: NEW. remove everything above
 export class MockRedisClient extends RedisClient {
   constructor(clientMetadata: ClientMetadata, client: any = jest.fn(), options = {}) {

redisinsight/api/src/app.module.ts

@@ -36,6 +36,7 @@ import { ExcludeRouteMiddleware } from './middleware/exclude-route.middleware';
 import SubpathProxyMiddleware from './middleware/subpath-proxy.middleware';
 import XFrameOptionsMiddleware from './middleware/x-frame-options.middleware';
 import { routes } from './app.routes';
+import { RedisConnectionMiddleware, redisConnectionControllers } from './middleware/redis-connection';
 
 const SERVER_CONFIG = config.get('server') as Config['server'];
 const PATH_CONFIG = config.get('dir_path') as Config['dir_path'];
@@ -53,15 +54,15 @@ const setXFrameOptionsHeader = (res: Response) => {
     RedisEnterpriseModule,
     CloudModule.register(),
     RedisSentinelModule,
-    BrowserModule,
+    BrowserModule.register(),
     CliModule,
     WorkbenchModule.register(),
     PluginModule,
     CommandsModule,
     ProfilerModule,
     PubSubModule,
     SlowLogModule,
-    NotificationModule,
+    NotificationModule.register(),
     BulkActionsModule,
     ClusterMonitorModule,
     CustomTutorialModule.register(),
@@ -102,7 +103,7 @@ const setXFrameOptionsHeader = (res: Response) => {
         setHeaders: setXFrameOptionsHeader,
       },
     }),
-    StaticsManagementModule,
+    StaticsManagementModule.register(),
   ],
   controllers: [],
   providers: [],
@@ -137,5 +138,9 @@ export class AppModule implements OnModuleInit, NestModule {
       .forRoutes(
         ...SERVER_CONFIG.excludeRoutes,
       );
+
+    consumer
+      .apply(RedisConnectionMiddleware)
+      .forRoutes(...redisConnectionControllers);
   }
 }