From 34058a39125850ef6b3198973e3842b9c51be576 Mon Sep 17 00:00:00 2001 From: Roman Sergeenko Date: Mon, 24 Apr 2023 09:32:32 +0200 Subject: [PATCH 1/2] #RI-4443 - change keys to commands for bulk upload result --- .../BulkActionSummary/BulkActionSummary.tsx | 17 +++++++++++++++-- .../bulk-actions/BulkUpload/BulkUpload.tsx | 1 + 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkActionSummary/BulkActionSummary.tsx b/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkActionSummary/BulkActionSummary.tsx index bb4db91e45..800a023a5c 100644 --- a/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkActionSummary/BulkActionSummary.tsx +++ b/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkActionSummary/BulkActionSummary.tsx @@ -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 +) => ( {numberWithSpaces(processed)} - Keys Processed + + {type === BulkActionsType.Delete ? 'Keys' : 'Commands'} Processed + {numberWithSpaces(succeed)} diff --git a/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkUpload/BulkUpload.tsx b/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkUpload/BulkUpload.tsx index 275144f225..1295143f96 100644 --- a/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkUpload/BulkUpload.tsx +++ b/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkUpload/BulkUpload.tsx @@ -143,6 +143,7 @@ const BulkUpload = (props: Props) => { subTitle={(
{fileName}
)} > Date: Mon, 24 Apr 2023 12:49:14 +0200 Subject: [PATCH 2/2] upd for e2e --- tests/e2e/tests/critical-path/browser/bulk-upload.e2e.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/e2e/tests/critical-path/browser/bulk-upload.e2e.ts b/tests/e2e/tests/critical-path/browser/bulk-upload.e2e.ts index 9fd365c1f8..abfc1708c0 100644 --- a/tests/e2e/tests/critical-path/browser/bulk-upload.e2e.ts +++ b/tests/e2e/tests/critical-path/browser/bulk-upload.e2e.ts @@ -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