Skip to content

Commit a415085

Browse files
authored
Merge pull request #1433 from RedisInsight/fe/bugfix/RI-3862_Search_if_index_is_null
#RI-3862 - Null index error message is displayed when the user switches between views in Search
2 parents f2f2e8d + 295667d commit a415085

File tree

1 file changed

+6
-1
lines changed
  • redisinsight/ui/src/pages/browser/components/keys-header

1 file changed

+6
-1
lines changed

redisinsight/ui/src/pages/browser/components/keys-header/KeysHeader.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { localStorageService } from 'uiSrc/services'
1616
import { resetBrowserTree, setBrowserKeyListDataLoaded, } from 'uiSrc/slices/app/context'
1717

1818
import { changeKeyViewType, changeSearchMode, fetchKeys, keysSelector, resetKeysData, } from 'uiSrc/slices/browser/keys'
19+
import { redisearchSelector } from 'uiSrc/slices/browser/redisearch'
1920
import { connectedInstanceSelector } from 'uiSrc/slices/instances/instances'
2021
import { KeysStoreData, KeyViewType, SearchMode } from 'uiSrc/slices/interfaces/keys'
2122
import { getBasedOnViewTypeEvent, sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
@@ -70,6 +71,7 @@ const KeysHeader = (props: Props) => {
7071

7172
const { id: instanceId, modules } = useSelector(connectedInstanceSelector)
7273
const { viewType, searchMode, isFiltered } = useSelector(keysSelector)
74+
const { selectedIndex } = useSelector(redisearchSelector)
7375

7476
const rootDivRef: Ref<HTMLDivElement> = useRef(null)
7577

@@ -232,7 +234,10 @@ const KeysHeader = (props: Props) => {
232234
dispatch(resetBrowserTree())
233235
dispatch(resetKeysData(searchMode))
234236
localStorageService.set(BrowserStorageItem.browserViewType, type)
235-
loadKeys(type)
237+
238+
if (!(searchMode === SearchMode.Redisearch && !selectedIndex)) {
239+
loadKeys(type)
240+
}
236241

237242
setTimeout(() => {
238243
dispatch(changeKeyViewType(type))

0 commit comments

Comments
 (0)