Merge branch 'main' into feature/RI-5402-ai-assistant

# Conflicts:
#	redisinsight/ui/src/constants/links.ts

Author: rsergeenko

README.md

@@ -20,18 +20,19 @@ Redis Insight is an intuitive and efficient GUI for Redis, allowing you to inter
 ### Redis Insight Highlights:
 
 * Browse, filter, visualise your key-value Redis data structures and see key values in different formats (including JSON, Hex, ASCII, etc.)
-* CRUD support for Lists, Hashes, Strings, Sets, Sorted Sets, and Streams
-* CRUD support for [RedisJSON](https://redis.io/json/)
+* CRUD support for lists, hashes, strings, sets, sorted sets, and streams
+* CRUD support for [JSON](https://redis.io/json/) data structure
 * Interactive tutorials to learn easily, among other things, how to leverage the native JSON data structure supporting structured querying and full-text search, including vector similarity search for your AI use cases
 * Contextualised recommendations to optimize performance and memory usage. The list of recommendations gets updated as you interact with your database
 * Profiler - analyze every command sent to Redis in real-time
 * SlowLog - analyze slow operations in Redis instances based on the [Slowlog](https://github.com/RedisInsight/RedisInsight/releases#:~:text=results%20of%20the-,Slowlog,-command%20to%20analyze) command
 * Pub/Sub - support for [Redis pub/sub](https://redis.io/docs/latest/develop/interact/pubsub/), enabling subscription to channels and posting messages to channels
 * Bulk actions - Delete the keys in bulk based on the filters set in Browser or Tree view
 * Workbench - advanced command line interface with intelligent command auto-complete, complex data visualizations and support for the raw mode
-* Command auto-complete support for [RediSearch](https://redis.io/search/), [RedisJSON](https://redis.io/json/), [RedisTimeSeries](https://redis.io/timeseries/)
-* Visualizations of your [RediSearch](https://redis.io/search/) index, queries, and aggregations. Ability to build [your own data visualization plugins](https://github.com/RedisInsight/Packages)
-* Officially supported for Redis OSS, [Redis Cloud](https://redis.io/cloud/). Works with Microsoft Azure Cache for Redis (official support upcoming)
+* Command auto-complete support for [search and query](https://redis.io/search/) capability, [JSON](https://redis.io/json/) and [time series](https://redis.io/timeseries/) data structures
+* Visualizations of your [search and query](https://redis.io/search/) indexes and results.
+* Ability to build [your own data visualization plugins](https://github.com/RedisInsight/Packages)
+* Officially supported for Redis OSS, [Redis Cloud](https://redis.io/cloud/). Works with Microsoft Azure Cache for Redis
 
 Check out the [release notes](https://github.com/RedisInsight/RedisInsight/releases). 
 

package.json

@@ -40,7 +40,7 @@
     "start:preload": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./configs/webpack.config.preload.dev.ts",
     "test": "jest ./redisinsight/ui -w 1",
     "test:watch": "jest ./redisinsight/ui --watch -w 1",
-    "test:cov": "jest ./redisinsight/ui --silent --coverage --no-cache --forceExit -w 3",
+    "test:cov": "cross-env NODE_OPTIONS='' jest ./redisinsight/ui --silent --coverage --no-cache --forceExit -w 3",
     "test:cov:unit": "jest ./redisinsight/ui --group=-component --coverage -w 1",
     "test:cov:component": "jest ./redisinsight/ui --group=component --coverage -w 1",
     "type-check:ui": "tsc --project redisinsight/ui --noEmit"
@@ -82,8 +82,7 @@
     "word-wrap": "1.2.4",
     "electron-builder/app-builder-lib/@electron/universal/dir-compare/minimatch": "^3.0.5",
     "**/semver": "^7.5.2",
-    "rawproto/protobufjs": "^7.2.4",
-    "**/follow-redirects": "^1.15.4"
+    "rawproto/protobufjs": "^7.2.5"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.23.2",

redisinsight/api/data/manifest.json

@@ -9,7 +9,7 @@
     },
     {
       "path": "search",
-      "modules": ["search"]
+      "modules": ["search", "searchlight", "ft", "ftl"]
     }
   ]
 }

redisinsight/api/package.json

@@ -45,15 +45,15 @@
     "winston-daily-rotate-file/**/file-stream-rotator": "^1.0.0"
   },
   "dependencies": {
-    "@nestjs/common": "^9.0.11",
-    "@nestjs/core": "^9.0.11",
-    "@nestjs/event-emitter": "^1.3.1",
-    "@nestjs/platform-express": "^9.0.11",
-    "@nestjs/platform-socket.io": "^9.0.11",
+    "@nestjs/common": "^10.3.7",
+    "@nestjs/core": "^10.3.7",
+    "@nestjs/event-emitter": "^2.0.4",
+    "@nestjs/platform-express": "^10.3.7",
+    "@nestjs/platform-socket.io": "^10.3.7",
     "@nestjs/serve-static": "^3.0.0",
-    "@nestjs/swagger": "^6.1.2",
+    "@nestjs/swagger": "^7.3.1",
     "@nestjs/typeorm": "^9.0.1",
-    "@nestjs/websockets": "^9.0.11",
+    "@nestjs/websockets": "^10.3.7",
     "@okta/okta-auth-js": "^7.3.0",
     "adm-zip": "^0.5.9",
     "analytics-node": "^4.0.1",
@@ -74,7 +74,6 @@
     "jsonwebtoken": "^9.0.2",
     "keytar": "^7.9.0",
     "lodash": "^4.17.20",
-    "nest-router": "^1.0.9",
     "nest-winston": "^1.4.0",
     "nestjs-form-data": "^1.8.7",
     "node-version-compare": "^1.0.3",

redisinsight/api/src/__mocks__/bulk-actions.ts

@@ -92,4 +92,5 @@ export const mockBulkActionsAnalytics = () => ({
   sendActionStopped: jest.fn(),
   sendActionSucceed: jest.fn(),
   sendActionFailed: jest.fn(),
+  sendImportSamplesUploaded: jest.fn(),
 });

redisinsight/api/src/app.module.ts

@@ -3,7 +3,7 @@ import {
   MiddlewareConsumer, Module, NestModule, OnModuleInit,
 } from '@nestjs/common';
 import { ServeStaticModule } from '@nestjs/serve-static';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { join } from 'path';
 import config, { Config } from 'src/utils/config';
 import { PluginModule } from 'src/modules/plugin/plugin.module';
@@ -42,7 +42,7 @@ const PATH_CONFIG = config.get('dir_path') as Config['dir_path'];
   imports: [
     LocalDatabaseModule,
     CoreModule,
-    RouterModule.forRoutes(routes),
+    RouterModule.register(routes),
     AutodiscoveryModule,
     RedisEnterpriseModule,
     CloudModule.register(),

redisinsight/api/src/app.routes.ts

@@ -1,4 +1,3 @@
-import { Routes } from 'nest-router';
 import { CliModule } from 'src/modules/cli/cli.module';
 import { WorkbenchModule } from 'src/modules/workbench/workbench.module';
 import { SlowLogModule } from 'src/modules/slow-log/slow-log.module';
@@ -9,7 +8,7 @@ import { TriggeredFunctionsModule } from 'src/modules/triggered-functions/trigge
 import { BulkActionsModule } from 'src/modules/bulk-actions/bulk-actions.module';
 import { DatabaseRecommendationModule } from 'src/modules/database-recommendation/database-recommendation.module';
 
-export const routes: Routes = [
+export const routes = [
   {
     path: '/databases',
     children: [

redisinsight/api/src/constants/telemetry-events.ts

@@ -78,6 +78,7 @@ export enum TelemetryEvents {
   BulkActionsStopped = 'BULK_ACTIONS_STOPPED',
   BulkActionsSucceed = 'BULK_ACTIONS_SUCCEED',
   BulkActionsFailed = 'BULK_ACTIONS_FAILED',
+  ImportSamplesUploaded = 'IMPORT_SAMPLES_UPLOADED',
 
   // Feature
   FeatureFlagConfigUpdated = 'FEATURE_FLAG_CONFIG_UPDATED',

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

@@ -1,8 +1,9 @@
 import { isString } from 'lodash';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { HttpException } from '@nestjs/common';
+import { HttpException, Injectable } from '@nestjs/common';
 import { AppAnalyticsEvents } from 'src/constants';
 
+@Injectable()
 export abstract class TelemetryBaseService {
   constructor(
     protected readonly eventEmitter: EventEmitter2,

redisinsight/api/src/modules/browser/browser-history/browser-history.module.ts

@@ -1,5 +1,5 @@
 import { DynamicModule, Global, Module } from '@nestjs/common';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { BrowserHistoryService } from 'src/modules/browser/browser-history/browser-history.service';
 import { BrowserHistoryController } from 'src/modules/browser/browser-history/browser-history.controller';
 import { BrowserHistoryProvider } from 'src/modules/browser/browser-history/providers/browser-history.provider';
@@ -11,7 +11,7 @@ export class BrowserHistoryModule {
     return {
       module: BrowserHistoryModule,
       imports: [
-        RouterModule.forRoutes([{
+        RouterModule.register([{
           path: route,
           module: BrowserHistoryModule,
         }]),