Post 2.70.0 release merge back to main

.github/build/release-docker.sh

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

.github/workflows/aws-upload-enterprise.yml

@@ -53,19 +53,6 @@ jobs:
           aws s3 cp release/ s3://${AWS_BUCKET_NAME_PROD}/releases/${APP_VERSION} --recursive
           aws s3 cp release/ s3://${AWS_BUCKET_NAME_PROD}/latest --recursive
 
-      - name: Download vendor plugins
-        uses: actions/download-artifact@v4
-        id: download-vendor
-        continue-on-error: true
-        with:
-          name: 'vendor-plugins'
-          path: vendor
-
-      - name: Upload vendor plugins to s3 bucket
-        if: steps.download-vendor.outcome == 'success'
-        run: |
-          aws s3 cp vendor/ s3://${SELECTED_AWS_BUCKET_NAME}/public/plugins/static/ --recursive
-
       - name: Generate job summary
         run: |
           node ./.github/generate-build-summary.js

package.json

@@ -11,7 +11,7 @@
     "dev:electron:api": "cross-env RI_APP_PORT=5540 RI_APP_TYPE=ELECTRON NODE_ENV=development USE_TCP_CLOUD_AUTH=true yarn --cwd redisinsight/api start:dev",
     "dev:electron": "cross-env RI_APP_TYPE=ELECTRON RI_AUTO_BOOTSTRAP=false NODE_ENV=development USE_TCP_CLOUD_AUTH=true yarn --cwd redisinsight/desktop dev",
     "dev:desktop": "concurrently \"yarn dev:electron:api\" \"yarn dev:electron:ui\" \"yarn dev:electron\"",
-    "build:ui": "cross-env NODE_ENV=production RI_APP_TYPE=WEB yarn --cwd redisinsight/ui build",
+    "build:ui": "cross-env NODE_ENV=production RI_APP_TYPE=web yarn --cwd redisinsight/ui build",
     "build:renderer": "cross-env NODE_ENV=production RI_APP_TYPE=ELECTRON yarn --cwd redisinsight/ui build --emptyOutDir && copyfiles ./redisinsight/desktop/splash.html ./redisinsight/dist/renderer -f",
     "stats:ui": "yarn --cwd redisinsight/ui stats",
     "build": "cross-env NODE_ENV=development concurrently \"yarn build:main\" \"yarn build:renderer\"",

redisinsight/api/config/default.ts

@@ -105,7 +105,7 @@ export default {
       : true,
     buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
     appType: process.env.RI_APP_TYPE,
-    appVersion: process.env.RI_APP_VERSION || '2.68.0',
+    appVersion: process.env.RI_APP_VERSION || '2.70.0',
     requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],

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

