Merge pull request #3433 from RedisInsight/release/2.50.0

Release/2.50.0 to latest

Author: vlad-dargel

.circleci/build/build.sh

@@ -7,5 +7,5 @@ yarn --cwd redisinsight/api
 
 # build
 yarn build:statics
-yarn build:web
+yarn build:ui
 yarn --cwd ./redisinsight/api build:prod

.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:
@@ -522,15 +529,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:
@@ -552,14 +558,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:
@@ -577,8 +582,7 @@ jobs:
           paths:
             - electron
   linux:
-    machine:
-      image: ubuntu-2004:202101-01
+    executor: linux-executor
     resource_class: large
     parameters:
       env:
@@ -652,8 +656,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:
@@ -1020,6 +1023,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:
@@ -1082,39 +1092,39 @@ jobs:
             declare -A tag0=(
                 [arch]='x64'
                 [platform]='macos'
-                [objectDownload]=${applicationName}'-mac-x64.dmg'
-                [objectUpgrade]=${applicationName}'-mac-x64.zip'
+                [objectDownload]=${appFileName}'-mac-x64.dmg'
+                [objectUpgrade]=${appFileName}'-mac-x64.zip'
             )
 
             declare -A tag1=(
                 [arch]='arm64'
                 [platform]='macos'
-                [objectDownload]=${applicationName}'-mac-arm64.dmg'
-                [objectUpgrade]=${applicationName}'-mac-arm64.zip'
+                [objectDownload]=${appFileName}'-mac-arm64.dmg'
+                [objectUpgrade]=${appFileName}'-mac-arm64.zip'
             )
 
             declare -A tag2=(
                 [arch]='x64'
                 [platform]='windows'
-                [objectDownload]=${applicationName}'-win-installer.exe'
+                [objectDownload]=${appFileName}'-win-installer.exe'
             )
 
             declare -A tag3=(
                 [arch]='x64'
                 [platform]='linux_AppImage'
-                [objectDownload]=${applicationName}'-linux-x86_64.AppImage'
+                [objectDownload]=${appFileName}'-linux-x86_64.AppImage'
             )
 
             declare -A tag4=(
                 [arch]='x64'
                 [platform]='linux_deb'
-                [objectDownload]=${applicationName}'-linux-amd64.deb'
+                [objectDownload]=${appFileName}'-linux-amd64.deb'
             )
 
             declare -A tag5=(
                 [arch]='x64'
                 [platform]='linux_rpm'
-                [objectDownload]=${applicationName}'-linux-x86_64.rpm'
+                [objectDownload]=${appFileName}'-linux-x86_64.rpm'
             )
 
             # loop for add all tags to each app and create metrics

.gitignore

@@ -50,6 +50,7 @@ redisinsight/api/commands
 redisinsight/api/guides
 redisinsight/api/tutorials
 redisinsight/api/content
+redisinsight/ui/dist-stats.html
 dist
 distWeb
 dll

Dockerfile

@@ -18,7 +18,7 @@ RUN apk update && apk add --no-cache --virtual .gyp \
 WORKDIR /usr/src/app
 
 # restore node_modules for front-end
-COPY package.json yarn.lock babel.config.cjs tsconfig.json ./
+COPY package.json yarn.lock tsconfig.json ./
 RUN SKIP_POSTINSTALL=1 yarn install
 
 # prepare backend by copying scripts/configs and installing node modules
@@ -29,7 +29,7 @@ COPY redisinsight ./redisinsight
 RUN yarn --cwd redisinsight/api install
 
 # build the frontend, static assets, and backend api
-RUN yarn build:web
+RUN yarn build:ui
 RUN yarn build:statics
 RUN yarn build:api
 

LICENSE

@@ -1,7 +1,7 @@
                      Server Side Public License
                      VERSION 1, OCTOBER 16, 2018
 
-                    Copyright © 2021 Redis, Inc.
+                    Copyright © 2018 MongoDB, Inc.
 
   Everyone is permitted to copy and distribute verbatim copies of this
   license document, but changing it is not allowed.
@@ -500,7 +500,7 @@
 
   14. Revised Versions of this License.
 
-  Redis, Inc. may publish revised and/or new versions of the Server Side
+  MongoDB, Inc. may publish revised and/or new versions of the Server Side
   Public License from time to time. Such new versions will be similar in
   spirit to the present version, but may differ in detail to address new
   problems or concerns.
@@ -509,9 +509,9 @@
   specifies that a certain numbered version of the Server Side Public
   License “or any later version” applies to it, you have the option of
   following the terms and conditions either of that numbered version or of
-  any later version published by Redis, Inc. If the Program does not
+  any later version published by MongoDB, Inc. If the Program does not
   specify a version number of the Server Side Public License, you may
-  choose any version ever published by Redis, Inc.
+  choose any version ever published by MongoDB, Inc.
 
   If the Program specifies that a proxy can decide which future versions of
   the Server Side Public License can be used, that proxy's public statement

README.md

