Merge pull request #3569 from RedisInsight/release/2.52.0

Release/2.52.0 to latest

Author: vlad-dargel

.circleci/build/release-docker.sh

@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.50.0)
+-v - Semver (2.52.0)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "

.circleci/config.yml

@@ -391,6 +391,19 @@ jobs:
       - attach_workspace:
           at: .
       - run: sudo apt-get install net-tools
+      - run:
+          name: Install WM
+          command: sudo apt install fluxbox
+      - run:
+          name: Run X11
+          command: |
+            Xvfb :99 -screen 0 1920x1080x24 &
+            sleep 3
+            fluxbox &
+      # - 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 +496,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: |
@@ -639,6 +656,7 @@ jobs:
             export RI_CLOUD_IDP_GH_ID=$RI_CLOUD_IDP_GH_ID_STAGE
             export RI_CLOUD_API_URL=$RI_CLOUD_API_URL_STAGE
             export RI_CLOUD_CAPI_URL=$RI_CLOUD_CAPI_URL_STAGE
+            export RI_FEATURES_CONFIG_URL=$RI_FEATURES_CONFIG_URL_STAGE
 
             if [ << parameters.env >> == 'stage' ]; then
               RI_UPGRADES_LINK=$RI_UPGRADES_LINK_STAGE RI_SEGMENT_WRITE_KEY=$RI_SEGMENT_WRITE_KEY_STAGE yarn package:stage --linux << parameters.target >>
@@ -715,6 +733,7 @@ jobs:
             export RI_CLOUD_CAPI_URL=$RI_CLOUD_CAPI_URL_STAGE
             export RI_UPGRADES_LINK=''
             export RI_SEGMENT_WRITE_KEY=''
+            export RI_FEATURES_CONFIG_URL=$RI_FEATURES_CONFIG_URL_STAGE
 
             if [ << parameters.env >> == 'stage' ]; then
               export RI_UPGRADES_LINK=$RI_UPGRADES_LINK_STAGE
@@ -796,6 +815,7 @@ jobs:
             export RI_CLOUD_IDP_GH_ID=$RI_CLOUD_IDP_GH_ID_STAGE
             export RI_CLOUD_API_URL=$RI_CLOUD_API_URL_STAGE
             export RI_CLOUD_CAPI_URL=$RI_CLOUD_CAPI_URL_STAGE
+            export RI_FEATURES_CONFIG_URL=$RI_FEATURES_CONFIG_URL_STAGE
 
             if [ << parameters.env >> == 'stage' ]; then
               RI_UPGRADES_LINK=$RI_UPGRADES_LINK_STAGE RI_SEGMENT_WRITE_KEY=$RI_SEGMENT_WRITE_KEY_STAGE yarn package:stage --win << parameters.target >>
@@ -1233,7 +1253,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

.github/CODEOWNERS

@@ -1,4 +1,4 @@
 # Add reviewers for the most sensitive folders
-/.github/ [email protected] artem.horuzhenko@softeq.com
-/.circleci/ [email protected] artem.horuzhenko@softeq.com
-/redisinsight/api/config/features-config.json [email protected] [email protected] artem.horuzhenko@softeq.com
+/.github/ [email protected] [email protected] artem.horuzhenko@redis.com
+/.circleci/ [email protected] [email protected] artem.horuzhenko@redis.com
+/redisinsight/api/config/features-config.json [email protected] [email protected] artem.horuzhenko@redis.com

configs/webpack.config.main.prod.ts

@@ -83,6 +83,7 @@ export default merge(baseConfig, {
       RI_AI_CONVAI_TOKEN: 'RI_AI_CONVAI_TOKEN' in process.env ? process.env.RI_AI_CONVAI_TOKEN: '',
       RI_AI_QUERY_USER: 'RI_AI_QUERY_USER' in process.env ? process.env.RI_AI_QUERY_USER: '',
       RI_AI_QUERY_PASS: 'RI_AI_QUERY_PASS' in process.env ? process.env.RI_AI_QUERY_PASS: '',
+      RI_FEATURES_CONFIG_URL: 'RI_FEATURES_CONFIG_URL' in process.env ? process.env.RI_FEATURES_CONFIG_URL: '',
     }),
 
     new webpack.DefinePlugin({

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)
+}