Merge pull request #2862 from RedisInsight/feature/RI-4616-rdi-support

WIP: Feature/ri 4616 rdi support

Author: vlad-dargel

.circleci/config.yml

@@ -391,6 +391,10 @@ jobs:
       - attach_workspace:
           at: .
       - run: sudo apt-get install net-tools
+      - run:
+          name: Clone mocked RDI server
+          command: |
+            git clone https://[email protected]/RedisInsight/RDI_server_mocked.git tests/e2e/rte/rdi
       - run:
           name: .AppImage tests
           command: |
@@ -483,6 +487,10 @@ jobs:
                 name: Load built docker image from workspace
                 command: |
                   docker image load -i /tmp/release/docker/docker-linux-alpine.amd64.tar
+            - run:
+                name: Clone mocked RDI server
+                command: |
+                  git clone https://[email protected]/RedisInsight/RDI_server_mocked.git tests/e2e/rte/rdi
             - run:
                 name: Run tests
                 command: |
@@ -1236,7 +1244,7 @@ workflows:
             - Build docker image
       - e2e-app-image:
           name: E2ETest (AppImage)
-          parallelism: 2
+          parallelism: 1
           requires:
             - Build app - Linux (stage)
   # Workflow for feature, bugfix, main branches

.circleci/e2e/test.app-image.sh

@@ -8,6 +8,7 @@ yarn --cwd tests/e2e install
 
 # create folder before tests run to prevent permissions issue
 mkdir -p tests/e2e/remote
+mkdir -p tests/e2e/rdi
 
 # run rte
 docker-compose -f tests/e2e/rte.docker-compose.yml build

configs/webpack.config.renderer.dev.ts

@@ -0,0 +1,10 @@
+const url = require('url')
+
+module.exports = (request, options) => {
+    // Remove any query parameters in the request path
+    if (request.includes('?')) {
+        return options.defaultResolver(url.parse(request).pathname, options)
+    }
+
+    return options.defaultResolver(request, options)
+}

configs/webpack.config.renderer.prod.ts

@@ -11,6 +11,7 @@ module.exports = {
     '\\.scss\\?inline$': '<rootDir>/redisinsight/__mocks__/scssRaw.js',
     'uiSrc/(.*)': '<rootDir>/redisinsight/ui/src/$1',
     'monaco-editor': '<rootDir>/redisinsight/__mocks__/monacoMock.js',
+    'monaco-yaml': '<rootDir>/redisinsight/__mocks__/monacoYamlMock.js',
     unified: '<rootDir>/redisinsight/__mocks__/unified.js',
     'remark-parse': '<rootDir>/redisinsight/__mocks__/remarkParse.js',
     'remark-gfm': '<rootDir>/redisinsight/__mocks__/remarkGfm.js',
@@ -55,6 +56,7 @@ module.exports = {
     '<rootDir>/redisinsight/api',
     '<rootDir>/redisinsight/ui/src/packages',
   ],
+  resolver: '<rootDir>/jest-resolver.js',
   coverageThreshold: {
     global: {
       statements: 80,

configs/webpack.config.web.common.ts

@@ -107,6 +107,7 @@
     "@types/ioredis": "^4.26.0",
     "@types/is-glob": "^4.0.2",
     "@types/jest": "^27.5.2",
+    "@types/js-yaml": "^4.0.9",
     "@types/json-bigint": "^1.0.1",
     "@types/jsonpath": "^0.2.0",
     "@types/lodash": "^4.14.171",
@@ -172,7 +173,6 @@
     "lint-staged": "^10.2.11",
     "mini-css-extract-plugin": "2.7.2",
     "moment": "^2.29.3",
-    "monaco-editor-webpack-plugin": "^6.0.0",
     "msw": "^1.3.2",
     "opencollective-postinstall": "^2.0.3",
     "patch-package": "^8.0.0",
@@ -202,6 +202,7 @@
     "vite-plugin-compression2": "^1.1.0",
     "vite-plugin-electron": "^0.28.6",
     "vite-plugin-electron-renderer": "^0.14.5",
+    "vite-plugin-react-click-to-component": "^3.0.0",
     "vite-plugin-svgr": "^4.2.0",
     "webpack": "^5.91.0",
     "webpack-bundle-analyzer": "^4.10.2",
@@ -235,10 +236,14 @@
     "html-entities": "^2.3.2",
     "html-react-parser": "^1.2.4",
     "java-object-serialization": "^0.1.1",
+    "js-yaml": "^4.1.0",
     "json-bigint": "^1.0.0",
     "jsonpath": "^1.1.1",
+    "jszip": "^3.10.1",
     "lodash": "^4.17.21",
     "lz4js": "^0.2.0",
+    "monaco-editor": "^0.48.0",
+    "monaco-yaml": "^5.1.1",
     "msgpackr": "^1.10.1",
     "pako": "^2.1.0",
     "php-serialize": "^4.0.2",
@@ -249,7 +254,7 @@
     "react-dom": "^18.2.0",
     "react-hotkeys-hook": "^3.3.1",
     "react-jsx-parser": "^1.28.4",
-    "react-monaco-editor": "^0.45.0",
+    "react-monaco-editor": "^0.55.0",
     "react-redux": "^7.2.2",
     "react-rnd": "^10.3.5",
     "react-router-dom": "^5.2.0",

configs/webpack.config.web.prod.ts

@@ -0,0 +1,20 @@
+diff --git a/node_modules/monaco-yaml/yaml.worker.js b/node_modules/monaco-yaml/yaml.worker.js
+index c4e3806..7140210 100644
+--- a/node_modules/monaco-yaml/yaml.worker.js
++++ b/node_modules/monaco-yaml/yaml.worker.js
+@@ -6709,11 +6709,11 @@ var YAMLHover = class {
+ \`\`\`${example}\`\`\``;
+           });
+         }
+-        if (result.length > 0 && schema.schema.url) {
+-          result += `
++//         if (result.length > 0 && schema.schema.url) {
++//           result += `
+
+-Source: [${getSchemaName(schema.schema)}](${schema.schema.url})`;
+-        }
++// Source: [${getSchemaName(schema.schema)}](${schema.schema.url})`;
++//         }
+         return createHover(result);
+       }
+       return null;