Merge branch 'main' of https://github.com/RedisInsight/RedisInsight into feature/RI-4616-rdi-support

Author: AmirAllayarovSofteq

.circleci/build/release-docker.sh

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

.circleci/config.yml

@@ -187,6 +187,15 @@ executors:
     machine:
       image: ubuntu-2004:2023.04.2
       docker_layer_caching: true
+  docker-node:
+    docker:
+      - image: cimg/node:18.15.0
+  docker:
+    docker:
+      - image: cibuilds/docker:19.03.5
+  macos:
+    macos:
+      xcode: 14.2.0
 
 parameters:
   linux:
@@ -208,8 +217,7 @@ parameters:
 jobs:
   # Test jobs
   unit-tests-ui:
-    docker:
-      - image: cimg/node:18.15.0
+    executor: docker-node
     steps:
       - checkout
       - restore_cache:
@@ -252,8 +260,7 @@ jobs:
           paths:
             - ./node_modules
   unit-tests-api:
-    docker:
-      - image: cimg/node:18.15.0
+    executor: docker-node
     steps:
       - checkout
       - restore_cache:
@@ -530,15 +537,14 @@ jobs:
 
   # Build jobs
   manual-build-validate:
+    executor: docker-node
     parameters:
       os:
         type: string
         default: ""
       target:
         type: string
         default: ""
-    docker:
-      - image: cimg/node:18.15.0
     steps:
       - checkout
       - run:
@@ -560,14 +566,13 @@ jobs:
           paths:
             - certs
   setup-build:
+    executor: docker
     parameters:
       env:
         description: Build environment (stage || prod)
         type: enum
         default: stage
         enum: [ 'dev', 'stage', 'prod' ]
-    docker:
-      - image: cibuilds/docker:19.03.5
     steps:
       - checkout
       - run:
@@ -585,8 +590,7 @@ jobs:
           paths:
             - electron
   linux:
-    machine:
-      image: ubuntu-2004:202101-01
+    executor: linux-executor
     resource_class: large
     parameters:
       env:
@@ -660,8 +664,7 @@ jobs:
             - release/Redis-Insight*.snap
             - release/*-linux.yml
   macosx:
-    macos:
-      xcode: 14.2.0
+    executor: macos
     resource_class: macos.x86.medium.gen2
     parameters:
       env:
@@ -1028,6 +1031,13 @@ jobs:
             -r $DOCKER_REPO \
             -v $appVersion
 
+            docker login -u $DOCKER_V1_USER -p $DOCKER_V1_PASS
+
+            ./.circleci/build/release-docker.sh \
+            -d redisinsight \
+            -r $DOCKER_V1_REPO \
+            -v $appVersion
+
   publish-prod-aws:
     executor: linux-executor
     steps:

.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

README.md

@@ -20,18 +20,19 @@ Redis Insight is an intuitive and efficient GUI for Redis, allowing you to inter
 ### Redis Insight Highlights:
 
 * 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://redis.io/json/)
+* CRUD support for lists, hashes, strings, sets, sorted sets, and streams
+* CRUD support for [JSON](https://redis.io/json/) data structure
 * Interactive tutorials to learn easily, among other things, how to leverage the native JSON data structure supporting structured querying and full-text search, including vector similarity search for your AI use cases
 * Contextualised recommendations to optimize performance and memory usage. The list of recommendations gets updated as you interact with your database
 * 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/latest/develop/interact/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
 * 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://redis.io/search/), [RedisJSON](https://redis.io/json/), [RedisTimeSeries](https://redis.io/timeseries/)
-* Visualizations of your [RediSearch](https://redis.io/search/) index, queries, and aggregations. Ability to build [your own data visualization plugins](https://github.com/RedisInsight/Packages)
-* Officially supported for Redis OSS, [Redis Cloud](https://redis.io/cloud/). Works with Microsoft Azure Cache for Redis (official support upcoming)
+* Command auto-complete support for [search and query](https://redis.io/search/) capability, [JSON](https://redis.io/json/) and [time series](https://redis.io/timeseries/) data structures
+* Visualizations of your [search and query](https://redis.io/search/) indexes and results.
+* Ability to build [your own data visualization plugins](https://github.com/RedisInsight/Packages)
+* Officially supported for Redis OSS, [Redis Cloud](https://redis.io/cloud/). Works with Microsoft Azure Cache for Redis
 
 Check out the [release notes](https://github.com/RedisInsight/RedisInsight/releases). 
 

package.json

@@ -82,8 +82,7 @@
     "word-wrap": "1.2.4",
     "electron-builder/app-builder-lib/@electron/universal/dir-compare/minimatch": "^3.0.5",
     "**/semver": "^7.5.2",