@@ -1,14 +1,13 @@
 [![Release](https://img.shields.io/github/v/release/RedisInsight/RedisInsight.svg?sort=semver)](https://github.com/RedisInsight/RedisInsight/releases)
 [![CircleCI](https://circleci.com/gh/RedisInsight/RedisInsight/tree/main.svg?style=svg)](https://circleci.com/gh/RedisInsight/RedisInsight/tree/main)
-[![Total alerts](https://img.shields.io/lgtm/alerts/g/RedisInsight/RedisInsight.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/RedisInsight/RedisInsight/alerts/)
 
-# <img src="https://redis.com/wp-content/uploads/2019/11/ico-redisinsight.svg" alt="logo" width="25"/>  Redis Insight - Developer GUI for Redis, by Redis. 
+# <img src="https://redis.com/wp-content/uploads/2019/11/ico-redisinsight.svg" alt="logo" width="25"/>  Redis Insight - Developer GUI for Redis, by Redis.
 [![Forum](https://img.shields.io/badge/Forum-RedisInsight-red)](https://forum.redis.com/c/redisinsight/65)
 [![Discord](https://img.shields.io/discord/697882427875393627?style=flat-square)](https://discord.gg/QUkjSsk)
 
 
 Redis Insight is a visual tool that provides capabilities to design, develop, and optimize your Redis application.
-Query, analyse and interact with your Redis data. [Download it here](https://redis.com/redis-enterprise/redis-insight/#insight-form)!
+Query, analyse and interact with your Redis data. [Download it here](https://redis.io/insight/#insight-form)!
 
 ![Redis Insight Browser screenshot](/.github/redisinsight_browser.png)
 
@@ -21,28 +20,29 @@ 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://oss.redis.com/redisjson/)
+* 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/manual/pubsub/), enabling subscription to channels and posting messages to channels
+* 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://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](https://github.com/RedisInsight/Packages)
-* Officially supported for Redis OSS, [Redis Cloud](https://redis.com/try-free/). 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://docs.redis.com/latest/ri/release-notes/). 
+Check out the [release notes](https://github.com/RedisInsight/RedisInsight/releases). 
 
 ## Get started with Redis Insight
 
 This repository includes the code for Redis Insight. 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).
-Supports Windows, macOS (including M1), and Linux.
+Available to download for free from [here](https://redis.io/insight/#insight-form).
+Redis Insight is also available on Microsoft Store, Apple Store, Snapcraft, Flathub and [Docker](https://hub.docker.com/r/redis/redisinsight).
 
 ### Build 
 Alternatively you can also build from source. See our wiki for instructions.

babel.config.cjs

@@ -1,57 +1,13 @@
 /* eslint global-require: off, import/no-extraneous-dependencies: off */
-
-const developmentEnv = ['development', 'test'];
-
-const developmentPlugins = [
-  require('@babel/plugin-transform-runtime'),
-  require('react-hot-loader/babel'),
-];
-
-const productionPlugins = [
-  require('babel-plugin-dev-expression'),
-  require('@babel/plugin-transform-react-constant-elements'),
-  require('@babel/plugin-transform-react-inline-elements'),
-  require('babel-plugin-transform-react-remove-prop-types'),
-];
-
+const developmentEnv = ['development', 'test']
 module.exports = (api) => {
-  const development = api.env(developmentEnv);
+  const development = api.env(developmentEnv)
 
   return {
     presets: [
       require('@babel/preset-env'),
       require('@babel/preset-typescript'),
       [require('@babel/preset-react'), { development }],
     ],
-    plugins: [
-      // Stage 0
-      require('@babel/plugin-proposal-function-bind'),
-
-      // Stage 1
-      require('@babel/plugin-proposal-export-default-from'),
-      require('@babel/plugin-proposal-logical-assignment-operators'),
-      [require('@babel/plugin-proposal-optional-chaining'), { loose: false }],
-      [require('@babel/plugin-proposal-pipeline-operator'), { proposal: 'minimal' }],
-      [require('@babel/plugin-proposal-nullish-coalescing-operator'), { loose: false }],
-      require('@babel/plugin-proposal-do-expressions'),
-
-      // Stage 2
-      [require('@babel/plugin-proposal-decorators'), { legacy: true }],
-      require('babel-plugin-parameter-decorator'),
-      require('@babel/plugin-proposal-function-sent'),
-      require('@babel/plugin-proposal-export-namespace-from'),
-      require('@babel/plugin-proposal-numeric-separator'),
-      require('@babel/plugin-proposal-throw-expressions'),
-
-      // Stage 3
-      require('@babel/plugin-syntax-dynamic-import'),
-      require('@babel/plugin-syntax-import-meta'),
-      [require('@babel/plugin-proposal-class-properties'), { loose: true }],
-      require('@babel/plugin-proposal-json-strings'),
-      [require('@babel/plugin-proposal-private-property-in-object'), { loose: true }],
-      [require('@babel/plugin-proposal-private-methods'), { loose: true }],
-
-      ...(development ? developmentPlugins : productionPlugins),
-    ],
-  };
-};
+  }
+}

configs/webpack.config.base.ts

@@ -13,12 +13,17 @@ const configuration: webpack.Configuration =  {
       {
         test: /\.tsx?$/,
         exclude: /node_modules/,
-        use: {
-          loader: 'babel-loader',
-          options: {
-            cacheDirectory: true,
+        use: [
+          {
+            loader: 'ts-loader',
+            options: {
+              transpileOnly: true,
+              compilerOptions: {
+                module: 'esnext',
+              },
+            },
           },
-        },
+        ]
       },
     ],
   },

configs/webpack.config.eslint.js

@@ -1,5 +1,4 @@
 // eslint-disable-next-line import/no-self-import
 /* eslint import/no-unresolved: off, import/no-self-import: off */
-require('@babel/register');
 
 module.exports = require('./webpack.config.renderer.dev').default;