#RI-4052 - remove ssh tunneling for redis stack build

Author: rsergeenko

redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.spec.tsx

@@ -2,6 +2,7 @@ import React from 'react'
 import { instance, mock } from 'ts-mockito'
 import { act, fireEvent, render, screen } from 'uiSrc/utils/test-utils'
 import { ConnectionType, InstanceType } from 'uiSrc/slices/interfaces'
+import { BuildType } from 'uiSrc/constants/env'
 import InstanceForm, { Props } from './InstanceForm'
 import { ADD_NEW_CA_CERT } from './constants'
 import { DbConnectionInfo } from './interfaces'
@@ -658,6 +659,25 @@ describe('InstanceForm', () => {
     expect(screen.getByTestId('use-ssh')).toBeChecked()
   })
 
+  it('should not render Use SSH checkbox for redis stack buidlType', async () => {
+    const handleSubmit = jest.fn()
+    render(
+      <div id="footerDatabaseForm">
+        <InstanceForm
+          {...instance(mockedProps)}
+          formFields={{
+            ...formFields,
+            connectionType: ConnectionType.Standalone,
+          }}
+          buildType={BuildType.RedisStack}
+          onSubmit={handleSubmit}
+        />
+      </div>
+    )
+
+    expect(screen.queryByTestId('use-ssh')).not.toBeInTheDocument()
+  })
+
   it('should change Use SSH checkbox and show proper fields for password radio', async () => {
     const handleSubmit = jest.fn()
     render(

redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.tsx

@@ -29,6 +29,7 @@ import {
 import { ConnectionType, InstanceType, } from 'uiSrc/slices/interfaces'
 import { getRedisModulesSummary, sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
 import { getDiffKeysOfObjectValues, checkRediStackModules } from 'uiSrc/utils'
+import { BuildType } from 'uiSrc/constants/env'
 
 import {
   ADD_NEW_CA_CERT,
@@ -63,6 +64,7 @@ export interface Props {
   submitButtonText?: SubmitBtnText
   titleText?: TitleDatabaseText
   loading: boolean
+  buildType?: BuildType
   instanceType: InstanceType
   loadingMsg: LoadingDatabaseText
   isEditMode: boolean
@@ -127,6 +129,7 @@ const AddStandaloneForm = (props: Props) => {
     onHostNamePaste,
     submitButtonText,
     instanceType,
+    buildType,
     loading,
     isEditMode,
     isCloneMode,
@@ -511,7 +514,7 @@ const AddStandaloneForm = (props: Props) => {
               certificates={certificates}
               caCertificates={caCertificates}
             />
-            {instanceType !== InstanceType.Sentinel && (
+            {instanceType !== InstanceType.Sentinel && buildType !== BuildType.RedisStack && (
               <SSHDetails
                 formik={formik}
                 flexItemClassName={flexItemClassName}
@@ -563,11 +566,13 @@ const AddStandaloneForm = (props: Props) => {
                 certificates={certificates}
                 caCertificates={caCertificates}
               />
-              <SSHDetails
-                formik={formik}
-                flexItemClassName={flexItemClassName}
-                flexGroupClassName={flexGroupClassName}
-              />
+              {buildType !== BuildType.RedisStack && (
+                <SSHDetails
+                  formik={formik}
+                  flexItemClassName={flexItemClassName}
+                  flexGroupClassName={flexGroupClassName}
+                />
+              )}
             </EuiForm>
           </>
         )}

redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceFormWrapper.tsx

@@ -21,6 +21,7 @@ import { caCertsSelector, fetchCaCerts } from 'uiSrc/slices/instances/caCerts'
 import { ConnectionType, Instance, InstanceType, } from 'uiSrc/slices/interfaces'
 import { BrowserStorageItem, DbType, Pages, REDIS_URI_SCHEMES } from 'uiSrc/constants'
 import { clientCertsSelector, fetchClientCerts, } from 'uiSrc/slices/instances/clientCerts'
+import { appInfoSelector } from 'uiSrc/slices/app/info'
 
 import InstanceForm from './InstanceForm'
 import { DbConnectionInfo } from './InstanceForm/interfaces'
@@ -90,6 +91,7 @@ const InstanceFormWrapper = (props: Props) => {
   const { loading: loadingSentinel } = useSelector(sentinelSelector)
   const { data: caCertificates } = useSelector(caCertsSelector)
   const { data: certificates } = useSelector(clientCertsSelector)
+  const { server } = useSelector(appInfoSelector)
 
   const tlsClientAuthRequired = !!editedInstance?.clientCert?.id ?? false
   const selectedTlsClientCertId = editedInstance?.clientCert?.id ?? ADD_NEW
@@ -455,6 +457,7 @@ const InstanceFormWrapper = (props: Props) => {
         formFields={connectionFormData}
         initialValues={initialValues}
         loading={loadingStandalone || loadingSentinel}
+        buildType={server?.buildType}
         instanceType={instanceType}
         loadingMsg={
           editMode