Merge pull request #2675 from RedisInsight/fe/bugfix/RI-5003-fix-non-zero-scan-cursor

#RI-5003 show scan more always when next cursor is non-zero

Author: vlad-dargel

redisinsight/ui/src/components/keys-summary/KeysSummary.tsx

@@ -35,6 +35,11 @@ const KeysSummary = (props: Props) => {
 
   const resultsLength = items.length
   const scannedDisplay = resultsLength > scanned ? resultsLength : scanned
+  const notAccurateScanned = totalItemsCount
+    && scanned >= totalItemsCount
+    && nextCursor
+    && nextCursor !== '0'
+    ? '~' : ''
 
   return (
     <>
@@ -51,7 +56,7 @@ const KeysSummary = (props: Props) => {
                   </b>
                   <EuiTextColor color="subdued">
                     {'Scanned '}
-                    <span data-testid="keys-number-of-scanned">{numberWithSpaces(scannedDisplay)}</span>
+                    <span data-testid="keys-number-of-scanned">{notAccurateScanned}{numberWithSpaces(scannedDisplay)}</span>
                     {' / '}
                     <span data-testid="keys-total">{nullableNumberWithSpaces(totalItemsCount)}</span>
                     <span

redisinsight/ui/src/components/scan-more/ScanMore.spec.tsx

@@ -14,7 +14,7 @@ describe('ScanMore', () => {
     const handleClick = jest.fn()
 
     const renderer = render(
-      <ScanMore {...instance(mockedProps)} loadMoreItems={handleClick} totalItemsCount={1} />
+      <ScanMore {...instance(mockedProps)} loadMoreItems={handleClick} scanned={1} totalItemsCount={2} />
     )
 
     expect(renderer).toBeTruthy()
@@ -23,9 +23,17 @@ describe('ScanMore', () => {
     expect(handleClick).toHaveBeenCalledTimes(1)
   })
 
-  it('should button be hidden when totalItemsCount < scanned ', () => {
+  it('should show button when totalItemsCount < scanned and nextCursor is not zero', () => {
     const { queryByTestId } = render(
-      <ScanMore {...instance(mockedProps)} scanned={2} totalItemsCount={1} />
+      <ScanMore {...instance(mockedProps)} scanned={2} totalItemsCount={1} nextCursor="123" />
+    )
+
+    expect(queryByTestId('scan-more')).toBeInTheDocument()
+  })
+
+  it('should hide button when totalItemsCount < scanned and nextCursor is zero', () => {
+    const { queryByTestId } = render(
+      <ScanMore {...instance(mockedProps)} scanned={2} totalItemsCount={1} nextCursor="0" />
     )
 
     expect(queryByTestId('scan-more')).not.toBeInTheDocument()

redisinsight/ui/src/components/scan-more/ScanMore.tsx

@@ -31,7 +31,7 @@ const ScanMore = ({
   nextCursor,
 }: Props) => (
   <>
-    {((scanned < totalItemsCount || isNull(totalItemsCount)))
+    {((scanned || isNull(totalItemsCount)))
       && nextCursor !== '0'
       && (
         <EuiButton

redisinsight/ui/src/components/virtual-table/VirtualTable.spec.tsx

@@ -161,7 +161,8 @@ describe('VirtualTable', () => {
 
       expect(scanMoreBtn).toBeInTheDocument()
     })
-    it('Scan more button should no be in the document when total == scanned', () => {
+    // obsolete test. todo: review and remove or refactor
+    xit('Scan more button should no be in the document when total == scanned', () => {
       const { queryByTestId } = render(
         <VirtualTable
           {...instance(mockedProps)}