Merge pull request #2611 from RedisInsight/fe/bugfix/RI-4813

#RI-4975, #RI-4976

Author: egor-zalenski

redisinsight/ui/src/pages/home/components/AddDatabases/AddDatabasesContainer.tsx

@@ -19,7 +19,7 @@ import { Instance, InstanceType } from 'uiSrc/slices/interfaces'
 import { sentinelSelector, resetDataSentinel } from 'uiSrc/slices/instances/sentinel'
 
 import { UrlHandlingActions } from 'uiSrc/slices/interfaces/urlHandling'
-import { appRedirectionSelector } from 'uiSrc/slices/app/url-handling'
+import { appRedirectionSelector, setUrlHandlingInitialState } from 'uiSrc/slices/app/url-handling'
 import InstanceConnections from './InstanceConnections/InstanceConnections'
 import InstanceFormWrapper from '../AddInstanceForm/InstanceFormWrapper'
 import ClusterConnectionFormWrapper from '../ClusterConnection/ClusterConnectionFormWrapper'
@@ -148,6 +148,7 @@ const AddDatabasesContainer = React.memo((props: Props) => {
   }
 
   const changeConnectionType = (connectionType: AddDbType) => {
+    dispatch(setUrlHandlingInitialState())
     setConnectionType(connectionType)
   }
 

redisinsight/ui/src/slices/instances/instances.ts

@@ -367,12 +367,16 @@ export function createInstanceStandaloneAction(
       const errorCode = get(error, 'response.data.errorCode', 0) as CustomErrorCodes
 
       if (errorCode === CustomErrorCodes.DatabaseAlreadyExists) {
-        const databaseId = get(error, 'response.data.resource.databaseId', '')
+        const databaseId: string = get(error, 'response.data.resource.databaseId', '')
 
         dispatch(autoCreateAndConnectToInstanceActionSuccess(
           databaseId,
           successMessages.DATABASE_ALREADY_EXISTS(),
-          onSuccess,
+          () => {
+            dispatch(defaultInstanceChangingSuccess())
+            onSuccess?.(databaseId)
+          },
+          () => { dispatch(defaultInstanceChangingFailure(errorMessage)) }
         ))
         return
       }
@@ -430,6 +434,7 @@ function autoCreateAndConnectToInstanceActionSuccess(
   id: string,
   message: any,
   onSuccess?: (id: string) => void,
+  onFail?: () => void,
 ) {
   return async (dispatch: AppDispatch) => {
     dispatch(setAppContextInitialState())
@@ -441,7 +446,7 @@ function autoCreateAndConnectToInstanceActionSuccess(
         dispatch(addMessageNotification(message))
         onSuccess?.(id)
       }, HIDE_CREATING_DB_DELAY_MS)
-    }))
+    }, onFail))
   }
 }