redisinsight/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redisinsight-api",
-  "version": "2.68.0",
+  "version": "2.70.0",
   "description": "Redis Insight API",
   "private": true,
   "author": {

redisinsight/api/src/__mocks__/database-discovery.ts

@@ -7,7 +7,7 @@ export const mockDefaultDatabaseFields = {
   modules: [],
   caCert: null,
   clientCert: null,
-  db: null,
+  db: 0,
   nameFromProvider: null,
   password: null,
   provider: null,
@@ -24,6 +24,7 @@ export const mockDatabaseToImportFromEnvsInput = {
   host: 'localhost',
   port: 6379,
   name: 'local database',
+  db: 0,
 } as Partial<Database>;
 
 export const mockDatabaseToImportFromEnvsPrepared = {
@@ -45,6 +46,7 @@ export const mockDatabaseToImportWithCertsFromEnvsInput = {
     key: 'User key',
   },
   verifyServerCert: true,
+  db: 0,
 } as Partial<Database>;
 
 export const mockDatabaseToImportWithCertsFromEnvsPrepared = {

redisinsight/api/src/modules/database-discovery/utils/pre-setup.discovery.util.ts

@@ -1,3 +1,4 @@
+import { v4 as uuidv4 } from 'uuid';
 import { pathExists, readFile } from 'fs-extra';
 import { Database } from 'src/modules/database/models/database';
 import {
@@ -34,7 +35,7 @@ export const populateDefaultValues = (
   database: Partial<Database>,
 ): Database => {
   const {
-    id,
+    id = uuidv4(),
     host,
     port = 6379,
     name = `${host}:${port}`,
@@ -126,6 +127,7 @@ export const prepareDatabaseFromEnvs = async (
       id: id || '0',
       host: process.env[hostEnv],
       port: parseInt(process.env[`RI_REDIS_PORT${id}`], 10) || 6379,
+      db: parseInt(process.env[`RI_REDIS_DB${id}`], 10) || 0,
       name: process.env[`RI_REDIS_ALIAS${id}`],
       username: process.env[`RI_REDIS_USERNAME${id}`],
       password: process.env[`RI_REDIS_PASSWORD${id}`],

redisinsight/api/src/modules/database/dto/redis-info.dto.ts

@@ -1,5 +1,39 @@
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 
+class RedisDatabaseStatsDto {
+  @ApiProperty({
+    type: String,
+  })
+  instantaneous_input_kbps: string | undefined;
+
+  @ApiProperty({
+    type: String,
+  })
+  instantaneous_ops_per_sec: string | undefined;
+
+  @ApiProperty({
+    type: String,
+  })
+  instantaneous_output_kbps: string | undefined;
+
+  @ApiProperty({
+    type: Number,
+  })
+  maxmemory_policy: string | undefined;
+
+  @ApiProperty({
+    description: 'Redis database mode',
+    type: String,
+  })
+  numberOfKeysRange: string | undefined;
+
+  @ApiProperty({
+    description: 'Redis database role',
+    type: String,
+  })
+  uptime_in_days: string | undefined;
+}
+
 export class RedisNodeInfoResponse {
   @ApiProperty({
     description: 'Redis database version',
@@ -22,6 +56,12 @@ export class RedisNodeInfoResponse {
   })
   server?: any;
 
+  @ApiPropertyOptional({
+    description: 'Various Redis stats',
+    type: RedisDatabaseStatsDto,
+  })
+  stats?: RedisDatabaseStatsDto;
+
   @ApiPropertyOptional({
     description: 'The number of Redis databases',
     type: Number,

redisinsight/api/src/modules/database/providers/database-info.provider.spec.ts

@@ -32,12 +32,21 @@ const mockRedisServerInfoDto = {
   tcp_port: '11113',
   uptime_in_seconds: '1000',
 };
+const mockRedisStatsDto = {
+  instantaneous_input_kbps: undefined,
+  instantaneous_ops_per_sec: undefined,
+  instantaneous_output_kbps: undefined,
+  maxmemory_policy: undefined,
+  numberOfKeysRange: '0 - 500 000',
+  uptime_in_days: undefined,
+};
 
 const mockRedisGeneralInfo: RedisDatabaseInfoResponse = {
   version: mockRedisServerInfoDto.redis_version,
   databases: 16,
   role: 'master',
   server: mockRedisServerInfoDto,
+  stats: mockRedisStatsDto,
   usedMemory: 1000000,
   totalKeys: 1,
   connectedClients: 1,
@@ -441,6 +450,10 @@ describe('DatabaseInfoProvider', () => {
 
       expect(result).toEqual({
         ...mockRedisGeneralInfo,
+        stats: {
+          ...mockRedisStatsDto,
+          numberOfKeysRange: undefined,
+        },
         totalKeys: undefined,
         usedMemory: undefined,
         hitRatio: undefined,
@@ -481,6 +494,10 @@ describe('DatabaseInfoProvider', () => {
 
       expect(result).toEqual({
         ...mockRedisGeneralInfo,
+        stats: {
+          ...mockRedisStatsDto,
+          numberOfKeysRange: undefined,
+        },
         server: {
           redis_mode: mockRedisServerInfoDto.redis_mode,
           redis_version: mockRedisGeneralInfo.version,

redisinsight/api/src/modules/database/providers/database-info.provider.ts

@@ -3,6 +3,8 @@ import {
   calculateRedisHitRatio,
   catchAclError,
   convertIntToSemanticVersion,
+  getRangeForNumber,
+  TOTAL_KEYS_BREAKPOINTS,
 } from 'src/utils';
 import { AdditionalRedisModule } from 'src/modules/database/models/additional.redis.module';
 import { REDIS_MODULES_COMMANDS, SUPPORTED_REDIS_MODULES } from 'src/constants';
@@ -162,11 +164,12 @@ export class DatabaseInfoProvider {
       const statsInfo = info['stats'];
       const replicationInfo = info['replication'];
       const databases = await this.getDatabasesCount(client, keyspaceInfo);
+      const totalKeys = this.getRedisNodeTotalKeysCount(keyspaceInfo);
       return {
         version: serverInfo?.redis_version,
         databases,
-        role: get(replicationInfo, 'role') || undefined,
-        totalKeys: this.getRedisNodeTotalKeysCount(keyspaceInfo),
+        role: get(replicationInfo, 'role'),
+        totalKeys,
         usedMemory: parseInt(get(memoryInfo, 'used_memory'), 10) || undefined,
         connectedClients:
           parseInt(get(clientsInfo, 'connected_clients'), 10) || undefined,
@@ -177,6 +180,23 @@ export class DatabaseInfoProvider {
           parseInt(get(memoryInfo, 'number_of_cached_scripts'), 10) ||
           undefined,
         server: serverInfo,
+        stats: {
+          instantaneous_ops_per_sec: get(
+            statsInfo,
+            'instantaneous_ops_per_sec',
+          ),
+          instantaneous_input_kbps: get(statsInfo, 'instantaneous_input_kbps'),
+          instantaneous_output_kbps: get(
+            statsInfo,
+            'instantaneous_output_kbps',
+          ),
+          uptime_in_days: get(serverInfo, 'uptime_in_days', undefined),
+          maxmemory_policy: get(memoryInfo, 'maxmemory_policy', undefined),
+          numberOfKeysRange: getRangeForNumber(
+            totalKeys,
+            TOTAL_KEYS_BREAKPOINTS,
+          ),
+        },
       };
     } catch (error) {
       throw catchAclError(error);

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

@@ -36,8 +36,24 @@ const responseSchema = Joi.object()
         hitRatio: Joi.number().required(),
         cashedScripts: Joi.number(),
         server: Joi.object().required(),
+        stats: Joi.object().keys({
+          instantaneous_ops_per_sec: Joi.string(),
+          instantaneous_input_kbps: Joi.string(),
+          instantaneous_output_kbps: Joi.string(),
+          uptime_in_days: Joi.string(),
+          maxmemory_policy: Joi.string(),
+          numberOfKeysRange: Joi.string(),
+        }),
       }),
     ),
+    stats: Joi.object().keys({
+      instantaneous_ops_per_sec: Joi.string(),
+      instantaneous_input_kbps: Joi.string(),
+      instantaneous_output_kbps: Joi.string(),
+      uptime_in_days: Joi.string(),
+      maxmemory_policy: Joi.string(),
+      numberOfKeysRange: Joi.string(),
+    }),
   })
   .required()
   .strict();

redisinsight/desktop/src/lib/aboutPanel/aboutPanel.ts

@@ -7,7 +7,7 @@ const ICON_PATH = app.isPackaged
   : path.join(__dirname, '../resources', 'icon.png')
 
 const appVersionPrefix = config.isEnterprise ? 'Enterprise - ' : ''
-const appVersion = app.getVersion() || '2.68.0'
+const appVersion = app.getVersion() || '2.70.0'
 const appVersionSuffix = !config.isProduction
   ? `-dev-${process.getCreationTime()}`
   : ''

redisinsight/package.json

@@ -3,7 +3,7 @@
   "appName": "Redis Insight",
   "productName": "RedisInsight",
   "private": true,
-  "version": "2.68.0",
+  "version": "2.70.0",
   "description": "Redis Insight",
   "main": "./dist/main/main.js",
   "author": {

redisinsight/ui/src/components/base/layout/list/Item.tsx

@@ -118,7 +118,6 @@ const Item = ({
       $isActive={isActive}
       $isDisabled={isDisabled}
       $color={color}
-      onClick={onClick}
       className={cx(ListClassNames.listItem, className, {
         [ListClassNames.listItemActive]: isActive,
         [ListClassNames.listItemDisabled]: isDisabled,

redisinsight/ui/src/components/instance-header/components/instances-navigation-popover/components/instances-list/InstancesList.spec.tsx

@@ -9,7 +9,8 @@ import {
   render,
   screen,
 } from 'uiSrc/utils/test-utils'
-import { TelemetryEvent, sendEventTelemetry } from 'uiSrc/telemetry'
+import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
+import { Instance, RdiInstance } from 'uiSrc/slices/interfaces'
 import InstancesList, { InstancesListProps } from './InstancesList'
 import { InstancesTabs } from '../../InstancesNavigationPopover'
 
@@ -22,25 +23,39 @@ beforeEach(() => {
   store.clearActions()
 })
 
-const mockRdis = [
+const mockRdis: RdiInstance[] = [
   {
     id: 'rdiDB_1',
     name: 'RdiDB_1',
+    loading: false,
+    error: '',
+    url: '',
   },
   {
     id: 'rdiDB_2',
     name: 'RdiDB_2',
+    loading: false,
+    error: '',
+    url: '',
   },
 ]
 
-const mockDbs = [
+const mockDbs: Instance[] = [
   {
     id: 'db_1',
     name: 'DB_1',
+    host: 'localhost',
+    port: 6379,
+    modules: [],
+    version: '7.0.0',
   },
   {
     id: 'db_2',
     name: 'DB_2',
+    host: 'localhost',
+    port: 6379,
+    modules: [],
+    version: '7.0.0',
   },
 ]
 
@@ -85,7 +100,7 @@ describe('InstancesList', () => {
       />,
     )
 
-    expect(screen.getByText(mockDbs[0].name)).toBeInTheDocument()
+    expect(screen.getByText(mockDbs[0].name!)).toBeInTheDocument()
   })
 
   it('should render rdi instances when selected tab is rdi', () => {
@@ -99,26 +114,24 @@ describe('InstancesList', () => {
     expect(screen.getByText(mockRdis[0].name)).toBeInTheDocument()
   })
 
-  it('should send event telemetry', () => {
+  it('should send event telemetry', async () => {
     const sendEventTelemetryMock = jest.fn()
     ;(sendEventTelemetry as jest.Mock).mockImplementation(
       () => sendEventTelemetryMock,
     )
 
-    render(
+    const { getByTestId } = render(
       <InstancesList
         {...instance(mockedProps)}
         selectedTab={InstancesTabs.Databases}
         filteredDbInstances={mockDbs}
       />,
     )
 
-    const listItem = screen.getByTestId(`instance-item-${mockDbs[1].id}`)
-    act(() => {
-      fireEvent.click(listItem)
-    })
+    const listItem = getByTestId(`instance-item-${mockDbs[1].id}`)
+    await act(() => fireEvent.click(listItem))
 
-    expect(sendEventTelemetry).toBeCalledWith({
+    expect(sendEventTelemetry).toHaveBeenCalledWith({
       event: TelemetryEvent.CONFIG_DATABASES_OPEN_DATABASE,
       eventData: expect.any(Object),
     })