#RI-2561 - fix showing redis stack logo

#RI-2562 - fix blinking of overview

Author: rsergeenko

redisinsight/ui/src/pages/instance/InstancePage.tsx

@@ -5,8 +5,8 @@ import { useParams } from 'react-router-dom'
 import cx from 'classnames'
 
 import {
-  fetchInstanceAction,
-  getDatabaseConfigInfoAction,
+  fetchInstanceAction, fetchInstancesAction,
+  getDatabaseConfigInfoAction, instancesSelector,
 } from 'uiSrc/slices/instances'
 import {
   appContextSelector,
@@ -53,13 +53,16 @@ const InstancePage = ({ routes = [] }: Props) => {
   const dispatch = useDispatch()
   const { instanceId: connectionInstanceId } = useParams<{ instanceId: string }>()
   const { isShowCli, isShowHelper } = useSelector(cliSettingsSelector)
+  const { data: modulesData } = useSelector(instancesSelector)
   const { isShowMonitor } = useSelector(monitorSelector)
   const { contextInstanceId } = useSelector(appContextSelector)
 
   const isShowBottomGroup = isShowCli || isShowHelper || isShowMonitor
 
   useEffect(() => {
-    dispatch(fetchInstanceAction(connectionInstanceId))
+    dispatch(fetchInstanceAction(connectionInstanceId, () => {
+      !modulesData.length && dispatch(fetchInstancesAction())
+    }))
     dispatch(getDatabaseConfigInfoAction(connectionInstanceId))
 
     if (contextInstanceId !== connectionInstanceId) {

redisinsight/ui/src/slices/instances.ts

@@ -52,6 +52,10 @@ const instancesSlice = createSlice({
     loadInstancesSuccess: (state, { payload }: { payload: Instance[] }) => {
       state.data = checkRediStack(payload)
       state.loading = false
+      if (state.connectedInstance.id) {
+        const isRediStack = state.data.find((db) => db.id === state.connectedInstance.id)?.isRediStack
+        state.connectedInstance.isRediStack = isRediStack || false
+      }
     },
     loadInstancesFailure: (state, { payload }) => {
       state.loading = false
@@ -135,7 +139,9 @@ const instancesSlice = createSlice({
 
     // set connected instance
     setConnectedInstance: (state, { payload }: { payload: Instance }) => {
-      state.connectedInstance = checkRediStack([payload])[0]
+      const isRediStack = state.data?.find((db) => db.id === state.connectedInstance.id)?.isRediStack
+      state.connectedInstance = payload
+      state.connectedInstance.isRediStack =  isRediStack || false
     },
 
     // reset connected instance
@@ -332,6 +338,7 @@ export function checkConnectToInstanceAction(
 ) {
   return async (dispatch: AppDispatch) => {
     dispatch(setDefaultInstance())
+    dispatch(resetConnectedInstance())
     try {
       const { status } = await apiService.get(`${ApiEndpoints.INSTANCE}/${id}/connect`)