#RI-2577 - Selected renamed key is displayed in tree view with old name

Author: egor-zalenski

redisinsight/ui/src/components/virtual-tree/VirtualTree.spec.tsx

@@ -77,7 +77,7 @@ describe('VirtualTree', () => {
       />
     )
 
-    expect(queryByTestId('test')).toBeInTheDocument()
+    expect(queryByTestId('node-item_test')).toBeInTheDocument()
   })
 
   it('should select first leaf "Keys" by default', async () => {

redisinsight/ui/src/components/virtual-tree/VirtualTree.tsx

@@ -41,7 +41,6 @@ export interface Props {
   setConstructingTree: (status: boolean) => void
 }
 
-const timeLabel = 'Time for construct a Tree'
 const VirtualTree = (props: Props) => {
   const {
     items,

redisinsight/ui/src/components/virtual-tree/components/Node/Node.spec.tsx

@@ -5,7 +5,7 @@ import { render, screen } from 'uiSrc/utils/test-utils'
 import KeyDarkSVG from 'uiSrc/assets/img/sidebar/browser_active.svg'
 import Node from './Node'
 import { TreeData } from '../../interfaces'
-import { mockLeafKeys } from '../../VirtualTree.spec'
+import { mockLeafKeys, mockVirtualTreeResult } from '../../VirtualTree.spec'
 
 const mockedProps = mock<NodePublicState<TreeData>>()
 const mockedPropsData = mock<TreeData>()
@@ -16,6 +16,11 @@ const mockedData: TreeData = {
 }
 const mockDataFullName = 'test'
 
+jest.mock('uiSrc/services', () => ({
+  ...jest.requireActual('uiSrc/services'),
+  useDisposableWebworker: () => ({ result: mockVirtualTreeResult, run: jest.fn() }),
+}))
+
 describe('Node', () => {
   it('should render', () => {
     expect(render(<Node {...instance(mockedProps)} data={mockedData} />)).toBeTruthy()
@@ -69,7 +74,7 @@ describe('Node', () => {
       data={mockData}
     />)
 
-    screen.getByTestId(mockDataFullName).click()
+    screen.getByTestId(`node-item_${mockDataFullName}`).click()
 
     expect(mockSetItems).toBeCalledWith(mockLeafKeys)
     expect(mockUpdateStatusSelected).toBeCalledWith(mockDataFullName, mockLeafKeys)
@@ -101,7 +106,7 @@ describe('Node', () => {
       data={mockData}
     />)
 
-    screen.getByTestId(mockDataFullName).click()
+    screen.getByTestId(`node-item_${mockDataFullName}`).click()
 
     expect(mockSetItems).not.toBeCalled()
     expect(mockUpdateStatusSelected).not.toBeCalled()

redisinsight/ui/src/components/virtual-tree/interfaces.ts

@@ -1,7 +1,7 @@
 import { FixedSizeNodeData } from 'react-vtree'
 import { IKeyPropTypes } from 'uiSrc/constants/prop-types/keys'
 
-export const TREE_LEAF_FIELD = 'keys:keys:'
+export const TREE_LEAF_FIELD = 'keys:keys'
 
 export interface TreeNode {
   children: TreeNode[]

redisinsight/ui/src/helpers/tests/constructKeysToTreeMockResult.ts

@@ -31,7 +31,7 @@ export const constructKeysToTreeMockResult = [
       }
     },
     keyCount: 4,
-    fullName: 'keys:keys:',
+    fullName: `${TREE_LEAF_FIELD}:`,
     keyApproximate: 40,
   },
   {
@@ -61,7 +61,7 @@ export const constructKeysToTreeMockResult = [
           }
         },
         keyCount: 3,
-        fullName: 'keys:keys:keys:',
+        fullName: `keys:${TREE_LEAF_FIELD}:`,
         keyApproximate: 30,
       },
       {
@@ -85,7 +85,7 @@ export const constructKeysToTreeMockResult = [
               }
             },
             keyCount: 2,
-            fullName: 'keys:1:keys:keys:',
+            fullName: `keys:1:${TREE_LEAF_FIELD}:`,
             keyApproximate: 20,
           }
         ],
@@ -116,7 +116,7 @@ export const constructKeysToTreeMockResult = [
               }
             },
             keyCount: 1,
-            fullName: 'empty::keys:keys:',
+            fullName: `empty::${TREE_LEAF_FIELD}:`,
             keyApproximate: 10,
           }
         ],

redisinsight/ui/src/pages/browser/components/key-tree/KeyTree.spec.tsx

@@ -109,7 +109,7 @@ describe('KeyTree', () => {
   it('"setBrowserTreeNodesOpen" should be called for Open a node', () => {
     render(<KeyTree {...propsMock} />)
 
-    fireEvent.click(screen.getByTestId(mockVirtualTreeResult?.[0]?.fullName))
+    fireEvent.click(screen.getByTestId(`node-item_${mockVirtualTreeResult?.[0]?.fullName}`))
 
     const expectedActions = [setBrowserTreeSelectedLeaf({}), setBrowserTreeNodesOpen({})]