Merge pull request #2549 from RedisInsight/build/bugfix/RI-4723_Open_RI_from_SM

#RI-4916, #RI-4917, #RI-4918, #RI-4920, #RI-4921

Author: egor-zalenski

redisinsight/ui/src/components/global-url-handler/GlobalUrlHandler.spec.tsx

@@ -87,6 +87,7 @@ describe('GlobalUrlHandler', () => {
 
     expect(store.getActions()).toEqual([
       setUrlProperties(urlProperties),
+      setFromUrl(null),
       setUrlHandlingInitialState(),
       addInfiniteNotification(INFINITE_MESSAGES.AUTO_CREATING_DATABASE())
     ])
@@ -117,6 +118,7 @@ describe('GlobalUrlHandler', () => {
 
     const expectedActions = [
       setUrlProperties(urlProperties),
+      setFromUrl(null),
       setUrlDbConnection({
         action: UrlHandlingActions.Connect,
         dbConnection: {
@@ -127,7 +129,7 @@ describe('GlobalUrlHandler', () => {
           tls: false,
           username: undefined
         }
-      })
+      }),
     ]
 
     expect(store.getActions().slice(0, expectedActions.length)).toEqual(expectedActions)
@@ -160,6 +162,7 @@ describe('GlobalUrlHandler', () => {
 
     const expectedActions = [
       setUrlProperties(urlProperties),
+      setFromUrl(null),
       setUrlDbConnection({
         action: UrlHandlingActions.Connect,
         dbConnection: {

redisinsight/ui/src/components/global-url-handler/GlobalUrlHandler.tsx

@@ -37,6 +37,7 @@ const GlobalUrlHandler = () => {
       // @ts-ignore
       const urlProperties = Object.fromEntries(fromParams) || {}
       dispatch(setUrlProperties(urlProperties))
+      dispatch(setFromUrl(null))
 
       const pathname = actionUrl.hostname + actionUrl.pathname
       if (pathname?.replace(/^(\/\/?)/g, '') === UrlHandlingActions.Connect) {
@@ -94,8 +95,6 @@ const GlobalUrlHandler = () => {
 
       const url = new ConnectionString(redisUrl)
 
-      console.log(url)
-
       /* If a protocol exists, it should be a redis protocol */
       if (url.protocol && !REDIS_URI_SCHEMES.includes(url.protocol)) return
 

redisinsight/ui/src/pages/home/HomePage.tsx

@@ -24,15 +24,15 @@ import { resetDataSentinel, sentinelSelector } from 'uiSrc/slices/instances/sent
 import { appAnalyticsInfoSelector } from 'uiSrc/slices/app/info'
 import { fetchContentAction as fetchCreateRedisButtonsAction } from 'uiSrc/slices/content/create-redis-buttons'
 import { sendEventTelemetry, sendPageViewTelemetry, TelemetryEvent, TelemetryPageView } from 'uiSrc/telemetry'
+import { appRedirectionSelector, setUrlHandlingInitialState } from 'uiSrc/slices/app/url-handling'
+import { UrlHandlingActions } from 'uiSrc/slices/interfaces/urlHandling'
 import AddDatabaseContainer, { AddDbType } from './components/AddDatabases/AddDatabasesContainer'
 import DatabasesList from './components/DatabasesListComponent/DatabasesListWrapper'
 import WelcomeComponent from './components/WelcomeComponent/WelcomeComponent'
 import HomeHeader from './components/HomeHeader'
 
 import './styles.scss'
 import styles from './styles.module.scss'
-import { appRedirectionSelector, setUrlHandlingInitialState } from 'uiSrc/slices/app/url-handling'
-import { UrlHandlingActions } from 'uiSrc/slices/interfaces/urlHandling'
 
 const HomePage = () => {
   const [width, setWidth] = useState(0)
@@ -81,12 +81,6 @@ const HomePage = () => {
     })
   }, [])
 
-  useEffect(() => {
-    if (action === UrlHandlingActions.Connect) {
-      setAddDialogIsOpen(true)
-    }
-  }, [action])
-
   useEffect(() => {
     if (isDeletedInstance) {
       dispatch(fetchInstancesAction())
@@ -120,6 +114,12 @@ const HomePage = () => {
     }
   }, [clusterCredentials, cloudCredentials, sentinelInstance])
 
+  useEffect(() => {
+    if (action === UrlHandlingActions.Connect) {
+      setAddDialogIsOpen(true)
+    }
+  }, [action, dbConnection])
+
   useEffect(() => {
     const isDialogOpen = !!instances.length && (addDialogIsOpen || editDialogIsOpen)
 
@@ -311,6 +311,7 @@ const HomePage = () => {
                           editMode={false}
                           width={width}
                           isResizablePanel
+                          urlHandlingAction={action}
                           initialValues={dbConnection ?? null}
                           editedInstance={sentinelInstance ?? null}
                           onClose={handleClose}

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

@@ -19,6 +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 InstanceConnections from './InstanceConnections/InstanceConnections'
 import InstanceFormWrapper from '../AddInstanceForm/InstanceFormWrapper'
 import ClusterConnectionFormWrapper from '../ClusterConnection/ClusterConnectionFormWrapper'
@@ -63,6 +64,7 @@ const AddDatabasesContainer = React.memo((props: Props) => {
   const { credentials: clusterCredentials } = useSelector(clusterSelector)
   const { credentials: cloudCredentials } = useSelector(cloudSelector)
   const { data: sentinelMasters } = useSelector(sentinelSelector)
+  const { action, dbConnection } = useSelector(appRedirectionSelector)
 
   const dispatch = useDispatch()
 
@@ -84,6 +86,12 @@ const AddDatabasesContainer = React.memo((props: Props) => {
     }
   }, [])
 
+  useEffect(() => {
+    if (action === UrlHandlingActions.Connect) {
+      setConnectionType(AddDbType.manual)
+    }
+  }, [action, dbConnection])
+
   useEffect(() =>
     // ComponentWillUnmount
     () => {