Skip to content

#RI-4443 - change keys to commands for bulk upload result #2002

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
Apr 24, 2023
Merged

#RI-4443 - change keys to commands for bulk upload result #2002

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
34058a3
#RI-4443 - change keys to commands for bulk upload result
rsergeenko Apr 24, 2023
a27cec7
upd for e2e
vlad-dargel Apr 24, 2023
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
17 changes: 15 additions & 2 deletions ...ight/ui/src/pages/browser/components/bulk-actions/BulkActionSummary/BulkActionSummary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,28 @@ import { EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui'
import React from 'react'
import { numberWithSpaces } from 'uiSrc/utils/numbers'
import { millisecondsFormat } from 'uiSrc/utils'
import { BulkActionsType } from 'uiSrc/constants'

import styles from './styles.modules.scss'

export interface Props {
type?: BulkActionsType
processed?: number
succeed?: number
failed?: number
duration?: number
'data-testid': string
}
const BulkActionSummary = ({ processed = 0, succeed = 0, failed = 0, duration = 0, 'data-testid': testId }: Props) => (
const BulkActionSummary = (
{
type = BulkActionsType.Delete,
processed = 0,
succeed = 0,
failed = 0,
duration = 0,
'data-testid': testId
}: Props
) => (
<EuiFlexGroup
alignItems="flexStart"
direction="row"
Expand All @@ -23,7 +34,9 @@ const BulkActionSummary = ({ processed = 0, succeed = 0, failed = 0, duration =
>
<EuiFlexItem grow={false}>
<EuiText className={styles.summaryValue}>{numberWithSpaces(processed)}</EuiText>
<EuiText color="subdued" className={styles.summaryLabel}>Keys Processed</EuiText>
<EuiText color="subdued" className={styles.summaryLabel}>
{type === BulkActionsType.Delete ? 'Keys' : 'Commands'} Processed
</EuiText>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiText className={styles.summaryValue}>{numberWithSpaces(succeed)}</EuiText>
Expand Down
1 change: 1 addition & 0 deletions redisinsight/ui/src/pages/browser/components/bulk-actions/BulkUpload/BulkUpload.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ const BulkUpload = (props: Props) => {
subTitle={(<div className="truncateText" style={{ paddingTop: 6 }}>{fileName}</div>)}
>
<BulkActionSummary
type={BulkActionsType.Upload}
succeed={succeed}
processed={processed}
failed={failed}
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/tests/critical-path/browser/bulk-upload.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ fixture `Bulk Upload`
});
test('Verify bulk upload of different text docs formats', async t => {
// Verify bulk upload for docker app version
const allKeysResults = ['9Keys Processed', '9Success', '0Errors'];
const bigKeysResults = ['10 000Keys Processed', '10 000Success', '0Errors'];
const allKeysResults = ['9Commands Processed', '9Success', '0Errors'];
const bigKeysResults = ['10 000Commands Processed', '10 000Success', '0Errors'];
const defaultText = 'Select or drag and drop a file';

// Open bulk actions
Expand Down