Merge branch 'main' into feature/RI-2062_enablement-area-pagination

# Conflicts:
#	redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/InternalPage.tsx

Author: Artyom Podymov

README.md

@@ -1,9 +1,14 @@
+[![Release](https://img.shields.io/github/v/release/RedisInsight/RedisInsight.svg?sort=semver)](https://github.com/RedisInsight/RedisInsight/releases)
+[![CircleCI](https://circleci.com/gh/RedisInsight/RedisInsight/tree/master.svg?style=svg)](https://circleci.com/gh/RedisInsight/RedisInsighth/tree/master)
+[![Total alerts](https://img.shields.io/lgtm/alerts/g/RedisInsight/RedisInsight.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/RedisInsight/RedisInsight/alerts/)
+
+# <img src="https://redis.com/wp-content/uploads/2019/11/ico-redisinsight.svg" alt="logo" width="25"/>  RedisInsight - Developer GUI for Redis, by Redis. 
 [![Forum](https://img.shields.io/badge/Forum-RedisInsight-red)](https://forum.redis.com/c/redisinsight/65)
 [![Discord](https://img.shields.io/discord/697882427875393627?style=flat-square)](https://discord.gg/QUkjSsk)
 
-# <img src="https://redis.com/wp-content/uploads/2019/11/ico-redisinsight.svg" alt="logo" width="25"/>  RedisInsight
 
-**Best in class Redis developer GUI to view and interact with your data! [Download it from here](https://redis.com/redis-enterprise/redis-insight/#insight-form)!**
+RedisInsight is a visual tool that provides capabilities to design, develop and optimize your Redis application. 
+Query, analyse and interact with your Redis data. [Download it here](https://redis.com/redis-enterprise/redis-insight/#insight-form)!
 
 ![RedisInsight Browser screenshot](/.github/redisinsight_browser.png)
 
@@ -20,7 +25,7 @@ RedisInsight is an intuitive and efficient GUI for Redis, allowing you to intera
 * CRUD support for [RedisJSON](https://oss.redis.com/redisjson/)
 * Introducing Workbench - advanced command line interface with intelligent command auto-complete and complex data visualizations
 * Command auto-complete support for [RediSearch](https://oss.redis.com/redisearch/), [RedisJSON](https://oss.redis.com/redisjson/), [RedisGraph](https://oss.redis.com/redisgraph/), [RedisTimeSeries](https://oss.redis.com/redistimeseries/), [RedisAI](https://oss.redis.com/redisai/)
-* Visualizations of your [RediSearch](https://oss.redis.com/redisearch/) index queries and aggregations
+* Visualizations of your [RediSearch](https://oss.redis.com/redisearch/) index, queries, and aggregations
 * Ability to build your own data visualization plugins
 * Built-in click-through guides for Redis capabilities
 * Oficially supported for Redis OSS, [Redis Cloud](https://redis.com/try-free/). Works with Microsoft Azure Cache for Redis (official support upcoming).
@@ -30,7 +35,7 @@ Check out the [release notes](https://docs.redis.com/latest/ri/release-notes/).
 
 ## Get started with RedisInsight
 
-This repository includes the code for the newly released in public preview RedisInsight 2.0. Check out the [blogpost](https://redis.com/blog/introducing-redisinsight-2/) announcing it. 
+This repository includes the code for RedisInsight 2.0, Currently available in public preview. Check out the [blogpost](https://redis.com/blog/introducing-redisinsight-2/) announcing it. 
 
 The current GA version of RedisInsight is 1.11. You can install RedisInsight 2.0 along with the GA version. 
 

configs/webpack.config.web.prod.babel.js

@@ -122,6 +122,20 @@ export default merge(commonConfig, {
         test: /\.css$/,
         use: ['style-loader', 'css-loader'],
       },
+      // WOFF2 Font
+      {
+        test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              name: '[hash]-[name].[ext]',
+              outputPath: 'static',
+              publicPath: 'static',
+            },
+          },
+        ],
+      },
       // TTF Font
       {
         test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/,

package.json

@@ -48,15 +48,15 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/RedisLabs/redisinsight-v2.git"
+    "url": "git+https://github.com/RedisInsight/RedisInsight.git"
   },
   "author": {
     "name": "Redis Ltd.",
     "email": "[email protected]",
     "url": "https://redis.com/redis-enterprise/redis-insight"
   },
   "bugs": {
-    "url": "https://github.com/RedisLabs/redisinsight-v2/issues"
+    "url": "https://github.com/RedisInsight/RedisInsight/issues"
   },
   "keywords": [
     "redisinsight",
@@ -68,7 +68,7 @@
     "sass",
     "webpack"
   ],
-  "homepage": "https://github.com/RedisLabs/redisinsight-v2#readme",
+  "homepage": "https://github.com/RedisInsight/RedisInsight#readme",
   "jest": {
     "testURL": "http://localhost/",
     "moduleNameMapper": {

redisinsight/api/config/default.ts

@@ -80,7 +80,7 @@ export default {
     redijsonUrl: process.env.COMMANDS_REDIJSON_URL
       || 'https://raw.githubusercontent.com/RedisJSON/RedisJSON/master/commands.json',
     redistimeseriesUrl: process.env.COMMANDS_REDISTIMESERIES_URL
-      || 'https://raw.githubusercontent.com/RedisTimeSeries/RedisTimeSeries/master/src/commands.json',
+      || 'https://raw.githubusercontent.com/RedisTimeSeries/RedisTimeSeries/master/commands.json',
     redisaiUrl: process.env.COMMANDS_REDISAI_URL
       || 'https://raw.githubusercontent.com/RedisAI/RedisAI/master/commands.json',
     redisgraphUrl: process.env.COMMANDS_REDISGRAPH_URL

redisinsight/api/src/__mocks__/analytics.ts

@@ -1,4 +1,5 @@
 export const mockInstancesAnalyticsService = () => ({
+  sendInstanceListReceivedEvent: jest.fn(),
   sendInstanceAddedEvent: jest.fn(),
   sendInstanceAddFailedEvent: jest.fn(),
   sendInstanceEditedEvent: jest.fn(),
@@ -23,14 +24,14 @@ export const mockBrowserAnalyticsService = () => ({
 });
 
 export const mockCliAnalyticsService = () => ({
-  sendCliClientCreatedEvent: jest.fn(),
-  sendCliClientCreationFailedEvent: jest.fn(),
-  sendCliClientDeletedEvent: jest.fn(),
-  sendCliClientRecreatedEvent: jest.fn(),
-  sendCliCommandExecutedEvent: jest.fn(),
-  sendCliCommandErrorEvent: jest.fn(),
-  sendCliClusterCommandExecutedEvent: jest.fn(),
-  sendCliConnectionErrorEvent: jest.fn(),
+  sendClientCreatedEvent: jest.fn(),
+  sendClientCreationFailedEvent: jest.fn(),
+  sendClientDeletedEvent: jest.fn(),
+  sendClientRecreatedEvent: jest.fn(),
+  sendCommandExecutedEvent: jest.fn(),
+  sendCommandErrorEvent: jest.fn(),
+  sendClusterCommandExecutedEvent: jest.fn(),
+  sendConnectionErrorEvent: jest.fn(),
 });
 
 export const mockSettingsAnalyticsService = () => ({

redisinsight/api/src/constants/agreements-spec.json

@@ -49,7 +49,7 @@
       "disabled": false,
       "since": "1.0.4",
       "title": "Server Side Public License",
-      "label": "I have read and understood the <a target=\"_blank\" href=\"https://github.com/RedisInsight/RedisInsight/blob/master/LICENSE\">Server Side Public License</a>",
+      "label": "I have read and understood the <a target=\"_blank\" href=\"https://github.com/RedisInsight/RedisInsight/blob/main/LICENSE\">Server Side Public License</a>",
       "requiredText": "Accept the Server Side Public License"
     }
   }

redisinsight/api/src/constants/commands/redistimeseries.json

@@ -122,6 +122,8 @@
         "multiple": true,
         "optional": true
       }
-    ]
+    ],
+    "since": "1.0.0",
+    "group": "timeseries"
   }
 }

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

@@ -11,6 +11,7 @@ export enum TelemetryEvents {
   RedisInstanceDeleted = 'CONFIG_DATABASES_DATABASE_DELETED',
   RedisInstanceEditedByUser = 'CONFIG_DATABASES_DATABASE_EDITED_BY_USER',
   RedisInstanceConnectionFailed = 'DATABASE_CONNECTION_FAILED',
+  RedisInstanceListReceived = 'CONFIG_DATABASES_DATABASE_LIST_DISPLAYED',
 
   // Events for autodiscovery flows
   REClusterDiscoverySucceed = 'CONFIG_DATABASES_RE_CLUSTER_AUTODISCOVERY_SUCCEEDED',
@@ -38,12 +39,12 @@ export enum TelemetryEvents {
   BrowserJSONPropertyDeleted = 'BROWSER_JSON_PROPERTY_DELETED',
 
   // Events for cli tool
-  CliClientCreated = 'CLI_CLIENT_CREATED',
-  CliClientCreationFailed = 'CLI_CLIENT_CREATION_FAILED',
-  CliClientConnectionError = 'CLI_CLIENT_CONNECTION_ERROR',
-  CliClientDeleted = 'CLI_CLIENT_DELETED',
-  CliClientRecreated = 'CLI_CLIENT_RECREATED',
-  CliCommandExecuted = 'CLI_COMMAND_EXECUTED',
-  CliClusterNodeCommandExecuted = 'CLI_CLUSTER_COMMAND_EXECUTED',
-  CliCommandErrorReceived = 'CLI_COMMAND_ERROR_RECEIVED',
+  ClientCreated = 'CLIENT_CREATED',
+  ClientCreationFailed = 'CLIENT_CREATION_FAILED',
+  ClientConnectionError = 'CLIENT_CONNECTION_ERROR',
+  ClientDeleted = 'CLIENT_DELETED',
+  ClientRecreated = 'CLIENT_RECREATED',
+  CommandExecuted = 'COMMAND_EXECUTED',
+  ClusterNodeCommandExecuted = 'CLUSTER_COMMAND_EXECUTED',
+  CommandErrorReceived = 'COMMAND_ERROR_RECEIVED',
 }

redisinsight/api/src/modules/cli/controllers/cli.controller.ts

@@ -132,7 +132,8 @@ export class CliController {
   async reCreateClient(
     @Param('dbInstance') dbInstance: string,
       @Param('uuid') uuid: string,
+      @Body() dto: CreateCliClientDto,
   ): Promise<CreateCliClientResponse> {
-    return this.service.reCreateClient(dbInstance, uuid);
+    return this.service.reCreateClient(dbInstance, uuid, dto.namespace);
   }
 }