Merge branch 'main' into conflict-main

Author: egor-zalenski

.circleci/config.yml

@@ -57,3 +57,7 @@ package.json
 *.css.d.ts
 *.sass.d.ts
 *.scss.d.ts
+
+# temp folders - remove in future after fix all issues
+redisinsight/ui/src/packages/redisgraph
+redisinsight/ui/src/packages/redistimeseries-app

.eslintignore

@@ -58,3 +58,6 @@ vendor
 
 # Parcel
 .parcel-cache
+
+# caches
+.temp_cache

.github/redisinsight_browser.png

@@ -20,28 +20,29 @@ RedisInsight is an intuitive and efficient GUI for Redis, allowing you to intera
 
 ### RedisInsight Highlights:
 
-* Browse, filter and visualise your key-value Redis data structures
-* CRUD support for Lists, Hashes, Strings, Sets, Sorted Sets 
+* 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://oss.redis.com/redisjson/)
-* Profiler - analyze every command sent to Redis in real-time 
-* Introducing Workbench - advanced command line interface with intelligent command auto-complete and complex data visualizations
+* 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/manual/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
+* Introducing 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://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
 * 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).
-* Available for macOS, Windows and Linux 
+* Available for macOS (including M1), Windows and Linux 
 
 Check out the [release notes](https://docs.redis.com/latest/ri/release-notes/). 
 
 ## Get started with RedisInsight
 
-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. 
+This repository includes the code for the GA version of RedisInsight 2.0. Check out the [blogpost](https://redis.com/blog/introducing-redisinsight-2/) announcing it. 
 
 ### Installable 
-Available to download for free from [here](https://redis.com/redis-enterprise/redis-insight/#insight-form). 
+Available to download for free from [here](https://redis.com/redis-enterprise/redis-insight/#insight-form).
 
 ### Build 
 Alternatively you can also build from source. See our wiki for instructions.

.gitignore

@@ -54,7 +54,7 @@ export default {
           // 'pnpapi',
           'cache-manager',
           // 'class-validator',
-          'fastify-static',
+          '@fastify/static',
           'fastify-swagger',
           // 'hiredis',
           // 'reflect-metadata',

README.md

@@ -5,6 +5,7 @@
  * https://webpack.js.org/concepts/hot-module-replacement/
  */
 
+import path from 'path';
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
 import ip from 'ip';
@@ -21,6 +22,18 @@ export default merge(commonConfig, {
 
   mode: 'development',
 
+  cache: {
+    type: 'filesystem',
+    allowCollectingMemory: true,
+    cacheDirectory: path.resolve(__dirname, '../.temp_cache'),
+    name: 'webpack',
+    maxAge: 86_400_000, // 1 day
+    buildDependencies: {
+      // This makes all dependencies of this file - build dependencies
+      config: [__filename],
+    }
+  },
+
   devtool: 'source-map',
 
   entry: [

configs/webpack.config.base.js

@@ -75,8 +75,7 @@
     "desktop": {
       "Name": "RedisInsight",
       "Type": "Application",
-      "Comment": "Redis GUI by Redis Ltd",
-      "Terminal": "true"
+      "Comment": "Redis GUI by Redis Ltd"
     }
   },
   "directories": {

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

@@ -16,7 +16,11 @@ module.exports = {
     'rehype-stringify': '<rootDir>/redisinsight/__mocks__/rehypeStringify.js',
     'unist-util-visit': '<rootDir>/redisinsight/__mocks__/unistUtilsVisit.js',
     'react-children-utilities': '<rootDir>/redisinsight/__mocks__/react-children-utilities.js',
+    d3: '<rootDir>/node_modules/d3/dist/d3.min.js',
   },
+  setupFiles: [
+    '<rootDir>/redisinsight/ui/src/setup-env.ts',
+  ],
   setupFilesAfterEnv: [
     '<rootDir>/redisinsight/ui/src/setup-tests.ts',
   ],
@@ -35,6 +39,11 @@ module.exports = {
   transformIgnorePatterns: [
     'node_modules/(?!(monaco-editor|react-monaco-editor)/)',
   ],
+  // TODO: add tests for plugins
+  modulePathIgnorePatterns: [
+    '<rootDir>/redisinsight/ui/src/packages',
+    '<rootDir>/redisinsight/ui/src/mocks',
+  ],
   coverageThreshold: {
     global: {
       statements: 70,

electron-builder.json

@@ -38,7 +38,8 @@
     "start:web:public": "cross-env PUBLIC_DEV=true webpack serve --config ./configs/webpack.config.web.dev.babel.js",
     "test": "jest ./redisinsight/ui -w 1",
     "test:watch": "jest ./redisinsight/ui --watch -w 1",
-    "test:cov": "jest ./redisinsight/ui --coverage -w 1"
+    "test:cov": "jest ./redisinsight/ui --coverage -w 1",
+    "type-check:ui": "tsc --project redisinsight/ui --noEmit"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [
@@ -106,8 +107,10 @@
     "@teamsupercell/typings-for-css-modules-loader": "^2.4.0",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.3.0",
+    "@testing-library/user-event": "^14.4.3",
     "@types/axios": "^0.14.0",
     "@types/classnames": "^2.2.11",
+    "@types/d3": "^7.4.0",
     "@types/date-fns": "^2.6.0",
     "@types/detect-port": "^1.3.0",
     "@types/electron-store": "^3.2.0",
@@ -119,6 +122,7 @@
     "@types/jsonpath": "^0.2.0",
     "@types/lodash": "^4.14.171",
     "@types/node": "14.14.10",
+    "@types/react": "^18.0.20",
     "@types/react-dom": "^18.0.5",
     "@types/react-monaco-editor": "^0.16.0",
     "@types/react-redux": "^7.1.12",
@@ -174,6 +178,7 @@
     "mini-css-extract-plugin": "^1.3.1",
     "moment": "^2.29.3",
     "monaco-editor-webpack-plugin": "^6.0.0",
+    "msw": "^0.45.0",
     "node-sass": "^6.0.1",
     "opencollective-postinstall": "^2.0.3",
     "react-hot-loader": "^4.13.0",
@@ -201,6 +206,7 @@
     "webpack-cli": "^4.3.0",
     "webpack-dev-server": "^3.11.0",
     "webpack-merge": "^5.4.0",
+    "whatwg-fetch": "^3.6.2",
     "yarn-deduplicate": "^3.1.0"
   },
   "dependencies": {
@@ -212,6 +218,7 @@
     "buffer": "^6.0.3",
     "classnames": "^2.3.1",
     "connection-string": "^4.3.2",
+    "d3": "^7.6.1",
     "date-fns": "^2.16.1",
     "detect-port": "^1.3.0",
     "electron-context-menu": "^3.1.0",
@@ -221,8 +228,12 @@
     "formik": "^2.2.9",
     "html-entities": "^2.3.2",
     "html-react-parser": "^1.2.4",
+    "java-object-serialization": "^0.1.1",
+    "jpickle": "^0.4.1",
     "jsonpath": "^1.1.1",
     "lodash": "^4.17.21",
+    "php-serialize": "^4.0.2",
+    "rawproto": "^0.7.6",
     "react": "^18.2.0",
     "react-contenteditable": "^3.3.5",
     "react-dom": "^18.2.0",