Merge pull request #3658 from RedisInsight/bugfix/RI-5961-rdi-text

change text and fix statistics

Author: mariasergeenko

redisinsight/ui/src/pages/rdi/pipeline-management/components/download/Download.tsx

@@ -51,7 +51,7 @@ const Download = ({ dataTestid }: Props) => {
       aria-labelledby="Download pipeline button"
       data-testid={dataTestid || 'download-pipeline-btn'}
     >
-      Download
+      Save to file
     </EuiButtonEmpty>
   )
 }

redisinsight/ui/src/pages/rdi/pipeline-management/components/fetch-pipeline-popover/FetchPipelinePopover.tsx

@@ -44,15 +44,12 @@ const FetchPipelinePopover = () => {
 
   return (
     <ConfirmationPopover
-      title="Upload a pipeline from the server"
+      title="Download a pipeline from the server"
       body={(
         <>
           <EuiText size="s">
             When downloading a new pipeline from the server,
-            it will overwrite the existing one displayed in RedisInsight.
-          </EuiText>
-          <EuiText size="s">
-            Download the current pipeline to save the changes locally.
+            it will overwrite the existing one displayed in Redis Insight.
           </EuiText>
         </>
       )}
@@ -63,7 +60,7 @@ const FetchPipelinePopover = () => {
           color="secondary"
           data-testid="upload-confirm-btn"
         >
-          Upload
+          Download from server
         </EuiButton>
       )}
       onConfirm={handleRefreshClick}

redisinsight/ui/src/pages/rdi/statistics/data-streams/DataStreams.spec.tsx

@@ -5,27 +5,39 @@ import DataStreams from './DataStreams'
 
 const mockedProps = {
   data: {
-    stream1: {
-      total: 11,
-      pending: 5,
-      inserted: 3,
-      updated: 2,
-      deleted: 1,
+    totals: {
+      total: 31,
+      pending: 15,
+      inserted: 9,
+      updated: 6,
+      deleted: 3,
       filtered: 0,
       rejected: 0,
       deduplicated: 0,
-      lastArrival: '2022-01-01'
     },
-    stream2: {
-      total: 20,
-      pending: 10,
-      inserted: 6,
-      updated: 4,
-      deleted: 2,
-      filtered: 0,
-      rejected: 0,
-      deduplicated: 0,
-      lastArrival: '2022-01-02'
+    streams: {
+      stream1: {
+        total: 11,
+        pending: 5,
+        inserted: 3,
+        updated: 2,
+        deleted: 1,
+        filtered: 0,
+        rejected: 0,
+        deduplicated: 0,
+        lastArrival: '2022-01-01'
+      },
+      stream2: {
+        total: 20,
+        pending: 10,
+        inserted: 6,
+        updated: 4,
+        deleted: 2,
+        filtered: 0,
+        rejected: 0,
+        deduplicated: 0,
+        lastArrival: '2022-01-02'
+      }
     }
   },
   loading: false,
@@ -47,6 +59,6 @@ describe('DataStreams', () => {
 
     // Assert that the data rows are rendered
     const dataRows = screen.getAllByRole('row')
-    expect(dataRows).toHaveLength(3) // 2 data rows + 1 header row
+    expect(dataRows).toHaveLength(4) // 2 data rows + 1 header row + 1 totals row
   })
 })

redisinsight/ui/src/pages/rdi/statistics/data-streams/DataStreams.tsx

@@ -17,7 +17,7 @@ type DataStreamsData = {
   filtered: number
   rejected: number
   deduplicated: number
-  lastArrival: string
+  lastArrival?: string
 }
 
 const columns: EuiBasicTableColumn<DataStreamsData>[] = [
@@ -88,13 +88,13 @@ interface Props {
 }
 
 const DataStreams = ({ data, loading, onRefresh, onRefreshClicked, onChangeAutoRefresh }: Props) => {
-  const dataStreams = Object.keys(data).map((key) => {
-    const dataStream = data[key]
+  const dataStreams = Object.keys(data?.streams || {}).map((key) => {
+    const dataStream = data.streams[key]
     return {
       name: key,
       ...dataStream
     }
-  })
+  }).concat([{ name: 'Total', ...(data?.totals || {}) }])
 
   return (
     <Panel>

redisinsight/ui/src/slices/interfaces/rdi.ts

@@ -62,17 +62,22 @@ export interface IConnections {
   }
 }
 
+export interface IDataStreamsData {
+  total: number
+  pending: number
+  inserted: number
+  updated: number
+  deleted: number
+  filtered: number
+  rejected: number
+  deduplicated: number
+  lastArrival?: string
+}
+
 export interface IDataStreams {
-  [key: string]: {
-    total: number
-    pending: number
-    inserted: number
-    updated: number
-    deleted: number
-    filtered: number
-    rejected: number
-    deduplicated: number
-    lastArrival: string
+  totals: IDataStreamsData,
+  streams: {
+    [key: string]: IDataStreamsData
   }
 }