Skip to content

Commit 0c23dbe

Browse files
committed
#RI-6081 - try to fix context
1 parent 419ed28 commit 0c23dbe

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

redisinsight/ui/src/pages/browser/BrowserPage.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import {
3333
setBrowserPanelSizes,
3434
setLastPageContext,
3535
setBrowserBulkActionOpen,
36+
appContextSelector,
3637
} from 'uiSrc/slices/app/context'
3738
import { resetErrors } from 'uiSrc/slices/app/notifications'
3839
import { RedisResponseBuffer } from 'uiSrc/slices/interfaces'
@@ -66,14 +67,20 @@ const BrowserPage = () => {
6667
keyList: { selectedKey: selectedKeyContext },
6768
bulkActions: { opened: bulkActionOpenContext },
6869
} = useSelector(appContextBrowser)
70+
const { contextInstanceId } = useSelector(appContextSelector)
71+
6972
const { isBrowserFullScreen } = useSelector(keysSelector)
7073
const { type } = useSelector(selectedKeyDataSelector) ?? { type: '', length: 0 }
7174
const { viewType, searchMode } = useSelector(keysSelector)
7275
const { openedPanel: openedSidePanel } = useSelector(sidePanelsSelector)
7376

7477
const [isPageViewSent, setIsPageViewSent] = useState(false)
7578
const [arePanelsCollapsed, setArePanelsCollapsed] = useState(isOneSideMode(!!openedSidePanel))
76-
const [selectedKey, setSelectedKey] = useState<Nullable<RedisResponseBuffer>>(selectedKeyContext)
79+
const [selectedKey, setSelectedKey] = useState<Nullable<RedisResponseBuffer>>(
80+
contextInstanceId === instanceId
81+
? selectedKeyContext
82+
: null
83+
)
7784
const [isAddKeyPanelOpen, setIsAddKeyPanelOpen] = useState(false)
7885
const [isCreateIndexPanelOpen, setIsCreateIndexPanelOpen] = useState(false)
7986
const [isBulkActionsPanelOpen, setIsBulkActionsPanelOpen] = useState(bulkActionOpenContext)

0 commit comments

Comments
 (0)