Merge branch 'main' into feature/codeql-fe-fixes

# Conflicts:
#	redisinsight/ui/src/components/query-card/QueryCardCliPlugin/QueryCardCliPlugin.tsx
#	redisinsight/ui/src/plugins/pluginImport.ts

Author: Roman.Sergeenko

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,14 +68,19 @@
     "sass",
     "webpack"
   ],
-  "homepage": "https://github.com/RedisLabs/redisinsight-v2#readme",
+  "homepage": "https://github.com/RedisInsight/RedisInsight#readme",
   "jest": {
     "testURL": "http://localhost/",
     "moduleNameMapper": {
       "\\.(jpg|jpeg|png|ico|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/redisinsight/__mocks__/fileMock.js",
       "\\.(css|less|sass|scss)$": "identity-obj-proxy",
       "uiSrc/(.*)": "<rootDir>/redisinsight/ui/src/$1",
-      "monaco-editor": "<rootDir>/redisinsight/__mocks__/monacoMock.js"
+      "monaco-editor": "<rootDir>/redisinsight/__mocks__/monacoMock.js",
+      "unified": "<rootDir>/redisinsight/__mocks__/unified.js",
+      "remark-parse": "<rootDir>/redisinsight/__mocks__/remarkParse.js",
+      "remark-rehype": "<rootDir>/redisinsight/__mocks__/remarkRehype.js",
+      "rehype-stringify": "<rootDir>/redisinsight/__mocks__/rehypeStringify.js",
+      "unist-util-visit": "<rootDir>/redisinsight/__mocks__/unistUtilsVisit.js"
     },
     "setupFilesAfterEnv": [
       "<rootDir>/redisinsight/ui/src/setup-tests.ts"
@@ -243,7 +248,12 @@
     "react-redux": "^7.2.2",
     "react-jsx-parser": "^1.28.4",
     "react-router-dom": "^5.2.0",
-    "react-virtualized": "^9.22.2"
+    "react-virtualized": "^9.22.2",
+    "remark-parse": "^10.0.1",
+    "remark-rehype": "^10.0.1",
+    "rehype-stringify": "^9.0.2",
+    "unified": "^10.1.1",
+    "unist-util-visit": "^4.1.0"
   },
   "devEngines": {
     "node": ">=14.x <16",

redisinsight/__mocks__/rehypeStringify.js

@@ -0,0 +1 @@
+export default jest.fn()

redisinsight/__mocks__/remarkParse.js

@@ -0,0 +1 @@
+export default jest.fn()

redisinsight/__mocks__/remarkRehype.js

@@ -0,0 +1 @@
+export const unified = jest.fn()

redisinsight/__mocks__/unified.js

@@ -0,0 +1 @@
+export const visit = jest.fn();

redisinsight/__mocks__/unistUtilsVisit.js

@@ -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/config/default.ts

@@ -1,6 +1,6 @@
 import { join } from 'path';
 
-const homedir = join(require('os').homedir(), process.env.APP_FOLDER_NAME || '.redisinsight-v2.0');
+const homedir = join(require('os').homedir(), process.env.APP_FOLDER_NAME || '.redisinsight-preview');
 
 export default {
   dir_path: {

redisinsight/api/config/production.ts

@@ -24,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 = () => ({