Merge branch 'main' into feature/RI-2932_Consumer_Groups

# Conflicts:
#	redisinsight/ui/src/pages/browser/components/stream-details/StreamDetailsWrapper.tsx

Author: egor-zalenski

redisinsight/about-panel.ts

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

redisinsight/api/src/modules/instances/dto/database-instance.dto.ts

@@ -212,7 +212,6 @@ export class ConnectionOptionsDto extends EndpointDto {
     example: 0,
   })
   @IsInt()
-  @Max(15)
   @Min(0)
   @Type(() => Number)
   @IsOptional()
@@ -403,15 +402,13 @@ export class AddDatabaseInstanceDto extends ConnectionOptionsDto {
 
 export class ConnectToRedisDatabaseIndexDto {
   @ApiPropertyOptional({
-    description: 'Databases index. Redis databases are numbered from 0 to 15.',
+    description: 'Databases index.',
     type: Number,
     minimum: 0,
-    maximum: 15,
     default: 0,
   })
   @IsInt()
   @Min(0)
-  @Max(15)
   @Type(() => Number)
   @IsNotEmpty()
   dbNumber?: number;

redisinsight/api/src/modules/instances/dto/redis-sentinel.dto.ts

@@ -64,7 +64,6 @@ export class AddSentinelMasterDto {
     example: 0,
   })
   @IsInt()
-  @Max(15)
   @Min(0)
   @Type(() => Number)
   @IsOptional()

redisinsight/package.json

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

redisinsight/ui/src/components/input-field-sentinel/InputFieldSentinel.tsx

@@ -3,7 +3,7 @@ import { omit } from 'lodash'
 import React, { useState } from 'react'
 import cx from 'classnames'
 import { useDebouncedEffect } from 'uiSrc/services'
-import { validateDatabaseNumber } from 'uiSrc/utils'
+import { validateNumber } from 'uiSrc/utils'
 
 import styles from './styles.module.scss'
 
@@ -77,7 +77,7 @@ const InputFieldSentinel = (props: Props) => {
           compressed
           type="text"
           value={value}
-          onChange={(e) => handleChange(validateDatabaseNumber(e.target?.value))}
+          onChange={(e) => handleChange(validateNumber(e.target?.value))}
           data-testid="sentinel-input-number"
         />
       )}

redisinsight/ui/src/components/main-router/constants/redisStackRoutes.ts

@@ -3,6 +3,7 @@ import {
   BrowserPage, InstancePage,
 } from 'uiSrc/pages'
 import WorkbenchPage from 'uiSrc/pages/workbench'
+import SlowLogPage from 'uiSrc/pages/slowLog'
 import EditConnection from 'uiSrc/pages/redisStack/components/edit-connection'
 import COMMON_ROUTES from './commonRoutes'
 
@@ -19,6 +20,12 @@ const INSTANCE_ROUTES: IRoute[] = [
     path: Pages.workbench(':instanceId'),
     component: WorkbenchPage,
   },
+  {
+    pageName: PageNames.slowLog,
+    protected: true,
+    path: Pages.slowLog(':instanceId'),
+    component: SlowLogPage,
+  },
 ]
 
 const ROUTES: IRoute[] = [

redisinsight/ui/src/components/range-filter/RangeFilter.tsx

@@ -118,15 +118,15 @@ const RangeFilter = (props: Props) => {
   }, [end])
 
   useEffect(() => {
-    if (max && prevValue && prevValue.max !== max && end === prevValue.max) {
+    if (prevValue.max !== max && end === prevValue.max) {
       handleUpdateRangeMax(max)
     }
-    if (min && prevValue && prevValue.min !== min && start === prevValue.min) {
+    if (prevValue.min !== min && start === prevValue.min) {
       handleUpdateRangeMin(min)
     }
   }, [prevValue])
 
-  if (start === 0 && end === 0) {
+  if (start === 0 && max !== 0 && end === 0 && min !== 0) {
     return (
       <div data-testid="mock-blank-range" className={styles.rangeWrapper}>
         <div className={cx(styles.sliderTrack, styles.mockRange)} />

redisinsight/ui/src/constants/durationUnits.tsx

@@ -18,7 +18,7 @@ export const DURATION_UNITS: EuiSuperSelectOption<DurationUnits>[] = [
 
 export const MINUS_ONE = -1
 export const DEFAULT_SLOWLOG_MAX_LEN = 128
-export const DEFAULT_SLOWLOG_SLOWER_THAN = 10000
+export const DEFAULT_SLOWLOG_SLOWER_THAN = 10_000
 export const DEFAULT_SLOWLOG_DURATION_UNIT = DurationUnits.microSeconds
 
 export default DURATION_UNITS

redisinsight/ui/src/packages/redisgraph/src/graphd3.ts

@@ -816,6 +816,10 @@ function GraphD3(_selector: HTMLDivElement, _options: any): IGraphD3 {
         if (typeof options.onNodeClick === 'function') {
           options.onNodeClick(this, d, event)
         }
+
+        if (info) {
+          updateInfo(d)
+        }
       })
       .on('dblclick', function onNodeDoubleClick(event, d) {
         stickNode(this, event, d)
@@ -843,10 +847,6 @@ function GraphD3(_selector: HTMLDivElement, _options: any): IGraphD3 {
                            .call(zoom.translateTo as any, d.x, d.y), 10)
       })
       .on('mouseenter', function onNodeMouseEnter(event, d) {
-        if (info) {
-          updateInfo(d)
-        }
-
         if (typeof options.onNodeMouseEnter === 'function') {
           options.onNodeMouseEnter(this, d, event)
         }
@@ -893,6 +893,10 @@ function GraphD3(_selector: HTMLDivElement, _options: any): IGraphD3 {
         if (typeof options.onNodeInfoClick === 'function') {
           options.onNodeInfoClick(this, d, event)
         }
+
+        if (info) {
+          updateInfo(d)
+        }
       })
 
     g.append('rect')
@@ -985,7 +989,7 @@ function GraphD3(_selector: HTMLDivElement, _options: any): IGraphD3 {
           options.onRelationshipDoubleClick(this, d, event)
         }
       })
-      .on('mouseenter', (event, d) => {
+      .on('click', (event, d) => {
         if (info) {
           updateInfo(d)
         }

redisinsight/ui/src/pages/browser/components/hash-details/HashDetails.tsx

@@ -259,8 +259,8 @@ const HashDetails = (props: Props) => {
               data-testid={`edit-hash-button-${field}`}
             />
             <PopoverDelete
-              header={createDeleteFieldHeader(key)}
-              text={createDeleteFieldMessage(field)}
+              header={createDeleteFieldHeader(field)}
+              text={createDeleteFieldMessage(key)}
               item={field}
               suffix={suffix}
               deleting={deleting}