Release/2.30.0 to latest

.circleci/config.yml

@@ -173,10 +173,10 @@ orbs:
 executors:
   linux-executor:
     machine:
-      image: ubuntu-2004:202010-01
+      image: ubuntu-2004:2023.04.2
   linux-executor-dlc:
     machine:
-      image: ubuntu-2004:202010-01
+      image: ubuntu-2004:2023.04.2
       docker_layer_caching: true
 
 jobs:
@@ -790,6 +790,9 @@ jobs:
           root: .
           paths:
             - ./docker-release
+      - store_artifacts:
+          path: docker-release
+          destination: docker-release
 
   # Release jobs
   store-build-artifacts:

.dockerignore

@@ -4,18 +4,15 @@
 .circleci
 .docker
 
-coverage
-dll
 **/node_modules
 release
 
-redisinsight/dist
-redisinsight/node_modules
-redisinsight/main.prod.js
-
-redisinsight/api/.nyc_output
-redisinsight/api/coverage
-redisinsight/api/dist
-redisinsight/api/node_modules
+**/dist
+**/coverage
+**/dll
+**/.issues
+**/.parcel-cache
+**/.temp_cache
+**/.nyc_output
 
-redisinsight/ui/dist
+redisinsight/main.prod.js

configs/webpack.config.renderer.dev.ts