-    "rawproto/protobufjs": "^7.2.4",
-    "**/follow-redirects": "^1.15.4"
+    "rawproto/protobufjs": "^7.2.5"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.23.2",

redisinsight/api/config/default.ts

@@ -40,6 +40,7 @@ export default {
     staticDir,
     defaultsDir,
     logs: join(homedir, 'logs'),
+    customConfig: join(homedir, 'config.json'),
     defaultPlugins: join(staticDir, 'plugins'),
     customPlugins: join(homedir, 'plugins'),
     customTutorials: join(homedir, 'custom-tutorials'),
@@ -75,7 +76,7 @@ export default {
     tlsKey: process.env.RI_SERVER_TLS_KEY,
     staticContent: !!process.env.RI_SERVE_STATICS || true,
     buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
-    appVersion: process.env.RI_APP_VERSION || '2.48.0',
+    appVersion: process.env.RI_APP_VERSION || '2.50.0',
     requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],
@@ -259,7 +260,7 @@ export default {
     },
   },
   ai: {
-    convAiApiUrl: process.env.RI_AI_CONVAI_API_URL || 'https://redis.io/convai/api',
+    convAiApiUrl: process.env.RI_AI_CONVAI_API_URL || 'https://staging.redis.io/convai/api',
     convAiToken: process.env.RI_AI_CONVAI_TOKEN,
     querySocketUrl: process.env.RI_AI_QUERY_SOCKET_URL || 'https://app-sm.k8s-cloudapi.sm-qa.qa.redislabs.com',
     querySocketPath: process.env.RI_AI_QUERY_SOCKET_PATH || '/api/v1/cloud-copilot-service/socket.io/',

redisinsight/api/config/features-config.json

@@ -1,5 +1,5 @@
 {
-  "version": 2.4801,
+  "version": 2.4603,
   "features": {
     "rdi": {
       "flag": true,
@@ -51,28 +51,6 @@
         }
       }
     },
-    "documentationChat": {
-      "flag": true,
-      "perc": [[0,100]],
-      "filters": [
-        {
-          "name": "config.server.buildType",
-          "value": "ELECTRON",
-          "cond": "eq"
-        }
-      ]
-    },
-    "databaseChat": {
-      "flag": true,
-      "perc": [[0,100]],
-      "filters": [
-        {
-          "name": "config.server.buildType",
-          "value": "ELECTRON",
-          "cond": "eq"
-        }
-      ]
-    },
     "cloudSsoRecommendedSettings": {
       "flag": true,
       "perc": [[0, 100]],

redisinsight/api/config/production.ts

@@ -11,6 +11,7 @@ export default {
     homedir,
     prevHomedir,
     logs: join(homedir, 'logs'),
+    customConfig: join(homedir, 'config.json'),
     customPlugins: join(homedir, 'plugins'),
     customTutorials: join(homedir, 'custom-tutorials'),
     commands: join(homedir, 'commands'),
@@ -22,7 +23,7 @@ export default {
       join(os.homedir(), '.redisinsight-preview'),
       join(os.homedir(), '.redisinsight-v2'),
       process.env.RI_GUIDES_PATH || join(homedir, 'guides'),
-    ]
+    ],
   },
   server: {
     env: 'production',
@@ -37,4 +38,9 @@ export default {
   cloud: {
     cApiUrl: process.env.RI_CLOUD_CAPI_URL || 'https://api.redislabs.com/v1',
   },
+  ai: {
+    convAiApiUrl: process.env.RI_AI_CONVAI_API_URL || 'https://redis.io/convai/api',
+    querySocketUrl: process.env.RI_AI_QUERY_SOCKET_URL || 'https://app.redislabs.com',
+    querySocketPath: process.env.RI_AI_QUERY_SOCKET_PATH || '/api/v1/cloud-copilot-service/socket.io/',
+  },
 };

redisinsight/api/config/staging.ts

@@ -11,6 +11,7 @@ export default {
     homedir,
     prevHomedir,
     logs: join(homedir, 'logs'),
+    customConfig: join(homedir, 'config.json'),
     customPlugins: join(homedir, 'plugins'),
     customTutorials: join(homedir, 'custom-tutorials'),
     commands: join(homedir, 'commands'),

redisinsight/api/config/swagger.ts

@@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit<OpenAPIObject, 'paths'> = {
   info: {
     title: 'Redis Insight Backend API',
     description: 'Redis Insight Backend API',
-    version: '2.48.0',
+    version: '2.50.0',
   },
   tags: [],
 };