#RI-2932 - fix pr comments

Author: egor-zalenski

redisinsight/ui/src/pages/browser/components/key-details/KeyDetailsWrapper.tsx

@@ -16,13 +16,9 @@ import { refreshSetMembersAction } from 'uiSrc/slices/browser/set'
 import { refreshListElementsAction } from 'uiSrc/slices/browser/list'
 import { fetchReJSON } from 'uiSrc/slices/browser/rejson'
 import {
-  fetchConsumerGroups,
-  fetchConsumerMessages,
-  fetchConsumers,
-  refreshStreamEntries,
+  refreshStream,
   streamSelector,
 } from 'uiSrc/slices/browser/stream'
-import { StreamViewType } from 'uiSrc/slices/interfaces/stream'
 import KeyDetails from './KeyDetails/KeyDetails'
 
 export interface Props {
@@ -99,18 +95,7 @@ const KeyDetailsWrapper = (props: Props) => {
         break
       }
       case KeyTypes.Stream: {
-        if (streamViewType === StreamViewType.Data) {
-          dispatch(refreshStreamEntries(key, resetData))
-        }
-        if (streamViewType === StreamViewType.Groups) {
-          dispatch<any>(fetchConsumerGroups(resetData))
-        }
-        if (streamViewType === StreamViewType.Consumers) {
-          dispatch<any>(fetchConsumers(resetData))
-        }
-        if (streamViewType === StreamViewType.Messages) {
-          dispatch<any>(fetchConsumerMessages(resetData))
-        }
+        dispatch(refreshStream(key, resetData))
         break
       }
       default:

redisinsight/ui/src/pages/browser/components/stream-details/stream-data-view/StreamDataView/StreamDataView.tsx

@@ -24,14 +24,9 @@ const minColumnWidth = 190
 const noItemsMessageInEmptyStream = 'There are no Entries in the Stream.'
 const noItemsMessageInRange = 'No results found.'
 
-interface IStreamEntry extends StreamEntryDto {
-  editing: boolean
-}
-
 export interface Props {
-  data: IStreamEntry[]
+  data: StreamEntryDto[]
   columns: ITableColumn[]
-  onEditEntry: (entryId:string, editing: boolean) => void
   onClosePopover: () => void
   loadMoreItems: () => void
   isFooterOpen?: boolean

redisinsight/ui/src/pages/browser/components/stream-details/stream-data-view/StreamDataViewWrapper.tsx

@@ -17,10 +17,6 @@ import { StreamEntryDto } from 'apiSrc/modules/browser/dto/stream.dto'
 import StreamDataView from './StreamDataView'
 import styles from './StreamDataView/styles.module.scss'
 
-export interface IStreamEntry extends StreamEntryDto {
-  editing: boolean
-}
-
 const suffix = '_stream'
 const actionsWidth = 50
 const minColumnWidth = 190
@@ -43,7 +39,7 @@ const StreamDataViewWrapper = (props: Props) => {
 
   // for Manager columns
   // const [uniqFields, setUniqFields] = useState({})
-  const [entries, setEntries] = useState<IStreamEntry[]>([])
+  const [entries, setEntries] = useState<StreamEntryDto[]>([])
   const [columns, setColumns] = useState<ITableColumn[]>([])
   const [deleting, setDeleting] = useState<string>('')
 
@@ -53,21 +49,16 @@ const StreamDataViewWrapper = (props: Props) => {
 
   useEffect(() => {
     let fields = {}
-    const streamEntries: IStreamEntry[] = loadedEntries?.map((item) => {
+    loadedEntries?.forEach((item) => {
       fields = {
         ...fields,
         ...keyBy(Object.keys(item.fields))
       }
-
-      return {
-        ...item,
-        editing: false,
-      }
     })
 
     // for Manager columns
     // setUniqFields(fields)
-    setEntries(streamEntries)
+    setEntries(loadedEntries)
     setColumns([idColumn, ...Object.keys(fields).map((field) => getTemplateColumn(field)), actionsColumn])
   }, [loadedEntries, deleting])
 
@@ -113,16 +104,6 @@ const StreamDataViewWrapper = (props: Props) => {
     })
   }
 
-  const handleEditEntry = (entryId = '', editing: boolean) => {
-    const newFieldsState = entries.map((item) => {
-      if (item.id === entryId) {
-        return { ...item, editing }
-      }
-      return item
-    })
-    setEntries(newFieldsState)
-  }
-
   const getTemplateColumn = (label: string) : ITableColumn => ({
     id: label,
     label,
@@ -225,7 +206,6 @@ const StreamDataViewWrapper = (props: Props) => {
       <StreamDataView
         data={entries}
         columns={columns}
-        onEditEntry={handleEditEntry}
         onClosePopover={closePopover}
         {...props}
       />

redisinsight/ui/src/pages/browser/components/stream-details/stream-tabs/StreamTabs.tsx

@@ -51,6 +51,7 @@ const StreamTabs = () => {
         isSelected={viewType === id}
         onClick={() => onSelectedTabChanged(id)}
         key={id}
+        data-testid={`stream-tab-${id}`}
       >
         {label}
       </EuiTab>

redisinsight/ui/src/slices/browser/keys.ts

@@ -558,8 +558,6 @@ export function fetchKeyInfo(key: string, resetData?: boolean) {
             SortOrder.DESC,
             resetData
           ))
-        } else if (viewType === StreamViewType.Groups) {
-          // dispatch<any>(fetchConsumerGroups())
         }
       }
     } catch (_err) {

redisinsight/ui/src/slices/browser/stream.ts

@@ -323,6 +323,30 @@ export function fetchStreamEntries(
   }
 }
 
+// Asynchronous thunk action
+export function refreshStream(
+  key: string,
+  resetData: boolean = false,
+) {
+  return async (dispatch: AppDispatch, stateInit: () => RootState) => {
+    const state = stateInit()
+    const streamViewType = state.browser.stream.viewType
+
+    if (streamViewType === StreamViewType.Data) {
+      dispatch(refreshStreamEntries(key, resetData))
+    }
+    if (streamViewType === StreamViewType.Groups) {
+      dispatch<any>(fetchConsumerGroups(resetData))
+    }
+    if (streamViewType === StreamViewType.Consumers) {
+      dispatch<any>(fetchConsumers(resetData))
+    }
+    if (streamViewType === StreamViewType.Messages) {
+      dispatch<any>(fetchConsumerMessages(resetData))
+    }
+  }
+}
+
 // Asynchronous thunk action
 export function refreshStreamEntries(
   key: string,