@@ -232,7 +232,7 @@ const configuration: webpack.Configuration = {
 
     new ReactRefreshWebpackPlugin(),
 
-    new MonacoWebpackPlugin({ languages: ['json'], features: ['!rename'] }),
+    new MonacoWebpackPlugin({ languages: ['json', 'javascript', 'typescript'], features: ['!rename'] }),
 
     ...htmlPagesNames.map((htmlPageName) => (
       new HtmlWebpackPlugin({

configs/webpack.config.renderer.prod.ts

@@ -180,7 +180,7 @@ const configuration: webpack.Configuration = {
   },
 
   plugins: [
-    new MonacoWebpackPlugin({ languages: ['json'], features: ['!rename'] }),
+    new MonacoWebpackPlugin({ languages: ['json', 'javascript', 'typescript'], features: ['!rename'] }),
 
     new webpack.EnvironmentPlugin({
       NODE_ENV: 'production',

configs/webpack.config.web.common.ts

@@ -70,7 +70,7 @@ export default {
 
     new HtmlWebpackPlugin({ template: 'index.html.ejs' }),
 
-    new MonacoWebpackPlugin({ languages: ['json'], features: ['!rename'] }),
+    new MonacoWebpackPlugin({ languages: ['json', 'javascript', 'typescript'], features: ['!rename'] }),
 
     new webpack.IgnorePlugin({
       checkResource(resource) {

electron-builder.json

@@ -29,7 +29,7 @@
     "type": "distribution",
     "hardenedRuntime": true,
     "darkModeSupport": true,
-    "bundleVersion": "50",
+    "bundleVersion": "70",
     "icon": "resources/icon.icns",
     "artifactName": "${productName}-${os}-${arch}.${ext}",
     "entitlements": "resources/entitlements.mac.plist",

redisinsight/__mocks__/monacoMock.js

@@ -15,8 +15,10 @@ export default function MonacoEditor(props) {
         createContextKey: jest.fn(),
         focus: jest.fn(),
         onDidChangeCursorPosition: jest.fn(),
+        onDidAttemptReadOnlyEdit: jest.fn(),
         executeEdits: jest.fn(),
-        updateOptions: jest.fn()
+        updateOptions: jest.fn(),
+        setSelection: jest.fn(),
       },
       // monaco
       {
@@ -57,3 +59,7 @@ export const languages = {
     InsertAsSnippet: 4
   }
 }
+
+export const monaco = {
+  Selection: jest.fn().mockImplementation(() => { return {} })
+}

redisinsight/api/config/default.ts

@@ -58,7 +58,7 @@ export default {
     tlsKey: process.env.SERVER_TLS_KEY,
     staticContent: !!process.env.SERVER_STATIC_CONTENT || false,
     buildType: process.env.BUILD_TYPE || 'ELECTRON',
-    appVersion: process.env.APP_VERSION || '2.28.1',
+    appVersion: process.env.APP_VERSION || '2.30.0',
     requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],
@@ -195,6 +195,13 @@ export default {
       url: process.env.COMMANDS_REDISBLOOM_URL
         || 'https://raw.githubusercontent.com/RedisBloom/RedisBloom/master/commands.json',
     },
+    {
+      name: 'triggers_and_functions',
+      url: process.env.COMMANDS_TRIGGERS_AND_FUNCTIONS_URL
+        || 'https://raw.githubusercontent.com/RedisGears/RedisGears/master/commands.json',
+      defaultUrl: process.env.COMMANDS_TRIGGERS_AND_FUNCTIONS_DEFAULT_URL
+        || 'https://s3.amazonaws.com/redisinsight.download/public/commands/triggers_and_functions.json',
+    },
   ],
   connections: {
     timeout: parseInt(process.env.CONNECTIONS_TIMEOUT_DEFAULT, 10) || 30 * 1_000, // 30 sec

redisinsight/api/config/swagger.ts

@@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit<OpenAPIObject, 'paths'> = {
   info: {
     title: 'RedisInsight Backend API',
     description: 'RedisInsight Backend API',
-    version: '2.28.1',
+    version: '2.30.0',
   },
   tags: [],
 };

redisinsight/api/scripts/default-commands.ts

@@ -8,10 +8,10 @@ const COMMANDS_CONFIG = get('commands');
 
 async function init() {
   try {
-    await Promise.all(COMMANDS_CONFIG.map(async ({ name, url }) => {
+    await Promise.all(COMMANDS_CONFIG.map(async ({ name, url, defaultUrl }) => {
       try {
         console.log(`Trying to get ${name} commands...`);
-        const { data } = await axios.get(url, {
+        const { data } = await axios.get(defaultUrl || url, {
           responseType: 'text',
           transformResponse: [(raw) => raw],
         });

redisinsight/api/src/__mocks__/index.ts

@@ -24,3 +24,4 @@ export * from './browser-history';
 export * from './database-recommendation';
 export * from './feature';
 export * from './cloud-autodiscovery';
+export * from './triggered-functions';

redisinsight/api/src/__mocks__/triggered-functions.ts

@@ -0,0 +1,36 @@
+export const mockCommonLibraryReply = [
+  'api_version', '1.0',
+  'engine', 'js',
+  'configuration', null,
+  'name', 'libraryName',
+  'pending_jobs', 0,
+  'user', 'default',
+];
+
+export const mockSimpleLibraryReply = [
+  'api_version', '1.0',
+  'engine', 'js',
+  'configuration', null,
+  'functions', ['foo'],
+  'keyspace_triggers', ['keyspace'],
+  'cluster_functions', ['cluster'],
+  'stream_triggers', ['stream'],
+  'name', 'libraryName',
+  'pending_jobs', 0,
+  'user', 'default',
+];
+
+export const mockVerboseLibraryReply = [
+  'api_version', '1.0',
+  'engine', 'js',
+  'configuration', null,
+  'name', 'libraryName',
+  'pending_jobs', 0,
+  'user', 'default',
+  'functions', [['name', 'function', 'description', 'description', 'is_async', 1, 'flags', ['flag1']]],
+  'keyspace_triggers', [],
+  'cluster_functions', ['foo', 'bar'],
+  'stream_triggers', [[
+    'name', 'stream', 'description', 'description', 'prefix', 'prefix', 'trim', 0, 'window', 1, 'streams', [['key', 'value']],
+  ]],
+];

redisinsight/api/src/app.module.ts

@@ -15,6 +15,7 @@ import { NotificationModule } from 'src/modules/notification/notification.module
 import { BulkActionsModule } from 'src/modules/bulk-actions/bulk-actions.module';
 import { ClusterMonitorModule } from 'src/modules/cluster-monitor/cluster-monitor.module';
 import { DatabaseAnalysisModule } from 'src/modules/database-analysis/database-analysis.module';
+import { TriggeredFunctionsModule } from 'src/modules/triggered-functions/triggered-functions.module';
 import { ServerModule } from 'src/modules/server/server.module';
 import { LocalDatabaseModule } from 'src/local-database.module';
 import { CoreModule } from 'src/core.module';
@@ -59,6 +60,7 @@ const PATH_CONFIG = config.get('dir_path');
     CustomTutorialModule.register(),
     DatabaseAnalysisModule,
     DatabaseImportModule,
+    TriggeredFunctionsModule,
     ...(SERVER_CONFIG.staticContent
       ? [
         ServeStaticModule.forRoot({

redisinsight/api/src/app.routes.ts

@@ -6,6 +6,7 @@ import { SlowLogModule } from 'src/modules/slow-log/slow-log.module';
 import { PubSubModule } from 'src/modules/pub-sub/pub-sub.module';
 import { ClusterMonitorModule } from 'src/modules/cluster-monitor/cluster-monitor.module';
 import { DatabaseAnalysisModule } from 'src/modules/database-analysis/database-analysis.module';
+import { TriggeredFunctionsModule } from 'src/modules/triggered-functions/triggered-functions.module';
 import { BulkActionsModule } from 'src/modules/bulk-actions/bulk-actions.module';
 import { DatabaseRecommendationModule } from 'src/modules/database-recommendation/database-recommendation.module';
 
@@ -49,6 +50,10 @@ export const routes: Routes = [
         path: '/:dbInstance',
         module: DatabaseRecommendationModule,
       },
+      {
+        path: '/:dbInstance',
+        module: TriggeredFunctionsModule,
+      },
     ],
   },
 ];

redisinsight/api/src/common/constants/recommendations.ts

@@ -1,11 +1,11 @@
 export enum SearchVisualizationCommands {
-  FT_INFO = "FT.INFO",
-  FT_SEARCH = "FT.SEARCH",
-  FT_AGGREGATE = "FT.AGGREGATE",
-  FT_PROFILE = "FT.PROFILE",
-  FT_EXPLAIN = "FT.EXPLAIN",
-  TS_RANGE = "TS.RANGE",
-  TS_MRANGE = "TS.MRANGE",
+  FT_INFO = 'FT.INFO',
+  FT_SEARCH = 'FT.SEARCH',
+  FT_AGGREGATE = 'FT.AGGREGATE',
+  FT_PROFILE = 'FT.PROFILE',
+  FT_EXPLAIN = 'FT.EXPLAIN',
+  TS_RANGE = 'TS.RANGE',
+  TS_MRANGE = 'TS.MRANGE',
 }
 
 export const LUA_SCRIPT_RECOMMENDATION_COUNT = 10;
@@ -23,3 +23,4 @@ export const COMBINE_SMALL_STRINGS_TO_HASHES_RECOMMENDATION_KEYS_COUNT = 10;
 export const SEARCH_HASH_RECOMMENDATION_KEYS_FOR_CHECK = 50;
 export const SEARCH_HASH_RECOMMENDATION_KEYS_LENGTH = 2;
 export const RTS_KEYS_FOR_CHECK = 100;
+export const LUA_TO_FUNCTIONS_RECOMMENDATION_COUNT = 0;

redisinsight/api/src/constants/error-messages.ts

@@ -67,4 +67,5 @@ export default {
   INCREASE_MINIMUM_LIMIT: (count: string) => `Set MAXSEARCHRESULTS to at least ${count}.`,
   INVALID_WINDOW_ID: 'Invalid window id.',
   UNDEFINED_WINDOW_ID: 'Undefined window id.',
+  LIBRARY_NOT_EXIST: 'This library does not exist.',
 };

redisinsight/api/src/constants/recommendations.ts

@@ -1,5 +1,6 @@
 export const RECOMMENDATION_NAMES = Object.freeze({
   LUA_SCRIPT: 'luaScript',
+  LUA_TO_FUNCTIONS: 'luaToFunctions',
   BIG_HASHES: 'bigHashes',
   BIG_STRINGS: 'bigStrings',
   BIG_SETS: 'bigSets',
@@ -20,6 +21,8 @@ export const RECOMMENDATION_NAMES = Object.freeze({
   STRING_TO_JSON: 'stringToJson',
   SEARCH_VISUALIZATION: 'searchVisualization',
   SEARCH_HASH: 'searchHash',
+  FUNCTIONS_WITH_KEYSPACE: 'functionsWithKeyspace',
+  FUNCTIONS_WITH_STREAMS: 'functionsWithStreams',
 });
 
 export const ONE_NODE_RECOMMENDATIONS = [
@@ -37,4 +40,4 @@ export const REDIS_STACK = [
   RECOMMENDATION_NAMES.SEARCH_INDEXES,
   RECOMMENDATION_NAMES.SEARCH_JSON,
   RECOMMENDATION_NAMES.STRING_TO_JSON,
-]
+];

redisinsight/api/src/constants/redis-modules.ts

@@ -6,6 +6,7 @@ export enum AdditionalRedisModuleName {
   RedisJSON = 'ReJSON',
   RediSearch = 'search',
   RedisTimeSeries = 'timeseries',
+  'Triggers and Functions' = 'redisgears'
 }
 
 export enum AdditionalSearchModuleName {
@@ -14,6 +15,11 @@ export enum AdditionalSearchModuleName {
   FTL = 'ftl',
 }
 
+export enum AdditionalTriggersAndFunctionsModuleName {
+  TriggersAndFunctions = 'redisgears',
+  TriggersAndFunctions2 = 'redisgears_2',
+}
+
 export const SUPPORTED_REDIS_MODULES = Object.freeze({
   ai: AdditionalRedisModuleName.RedisAI,
   graph: AdditionalRedisModuleName.RedisGraph,
@@ -59,4 +65,9 @@ export const REDISEARCH_MODULES: string[] = [
   AdditionalSearchModuleName.SearchLight,
   AdditionalSearchModuleName.FT,
   AdditionalSearchModuleName.FTL,
-]
+];
+
+export const TRIGGERED_AND_FUNCTIONS_MODULES: string[] = [
+  AdditionalTriggersAndFunctionsModuleName.TriggersAndFunctions,
+  AdditionalTriggersAndFunctionsModuleName.TriggersAndFunctions2,
+];

redisinsight/api/src/modules/browser/services/keys-business/keys-business.service.spec.ts

@@ -224,12 +224,19 @@ describe('KeysBusinessService', () => {
         { keys: [getKeyInfoResponse.name] },
       );
 
+      expect(recommendationService.check).toBeCalledTimes(2);
       expect(recommendationService.check).toBeCalledWith(
         mockBrowserClientMetadata,
         RECOMMENDATION_NAMES.SEARCH_JSON,
         { keys: result, client: nodeClient, databaseId: mockBrowserClientMetadata.databaseId },
       );
-      expect(recommendationService.check).toBeCalledTimes(1);
+      expect(recommendationService.check).toBeCalledWith(
+        mockBrowserClientMetadata,
+        RECOMMENDATION_NAMES.FUNCTIONS_WITH_STREAMS,
+        { keys: result, client: nodeClient, databaseId: mockBrowserClientMetadata.databaseId },
+      );
+
+      expect(recommendationService.check).toBeCalledTimes(2);
     });
     it("user don't have required permissions for getKeyInfo", async () => {
       const replyError: ReplyError = {
@@ -322,7 +329,7 @@ describe('KeysBusinessService', () => {
       expect(browserHistory.create).not.toHaveBeenCalled();
     });
     it('should call recommendationService', async () => {
-      const response = [mockGetKeysWithDetailsResponse]
+      const response = [mockGetKeysWithDetailsResponse];
       standaloneScanner.getKeys = jest
         .fn()
         .mockResolvedValue(response);

redisinsight/api/src/modules/browser/services/keys-business/keys-business.service.ts

@@ -184,11 +184,18 @@ export class KeysBusinessService {
       const client = await this.browserTool.getRedisClient(clientMetadata);
       const scanner = this.scanner.getStrategy(client.isCluster ? ConnectionType.CLUSTER : ConnectionType.STANDALONE);
       const result = await scanner.getKeysInfo(client, dto.keys, dto.type);
+
       this.recommendationService.check(
         clientMetadata,
         RECOMMENDATION_NAMES.SEARCH_JSON,
         { keys: result, client, databaseId: clientMetadata.databaseId },
       );
+      this.recommendationService.check(
+        clientMetadata,
+        RECOMMENDATION_NAMES.FUNCTIONS_WITH_STREAMS,
+        { keys: result, client, databaseId: clientMetadata.databaseId },
+      );
+
       return plainToClass(GetKeyInfoResponse, result);
     } catch (error) {
       this.logger.error(`Failed to get keys info: ${error.message}.`);

redisinsight/api/src/modules/browser/services/redisearch/redisearch.service.ts

@@ -93,7 +93,7 @@ export class RedisearchService {
           );
         }
       } catch (error) {
-        if (!error.message?.includes('Unknown Index name')) {
+        if (!error.message?.toLowerCase()?.includes('unknown index name')) {
           throw error;
         }
       }

redisinsight/api/src/modules/cli/utils/getUnsupportedCommands.spec.ts

@@ -2,7 +2,7 @@ import { getUnsupportedCommands } from './getUnsupportedCommands';
 
 describe('cli unsupported commands', () => {
   it('should return correct list', () => {
-    const expectedResult = ['monitor', 'subscribe', 'psubscribe', 'ssubscribe', 'sync', 'psync', 'script debug'];
+    const expectedResult = ['monitor', 'subscribe', 'psubscribe', 'ssubscribe', 'sync', 'psync', 'script debug', 'hello 3'];
 
     expect(getUnsupportedCommands()).toEqual(expectedResult);
   });

redisinsight/api/src/modules/cli/utils/getUnsupportedCommands.ts

@@ -10,6 +10,7 @@ export enum CliToolUnsupportedCommands {
   Sync = 'sync',
   PSync = 'psync',
   ScriptDebug = 'script debug',
+  Hello3 = 'hello 3',
 }
 
 export const getUnsupportedCommands = (): string[] => [

redisinsight/api/src/modules/database-analysis/database-analysis.service.ts

@@ -64,6 +64,7 @@ export class DatabaseAnalysisService {
           client: nodeResult.client,
           keys: nodeResult.keys,
           indexes: nodeResult.indexes,
+          libraries: nodeResult.libraries,
           total: progress.total,
           globalClient: client,
           exclude: recommendationToExclude,