Skip to content

Bugfix/release small fixes #3664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 2, 2024
Merged

Bugfix/release small fixes #3664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c54efd
RI-5910 fixed connection status display
kchepikava Jul 26, 2024
94ba2e6
hide refresh buttons
ArtemHoruzhenko Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions redisinsight/ui/src/pages/rdi/statistics/StatisticsPage.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ describe('StatisticsPage', () => {
})
})

it('should call proper telemetry event when refresh is clicked for data streams section', () => {
xit('should call proper telemetry event when refresh is clicked for data streams section', () => {
render(<StatisticsPage />)

fireEvent.click(screen.getByTestId('data-streams-refresh-btn'))
Expand All @@ -175,7 +175,7 @@ describe('StatisticsPage', () => {
})
})

it('should call proper telemetry event when refresh is clicked for clients section', () => {
xit('should call proper telemetry event when refresh is clicked for clients section', () => {
render(<StatisticsPage />)

fireEvent.click(screen.getByTestId('clients-refresh-btn'))
Expand Down Expand Up @@ -228,7 +228,7 @@ describe('StatisticsPage', () => {
})
})

it('should call proper telemetry event when auto refresh is enabled for data streams section', async () => {
xit('should call proper telemetry event when auto refresh is enabled for data streams section', async () => {
render(<StatisticsPage />)

const testid = 'data-streams'
Expand All @@ -247,7 +247,7 @@ describe('StatisticsPage', () => {
})
})

it('should call proper telemetry event when auto refresh is disabled for data streams section', async () => {
xit('should call proper telemetry event when auto refresh is disabled for data streams section', async () => {
render(<StatisticsPage />)

const testid = 'data-streams'
Expand All @@ -267,7 +267,7 @@ describe('StatisticsPage', () => {
})
})

it('should call proper telemetry event when auto refresh is enabled for clients section', async () => {
xit('should call proper telemetry event when auto refresh is enabled for clients section', async () => {
render(<StatisticsPage />)

const testid = 'clients'
Expand All @@ -286,7 +286,7 @@ describe('StatisticsPage', () => {
})
})

it('should call proper telemetry event when auto refresh is disabled for clients section', async () => {
xit('should call proper telemetry event when auto refresh is disabled for clients section', async () => {
render(<StatisticsPage />)

const testid = 'clients'
Expand Down
1 change: 1 addition & 0 deletions redisinsight/ui/src/pages/rdi/statistics/clients/Clients.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ const Clients = ({ data, loading, onRefresh, onRefreshClicked, onChangeAutoRefre
<Accordion
id="clients"
title="Clients"
hideAutoRefresh
loading={loading}
onRefresh={onRefresh}
onRefreshClicked={onRefreshClicked}
Expand Down
1 change: 1 addition & 0 deletions redisinsight/ui/src/pages/rdi/statistics/data-streams/DataStreams.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ const DataStreams = ({ data, loading, onRefresh, onRefreshClicked, onChangeAutoR
<Accordion
id="data-streams"
title="Data streams overview"
hideAutoRefresh
loading={loading}
onRefresh={onRefresh}
onRefreshClicked={onRefreshClicked}
Expand Down
4 changes: 2 additions & 2 deletions redisinsight/ui/src/pages/rdi/statistics/target-connections/TargetConnections.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { EuiBasicTableColumn, EuiIcon, EuiToolTip } from '@elastic/eui'
import React from 'react'

import { IConnections } from 'uiSrc/slices/interfaces'
import { IConnections, StatisticsConnectionStatus } from 'uiSrc/slices/interfaces'
import { formatLongName } from 'uiSrc/utils'
import Accordion from '../components/accordion'
import Panel from '../components/panel'
Expand All @@ -22,7 +22,7 @@ const columns: EuiBasicTableColumn<ConnectionData>[] = [
field: 'status',
width: '80px',
render: (status: string) =>
(status === 'good' ? (
(status === StatisticsConnectionStatus.connected ? (
<EuiIcon type="dot" color="var(--buttonSuccessColor)" />
) : (
<EuiIcon type="alert" color="danger" />
Expand Down
7 changes: 6 additions & 1 deletion redisinsight/ui/src/slices/interfaces/rdi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,16 @@ export interface IRdiPipelineStrategies {
data: IRdiPipelineStrategy[]
}

export enum StatisticsConnectionStatus {
notYetUsed = 'not yet used',
connected = 'connected'
}

export interface IConnections {
[key: string]: {
host: string
port: number
status: string
status: StatisticsConnectionStatus
type: string
database: string
user: string
Expand Down