Merge branch 'main' into feature/RI-4141_Data_decompressors

# Conflicts:
#	redisinsight/ui/src/constants/keys.ts
#	redisinsight/ui/src/pages/browser/components/zset-details/ZSetDetails.tsx

Author: egor-zalenski

configs/webpack.config.web.prod.babel.js

@@ -25,9 +25,10 @@ export default merge(commonConfig, {
   target: 'web',
   entry: ['regenerator-runtime/runtime', './index.tsx'],
   output: {
-    filename: 'js/bundle.[fullhash].min.js',
+    filename: 'js/bundle.[name].min.js',
     path: resolve(__dirname, '../redisinsight/ui/dist'),
     publicPath: '/',
+    chunkFilename: '[id].[chunkhash].js'
   },
   optimization: {
     minimize: true,
@@ -37,6 +38,34 @@ export default merge(commonConfig, {
       }),
       new CssMinimizerPlugin(),
     ],
+    runtimeChunk: 'single',
+    splitChunks: {
+      chunks: 'all',
+      maxInitialRequests: Infinity,
+      minSize: 0,
+      cacheGroups: {
+        reactVendor: {
+          test: /[\\/]node_modules[\\/](react|react-dom)[\\/]/,
+          name: "reactVendor"
+        },
+        elasticVendor: {
+          test: /[\\/]node_modules[\\/](@elastic)[\\/]/,
+          name: "elasticVendor"
+        },
+        monacoVendor: {
+          test: /[\\/]node_modules[\\/](monaco-editor)[\\/]/,
+          name: "monacoVendor"
+        },
+        utilityVendor: {
+          test: /[\\/]node_modules[\\/](lodash)[\\/]/,
+          name: "utilityVendor"
+        },
+        vendor: {
+          test: /[\\/]node_modules[\\/](!@elastic)(!monaco-editor)(!lodash)[\\/]/,
+          name: "vendor"
+        },
+      },
+    },
   },
   plugins: [
     new MiniCssExtractPlugin({

redisinsight/about-panel.ts

@@ -7,7 +7,7 @@ const ICON_PATH = app.isPackaged
 
 export default {
   applicationName: 'RedisInsight-v2',
-  applicationVersion: app.getVersion() || '2.2.0',
+  applicationVersion: app.getVersion() || '2.20.0',
   copyright: `Copyright © ${new Date().getFullYear()} Redis Ltd.`,
   iconPath: ICON_PATH,
 };

redisinsight/api/config/default.ts

@@ -54,7 +54,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.0.0',
+    appVersion: process.env.APP_VERSION || '2.20.0',
     requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],

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.0.0',
+    version: '2.20.0',
   },
   tags: [],
 };

redisinsight/api/src/modules/database/database.analytics.spec.ts

@@ -190,7 +190,6 @@ describe('DatabaseAnalytics', () => {
       expect(sendEventSpy).toHaveBeenCalledWith(
         TelemetryEvents.RedisInstanceEditedByUser,
         {
-          port: cur.port,
           databaseId: cur.id,
           connectionType: cur.connectionType,
           provider: HostingProvider.RE_CLUSTER,
@@ -201,7 +200,6 @@ describe('DatabaseAnalytics', () => {
           useSSH: 'disabled',
           timeout: mockDatabaseWithTlsAuth.timeout / 1_000, // milliseconds to seconds
           previousValues: {
-            port: prev.port,
             connectionType: prev.connectionType,
             provider: prev.provider,
             useTLS: 'enabled',
@@ -227,7 +225,6 @@ describe('DatabaseAnalytics', () => {
       expect(sendEventSpy).toHaveBeenCalledWith(
         TelemetryEvents.RedisInstanceEditedByUser,
         {
-          port: cur.port,
           databaseId: cur.id,
           connectionType: cur.connectionType,
           provider: HostingProvider.RE_CLUSTER,
@@ -238,7 +235,6 @@ describe('DatabaseAnalytics', () => {
           useSSH: 'disabled',
           timeout: mockDatabaseWithTlsAuth.timeout / 1_000, // milliseconds to seconds
           previousValues: {
-            port: prev.port,
             connectionType: prev.connectionType,
             provider: prev.provider,
             useTLS: 'disabled',

redisinsight/api/src/modules/database/database.analytics.ts

@@ -88,7 +88,6 @@ export class DatabaseAnalytics extends TelemetryBaseService {
         this.sendEvent(
           TelemetryEvents.RedisInstanceEditedByUser,
           {
-            port: cur.port,
             databaseId: cur.id,
             connectionType: cur.connectionType,
             provider: cur.provider,
@@ -101,7 +100,6 @@ export class DatabaseAnalytics extends TelemetryBaseService {
             useSSH: cur?.ssh ? 'enabled' : 'disabled',
             timeout: cur?.timeout / 1_000, // milliseconds to seconds
             previousValues: {
-              port: prev.port,
               connectionType: prev.connectionType,
               provider: prev.provider,
               useTLS: prev.tls ? 'enabled' : 'disabled',

redisinsight/api/test/api/database/GET-databases-id-info.test.ts

@@ -65,7 +65,7 @@ describe(`GET /databases/:id/info`, () => {
 
 
   describe('ACL', () => {
-    requirements('rte.acl', 'rte.type=STANDALONE', '!rte.re');
+    requirements('rte.acl', 'rte.type=STANDALONE', '!rte.re', '!rte.sharedData');
     before(async () => rte.data.setAclUserRules('~* +@all'));
     beforeEach(rte.data.truncate);
 

redisinsight/package.json

@@ -2,7 +2,7 @@
   "name": "redisinsight",
   "productName": "RedisInsight",
   "private": true,
-  "version": "2.18.0",
+  "version": "2.20.0",
   "description": "RedisInsight",
   "main": "./main.prod.js",
   "author": {

redisinsight/ui/src/components/analytics-tabs/constants.tsx

@@ -14,16 +14,16 @@ export const analyticsViewTabs: AnalyticsTabs[] = [
   {
     id: AnalyticsViewTab.ClusterDetails,
     label: 'Overview',
-    onboard: ONBOARDING_FEATURES.ANALYTICS_OVERVIEW
+    onboard: ONBOARDING_FEATURES?.ANALYTICS_OVERVIEW
   },
   {
     id: AnalyticsViewTab.DatabaseAnalysis,
     label: 'Database Analysis',
-    onboard: ONBOARDING_FEATURES.ANALYTICS_DATABASE_ANALYSIS
+    onboard: ONBOARDING_FEATURES?.ANALYTICS_DATABASE_ANALYSIS
   },
   {
     id: AnalyticsViewTab.SlowLog,
     label: 'Slow Log',
-    onboard: ONBOARDING_FEATURES.ANALYTICS_SLOW_LOG
+    onboard: ONBOARDING_FEATURES?.ANALYTICS_SLOW_LOG
   },
 ]

redisinsight/ui/src/components/code-block/CodeBlock.spec.tsx

@@ -0,0 +1,46 @@
+import React from 'react'
+import { render, screen, fireEvent } from 'uiSrc/utils/test-utils'
+
+import CodeBlock from './CodeBlock'
+
+const originalClipboard = { ...global.navigator.clipboard }
+describe('CodeBlock', () => {
+  beforeEach(() => {
+    // @ts-ignore
+    global.navigator.clipboard = {
+      writeText: jest.fn(),
+    }
+  })
+
+  afterEach(() => {
+    jest.resetAllMocks()
+    // @ts-ignore
+    global.navigator.clipboard = originalClipboard
+  })
+
+  it('should render', () => {
+    expect(render(<CodeBlock>text</CodeBlock>)).toBeTruthy()
+  })
+
+  it('should render proper content', () => {
+    render(<CodeBlock data-testid="code">text</CodeBlock>)
+    expect(screen.getByTestId('code')).toHaveTextContent('text')
+  })
+
+  it('should not render copy button by default', () => {
+    render(<CodeBlock data-testid="code">text</CodeBlock>)
+    expect(screen.queryByTestId('copy-code-btn')).not.toBeInTheDocument()
+  })
+
+  it('should copy proper text', () => {
+    render(<CodeBlock data-testid="code" isCopyable>text</CodeBlock>)
+    fireEvent.click(screen.getByTestId('copy-code-btn'))
+    expect(navigator.clipboard.writeText).toHaveBeenCalledWith('text')
+  })
+
+  it('should copy proper text when children is ReactNode', () => {
+    render(<CodeBlock data-testid="code" isCopyable><span>text2</span></CodeBlock>)
+    fireEvent.click(screen.getByTestId('copy-code-btn'))
+    expect(navigator.clipboard.writeText).toHaveBeenCalledWith('text2')
+  })
+})