Skip to content

Commit abe2c92

Browse files
AmirAllayarovSofteqAmirAllayarovSofteq
committed
#RI-3995 - fix test
1 parent e67d6a3 commit abe2c92

File tree

3 files changed

+41
-33
lines changed

3 files changed

+41
-33
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,6 @@ const VirtualTree = (props: Props) => {
125125
}
126126
}, [nodes])
127127

128-
useEffect(() => {
129-
dispatch(resetBrowserTree())
130-
}, [items.length])
131-
132128
useEffect(() => {
133129
if (!items?.length) {
134130
setNodes([])

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import { DEFAULT_SEARCH_MATCH, SCAN_COUNT_DEFAULT } from 'uiSrc/constants/api'
2828
import { getBasedOnViewTypeEvent, sendEventTelemetry, TelemetryEvent, getAdditionalAddedEventData, getMatchType } from 'uiSrc/telemetry'
2929
import successMessages from 'uiSrc/components/notifications/success-messages'
3030
import { IKeyPropTypes } from 'uiSrc/constants/prop-types/keys'
31+
import { resetBrowserTree } from 'uiSrc/slices/app/context'
3132

3233
import {
3334
CreateListWithExpireDto,
@@ -1163,6 +1164,9 @@ export function addKeyIntoList({ key, keyType }: { key: RedisString, keyType: Ke
11631164
return null
11641165
}
11651166
if (!state.browser.keys?.filter || state.browser.keys?.filter === keyType) {
1167+
if (state.browser.keys?.viewType !== KeyViewType.Tree) {
1168+
dispatch(resetBrowserTree())
1169+
}
11661170
return dispatch(updateKeyList({ keyName: key, keyType }))
11671171
}
11681172
return null

‎redisinsight/ui/src/slices/tests/browser/keys.spec.ts‎

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { cleanup, initialStateDefault, mockedStore } from 'uiSrc/utils/test-util
77
import { addErrorNotification, addMessageNotification } from 'uiSrc/slices/app/notifications'
88
import successMessages from 'uiSrc/components/notifications/success-messages'
99
import { SearchHistoryItem, SearchMode } from 'uiSrc/slices/interfaces/keys'
10+
import { resetBrowserTree } from 'uiSrc/slices/app/context'
1011
import {
1112
CreateHashWithExpireDto,
1213
CreateListWithExpireDto,
@@ -1266,6 +1267,7 @@ describe('keys slice', () => {
12661267
const expectedActions = [
12671268
addKey(),
12681269
addKeySuccess(),
1270+
resetBrowserTree(),
12691271
updateKeyList({ keyName: data.keyName, keyType: 'hash' }),
12701272
addMessageNotification(successMessages.ADDED_NEW_KEY(data.keyName)),
12711273
]
@@ -1291,6 +1293,7 @@ describe('keys slice', () => {
12911293
const expectedActions = [
12921294
addKey(),
12931295
addKeySuccess(),
1296+
resetBrowserTree(),
12941297
updateKeyList({ keyName: data.keyName, keyType: 'zset' }),
12951298
addMessageNotification(successMessages.ADDED_NEW_KEY(data.keyName)),
12961299
]
@@ -1316,6 +1319,7 @@ describe('keys slice', () => {
13161319
const expectedActions = [
13171320
addKey(),
13181321
addKeySuccess(),
1322+
resetBrowserTree(),
13191323
updateKeyList({ keyName: data.keyName, keyType: 'set' }),
13201324
addMessageNotification(successMessages.ADDED_NEW_KEY(data.keyName)),
13211325
]
@@ -1341,6 +1345,7 @@ describe('keys slice', () => {
13411345
const expectedActions = [
13421346
addKey(),
13431347
addKeySuccess(),
1348+
resetBrowserTree(),
13441349
updateKeyList({ keyName: data.keyName, keyType: 'string' }),
13451350
addMessageNotification(successMessages.ADDED_NEW_KEY(data.keyName)),
13461351
]
@@ -1367,6 +1372,7 @@ describe('keys slice', () => {
13671372
const expectedActions = [
13681373
addKey(),
13691374
addKeySuccess(),
1375+
resetBrowserTree(),
13701376
updateKeyList({ keyName: data.keyName, keyType: 'list' }),
13711377
addMessageNotification(successMessages.ADDED_NEW_KEY(data.keyName)),
13721378
]
@@ -1392,6 +1398,7 @@ describe('keys slice', () => {
13921398
const expectedActions = [
13931399
addKey(),
13941400
addKeySuccess(),
1401+
resetBrowserTree(),
13951402
updateKeyList({ keyName: data.keyName, keyType: 'ReJSON-RL' }),
13961403
addMessageNotification(successMessages.ADDED_NEW_KEY(data.keyName)),
13971404
]
@@ -1551,6 +1558,7 @@ describe('keys slice', () => {
15511558

15521559
// Assert
15531560
const expectedActions = [
1561+
resetBrowserTree(),
15541562
updateKeyList({ keyName: 'key', keyType: 'hash' })
15551563
]
15561564
expect(store.getActions()).toEqual(expectedActions)
@@ -1564,12 +1572,12 @@ describe('keys slice', () => {
15641572
{ id: '2', mode: SearchMode.Pattern, filter: { type: 'list', match: '*' } },
15651573
]
15661574
const responsePayload = { data, status: 200 }
1567-
1575+
15681576
apiService.get = jest.fn().mockResolvedValue(responsePayload)
1569-
1577+
15701578
// Act
15711579
await store.dispatch<any>(fetchPatternHistoryAction())
1572-
1580+
15731581
// Assert
15741582
const expectedActions = [
15751583
loadSearchHistory(),
@@ -1586,12 +1594,12 @@ describe('keys slice', () => {
15861594
data: { message: errorMessage },
15871595
},
15881596
}
1589-
1597+
15901598
apiService.get = jest.fn().mockRejectedValue(responsePayload)
1591-
1599+
15921600
// Act
15931601
await store.dispatch<any>(fetchPatternHistoryAction())
1594-
1602+
15951603
// Assert
15961604
const expectedActions = [
15971605
loadSearchHistory(),
@@ -1600,7 +1608,7 @@ describe('keys slice', () => {
16001608
expect(store.getActions()).toEqual(expectedActions)
16011609
})
16021610
})
1603-
1611+
16041612
describe('fetchSearchHistoryAction', () => {
16051613
it('success fetch history', async () => {
16061614
// Arrange
@@ -1609,12 +1617,12 @@ describe('keys slice', () => {
16091617
{ id: '2', mode: SearchMode.Pattern, filter: { type: 'list', match: '*' } },
16101618
]
16111619
const responsePayload = { data, status: 200 }
1612-
1620+
16131621
apiService.get = jest.fn().mockResolvedValue(responsePayload)
1614-
1622+
16151623
// Act
16161624
await store.dispatch<any>(fetchSearchHistoryAction(SearchMode.Pattern))
1617-
1625+
16181626
// Assert
16191627
const expectedActions = [
16201628
loadSearchHistory(),
@@ -1631,12 +1639,12 @@ describe('keys slice', () => {
16311639
data: { message: errorMessage },
16321640
},
16331641
}
1634-
1642+
16351643
apiService.get = jest.fn().mockRejectedValue(responsePayload)
1636-
1644+
16371645
// Act
16381646
await store.dispatch<any>(fetchSearchHistoryAction(SearchMode.Pattern))
1639-
1647+
16401648
// Assert
16411649
const expectedActions = [
16421650
loadSearchHistory(),
@@ -1645,25 +1653,25 @@ describe('keys slice', () => {
16451653
expect(store.getActions()).toEqual(expectedActions)
16461654
})
16471655
})
1648-
1656+
16491657
describe('deletePatternHistoryAction', () => {
16501658
it('success delete history', async () => {
16511659
// Arrange
16521660
const responsePayload = { status: 200 }
1653-
1661+
16541662
apiService.delete = jest.fn().mockResolvedValue(responsePayload)
1655-
1663+
16561664
// Act
16571665
await store.dispatch<any>(deletePatternHistoryAction(['1']))
1658-
1666+
16591667
// Assert
16601668
const expectedActions = [
16611669
deleteSearchHistory(),
16621670
deleteSearchHistorySuccess(['1']),
16631671
]
16641672
expect(store.getActions()).toEqual(expectedActions)
16651673
})
1666-
1674+
16671675
it('failed to delete history', async () => {
16681676
// Arrange
16691677
const errorMessage = 'some error'
@@ -1673,12 +1681,12 @@ describe('keys slice', () => {
16731681
data: { message: errorMessage },
16741682
},
16751683
}
1676-
1684+
16771685
apiService.delete = jest.fn().mockRejectedValue(responsePayload)
1678-
1686+
16791687
// Act
16801688
await store.dispatch<any>(deletePatternHistoryAction(['1']))
1681-
1689+
16821690
// Assert
16831691
const expectedActions = [
16841692
deleteSearchHistory(),
@@ -1687,25 +1695,25 @@ describe('keys slice', () => {
16871695
expect(store.getActions()).toEqual(expectedActions)
16881696
})
16891697
})
1690-
1698+
16911699
describe('deleteSearchHistoryAction', () => {
16921700
it('success delete history', async () => {
16931701
// Arrange
16941702
const responsePayload = { status: 200 }
1695-
1703+
16961704
apiService.delete = jest.fn().mockResolvedValue(responsePayload)
1697-
1705+
16981706
// Act
16991707
await store.dispatch<any>(deleteSearchHistoryAction(SearchMode.Pattern, ['1']))
1700-
1708+
17011709
// Assert
17021710
const expectedActions = [
17031711
deleteSearchHistory(),
17041712
deleteSearchHistorySuccess(['1']),
17051713
]
17061714
expect(store.getActions()).toEqual(expectedActions)
17071715
})
1708-
1716+
17091717
it('failed to delete history', async () => {
17101718
// Arrange
17111719
const errorMessage = 'some error'
@@ -1715,12 +1723,12 @@ describe('keys slice', () => {
17151723
data: { message: errorMessage },
17161724
},
17171725
}
1718-
1726+
17191727
apiService.delete = jest.fn().mockRejectedValue(responsePayload)
1720-
1728+
17211729
// Act
17221730
await store.dispatch<any>(deleteSearchHistoryAction(SearchMode.Pattern, ['1']))
1723-
1731+
17241732
// Assert
17251733
const expectedActions = [
17261734
deleteSearchHistory(),

0 commit comments

Comments
 (0)