RI-7106: additiona data in config databases open database

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/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),
     })

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

@@ -13,6 +13,7 @@ import {
   TelemetryEvent,
   getRedisModulesSummary,
   sendEventTelemetry,
+  getRedisInfoSummary,
 } from 'uiSrc/telemetry'
 import { getDbIndex } from 'uiSrc/utils'
 import {
@@ -56,20 +57,22 @@ const InstancesList = ({
     history.push(Pages.browser(id))
   }
 
-  const goToInstance = (instance: Instance) => {
+  const goToInstance = async (instance: Instance) => {
     if (instanceId === instance.id) {
       // already connected so do nothing
       return
     }
     setLoading(true)
     const modulesSummary = getRedisModulesSummary(instance.modules)
-    sendEventTelemetry({
+    const infoData = await getRedisInfoSummary(instance.id)
+    await sendEventTelemetry({
       event: TelemetryEvent.CONFIG_DATABASES_OPEN_DATABASE,
       eventData: {
         databaseId: instance.id,
         source: 'navigation_panel',
         provider: instance.provider,
         ...modulesSummary,
+        ...infoData,
       },
     })
     dispatch(

redisinsight/ui/src/components/oauth/oauth-connect-free-db/OAuthConnectFreeDb.spec.tsx

@@ -1,17 +1,24 @@
 import React from 'react'
 import { cloneDeep } from 'lodash'
-import { cleanup, fireEvent, mockedStore, render } from 'uiSrc/utils/test-utils'
 import {
-  TelemetryEvent,
+  act,
+  cleanup,
+  fireEvent,
+  mockedStore,
+  render,
+} from 'uiSrc/utils/test-utils'
+import {
   getRedisModulesSummary,
   sendEventTelemetry,
+  TelemetryEvent,
 } from 'uiSrc/telemetry'
 import {
   freeInstancesSelector,
   setDefaultInstance,
 } from 'uiSrc/slices/instances/instances'
 import { OAuthSocialSource } from 'uiSrc/slices/interfaces'
 import { setCapability } from 'uiSrc/slices/app/context'
+import { MOCK_ADDITIONAL_INFO } from 'uiSrc/mocks/data/instances'
 import OAuthConnectFreeDb from './OAuthConnectFreeDb'
 
 jest.mock('uiSrc/telemetry', () => ({
@@ -56,15 +63,20 @@ describe('OAuthConnectFreeDb', () => {
 
     const { queryByTestId } = render(<OAuthConnectFreeDb id="providedId" />)
 
-    fireEvent.click(queryByTestId('connect-free-db-btn') as HTMLButtonElement)
+    await act(() =>
+      fireEvent.click(
+        queryByTestId('connect-free-db-btn') as HTMLButtonElement,
+      ),
+    )
 
-    expect(sendEventTelemetry).toBeCalledWith({
+    expect(sendEventTelemetry).toHaveBeenCalledWith({
       event: TelemetryEvent.CONFIG_DATABASES_OPEN_DATABASE,
       eventData: {
         databaseId: 'providedId',
         provider: undefined,
         source: OAuthSocialSource.ListOfDatabases,
         ...getRedisModulesSummary(),
+        ...MOCK_ADDITIONAL_INFO,
       },
     })
 

redisinsight/ui/src/components/oauth/oauth-connect-free-db/OAuthConnectFreeDb.tsx

@@ -8,6 +8,7 @@ import {
   TelemetryEvent,
   getRedisModulesSummary,
   sendEventTelemetry,
+  getRedisInfoSummary,
 } from 'uiSrc/telemetry'
 import { OAuthSocialSource } from 'uiSrc/slices/interfaces'
 import {
@@ -48,15 +49,17 @@ const OAuthConnectFreeDb = ({
     return null
   }
 
-  const sendTelemetry = () => {
+  const sendTelemetry = async () => {
     const modulesSummary = getRedisModulesSummary(modules)
+    const infoData = await getRedisInfoSummary(targetDatabaseId)
     sendEventTelemetry({
       event: TelemetryEvent.CONFIG_DATABASES_OPEN_DATABASE,
       eventData: {
         databaseId: targetDatabaseId,
         provider,
         source,
         ...modulesSummary,
+        ...infoData,
       },
     })
   }
@@ -67,8 +70,8 @@ const OAuthConnectFreeDb = ({
     openNewWindowDatabase(Pages.browser(targetDatabaseId) + search)
   }
 
-  const handleCheckConnectToInstance = () => {
-    sendTelemetry()
+  const handleCheckConnectToInstance = async () => {
+    await sendTelemetry()
     dispatch(setCapability({ source, tutorialPopoverShown: false }))
     dispatch(
       checkConnectToInstanceAction(

redisinsight/ui/src/mocks/data/instances.ts

@@ -0,0 +1,27 @@
+export const MOCK_INFO_API_RESPONSE = {
+  version: '7.4.0',
+  usedMemory: 1234,
+  connectedClients: 2,
+  totalKeys: 123,
+  stats: {
+    uptime_in_days: '2',
+    maxmemory_policy: 'allkeys-lru',
+    instantaneous_ops_per_sec: 123,
+    instantaneous_input_kbps: 123,
+    instantaneous_output_kbps: 123,
+    numberOfKeysRange: '0-123',
+  },
+}
+
+export const MOCK_ADDITIONAL_INFO = {
+  connected_clients: 2,
+  instantaneous_input_kbps: 123,
+  instantaneous_ops_per_sec: 123,
+  instantaneous_output_kbps: 123,
+  maxmemory_policy: 'allkeys-lru',
+  numberOfKeysRange: '0-123',
+  redis_version: '7.4.0',
+  totalKeys: 123,
+  uptime_in_days: '2',
+  used_memory: 1234,
+}