#RI-5229 - resolve comments

Author: AmirAllayarovSofteq

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

@@ -287,4 +287,52 @@ describe('GlobalUrlHandler', () => {
     expect(store.getActions().slice(0, expectedActions.length)).toEqual(expectedActions)
     expect(pushMock).toBeCalledWith(Pages.home)
   })
+
+  it('should call proper actions only after consents popup is accepted and open form to add db with tls', async () => {
+    const pushMock = jest.fn()
+    reactRouterDom.useHistory = jest.fn().mockReturnValueOnce({ push: pushMock });
+    (userSettingsSelector as jest.Mock).mockReturnValueOnce({
+      config: {},
+      isShowConsents: false
+    })
+
+    const url = `${fromUrl}&requiredTls=true`;
+
+    (appRedirectionSelector as jest.Mock).mockReturnValueOnce({
+      fromUrl: url
+    })
+
+    await act(() => {
+      render(<GlobalUrlHandler />)
+    })
+
+    const actionUrl = new URL(url)
+    const fromParams = new URLSearchParams(actionUrl.search)
+    // @ts-ignore
+    const urlProperties = Object.fromEntries(fromParams) || {}
+    urlProperties.cloudId = urlProperties.cloudBdbId
+    delete urlProperties.cloudBdbId
+
+    const expectedActions = [
+      setUrlProperties(urlProperties),
+      setFromUrl(null),
+      setUrlDbConnection({
+        action: UrlHandlingActions.Connect,
+        dbConnection: {
+          host: 'localhost',
+          name: 'My Name',
+          password: 'password',
+          port: 6379,
+          tls: true,
+          caCert: undefined,
+          clientCert: undefined,
+          verifyServerCert: false,
+          username: 'default',
+        }
+      })
+    ]
+
+    expect(store.getActions().slice(0, expectedActions.length)).toEqual(expectedActions)
+    expect(pushMock).toBeCalledWith(Pages.home)
+  })
 })

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

@@ -2,7 +2,7 @@ import { useHistory, useLocation } from 'react-router-dom'
 import { useDispatch, useSelector } from 'react-redux'
 import { useEffect } from 'react'
 import { ConnectionString } from 'connection-string'
-import { isNull, isNumber, every, values, pick } from 'lodash'
+import { isNull, isNumber, every, values, pick, some } from 'lodash'
 import { Pages, REDIS_URI_SCHEMES } from 'uiSrc/constants'
 import { ADD_NEW_CA_CERT, ADD_NEW } from 'uiSrc/pages/home/constants'
 import {
@@ -89,6 +89,7 @@ const GlobalUrlHandler = () => {
         redisUrl,
         databaseAlias,
         redirect,
+        requiredTls,
         requiredCaCert,
         requiredClientCert,
       } = properties
@@ -112,14 +113,21 @@ const GlobalUrlHandler = () => {
         password: url.password,
       }
 
+      const tlsFields = {
+        requiredTls,
+        requiredCaCert,
+        requiredClientCert,
+      }
+
       const isAllObligatoryProvided = every(values(obligatoryForAutoConnectFields), (value) => value || isNumber(value))
+      const isTlsProvided = some(values(tlsFields), (value) => value === 'true')
 
       const db = {
         ...obligatoryForAutoConnectFields,
         name: databaseAlias || url.host,
       } as any
 
-      if (isAllObligatoryProvided && (requiredCaCert !== 'true' && requiredClientCert !== 'true')) {
+      if (isAllObligatoryProvided && !isTlsProvided) {
         if (cloudDetails?.cloudId) {
           db.cloudDetails = cloudDetails
         }
@@ -134,7 +142,7 @@ const GlobalUrlHandler = () => {
         dbConnection: {
           ...db,
           // set tls with new cert option
-          tls: requiredCaCert === 'true' || requiredClientCert === 'true',
+          tls: isTlsProvided,
           verifyServerCert: requiredCaCert === 'true',
           caCert: requiredCaCert === 'true' ? { id: ADD_NEW_CA_CERT } : undefined,
           clientCert: requiredClientCert === 'true' ? { id: ADD_NEW } : undefined,