Merge pull request #2392 from RedisInsight/release/2.30.0

Release/2.30.0 to latest

Author: vlad-dargel

.circleci/config.yml

@@ -173,10 +173,10 @@ orbs:
 executors:
   linux-executor:
     machine:
-      image: ubuntu-2004:202010-01
+      image: ubuntu-2004:2023.04.2
   linux-executor-dlc:
     machine:
-      image: ubuntu-2004:202010-01
+      image: ubuntu-2004:2023.04.2
       docker_layer_caching: true
 
 jobs:
@@ -790,6 +790,9 @@ jobs:
           root: .
           paths:
             - ./docker-release
+      - store_artifacts:
+          path: docker-release
+          destination: docker-release
 
   # Release jobs
   store-build-artifacts:

.dockerignore

@@ -4,18 +4,15 @@
 .circleci
 .docker
 
-coverage
-dll
 **/node_modules
 release
 
-redisinsight/dist
-redisinsight/node_modules
-redisinsight/main.prod.js
-
-redisinsight/api/.nyc_output
-redisinsight/api/coverage
-redisinsight/api/dist
-redisinsight/api/node_modules
+**/dist
+**/coverage
+**/dll
+**/.issues
+**/.parcel-cache
+**/.temp_cache
+**/.nyc_output
 
-redisinsight/ui/dist
+redisinsight/main.prod.js

configs/webpack.config.renderer.dev.ts

@@ -232,7 +232,7 @@ const configuration: webpack.Configuration = {
 
     new ReactRefreshWebpackPlugin(),
 
-    new MonacoWebpackPlugin({ languages: ['json'], features: ['!rename'] }),
+    new MonacoWebpackPlugin({ languages: ['json', 'javascript', 'typescript'], features: ['!rename'] }),
 
     ...htmlPagesNames.map((htmlPageName) => (
       new HtmlWebpackPlugin({

configs/webpack.config.renderer.prod.ts

@@ -180,7 +180,7 @@ const configuration: webpack.Configuration = {
   },
 
   plugins: [
-    new MonacoWebpackPlugin({ languages: ['json'], features: ['!rename'] }),
+    new MonacoWebpackPlugin({ languages: ['json', 'javascript', 'typescript'], features: ['!rename'] }),
 
     new webpack.EnvironmentPlugin({
       NODE_ENV: 'production',

configs/webpack.config.web.common.ts

@@ -70,7 +70,7 @@ export default {
 
     new HtmlWebpackPlugin({ template: 'index.html.ejs' }),
 
-    new MonacoWebpackPlugin({ languages: ['json'], features: ['!rename'] }),
+    new MonacoWebpackPlugin({ languages: ['json', 'javascript', 'typescript'], features: ['!rename'] }),
 
     new webpack.IgnorePlugin({
       checkResource(resource) {

electron-builder.json

@@ -29,7 +29,7 @@
     "type": "distribution",
     "hardenedRuntime": true,
     "darkModeSupport": true,
-    "bundleVersion": "50",
+    "bundleVersion": "70",
     "icon": "resources/icon.icns",
     "artifactName": "${productName}-${os}-${arch}.${ext}",
     "entitlements": "resources/entitlements.mac.plist",

redisinsight/__mocks__/monacoMock.js

@@ -15,8 +15,10 @@ export default function MonacoEditor(props) {
         createContextKey: jest.fn(),
         focus: jest.fn(),
         onDidChangeCursorPosition: jest.fn(),
+        onDidAttemptReadOnlyEdit: jest.fn(),
         executeEdits: jest.fn(),
-        updateOptions: jest.fn()
+        updateOptions: jest.fn(),
+        setSelection: jest.fn(),
       },
       // monaco
       {
@@ -57,3 +59,7 @@ export const languages = {
     InsertAsSnippet: 4
   }
 }
+
+export const monaco = {
+  Selection: jest.fn().mockImplementation(() => { return {} })
+}

redisinsight/api/config/default.ts

@@ -58,7 +58,7 @@ export default {
     tlsKey: process.env.SERVER_TLS_KEY,
     staticContent: !!process.env.SERVER_STATIC_CONTENT || false,
     buildType: process.env.BUILD_TYPE || 'ELECTRON',
-    appVersion: process.env.APP_VERSION || '2.28.1',
+    appVersion: process.env.APP_VERSION || '2.30.0',
     requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],
@@ -195,6 +195,13 @@ export default {
       url: process.env.COMMANDS_REDISBLOOM_URL
         || 'https://raw.githubusercontent.com/RedisBloom/RedisBloom/master/commands.json',
     },
+    {
+      name: 'triggers_and_functions',
+      url: process.env.COMMANDS_TRIGGERS_AND_FUNCTIONS_URL
+        || 'https://raw.githubusercontent.com/RedisGears/RedisGears/master/commands.json',
+      defaultUrl: process.env.COMMANDS_TRIGGERS_AND_FUNCTIONS_DEFAULT_URL
+        || 'https://s3.amazonaws.com/redisinsight.download/public/commands/triggers_and_functions.json',
+    },
   ],
   connections: {
     timeout: parseInt(process.env.CONNECTIONS_TIMEOUT_DEFAULT, 10) || 30 * 1_000, // 30 sec

redisinsight/api/config/swagger.ts

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

redisinsight/api/scripts/default-commands.ts

@@ -8,10 +8,10 @@ const COMMANDS_CONFIG = get('commands');
 
 async function init() {
   try {
-    await Promise.all(COMMANDS_CONFIG.map(async ({ name, url }) => {
+    await Promise.all(COMMANDS_CONFIG.map(async ({ name, url, defaultUrl }) => {
       try {
         console.log(`Trying to get ${name} commands...`);
-        const { data } = await axios.get(url, {
+        const { data } = await axios.get(defaultUrl || url, {
           responseType: 'text',
           transformResponse: [(raw) => raw],
         });