Merge pull request #1596 from RedisInsight/fe/bugfix/RI-4022

#RI-4022 - fix ssh username validation, fix maxlength

Author: rsergeenko

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

@@ -749,6 +749,15 @@ describe('InstanceForm', () => {
       )
     })
 
+    expect(screen.getByTestId(BTN_SUBMIT)).toBeDisabled()
+
+    await act(() => {
+      fireEvent.change(
+        screen.getByTestId('sshUsername'),
+        { target: { value: 'username' } }
+      )
+    })
+
     expect(screen.getByTestId(BTN_SUBMIT)).not.toBeDisabled()
   })
 
@@ -783,6 +792,10 @@ describe('InstanceForm', () => {
         screen.getByTestId('sshHost'),
         { target: { value: 'localhost' } }
       )
+      fireEvent.change(
+        screen.getByTestId('sshUsername'),
+        { target: { value: 'username' } }
+      )
     })
 
     expect(screen.getByTestId(BTN_SUBMIT)).toBeDisabled()
@@ -827,6 +840,11 @@ describe('InstanceForm', () => {
         { target: { value: '1771' } }
       )
 
+      fireEvent.change(
+        screen.getByTestId('sshUsername'),
+        { target: { value: 'username' } }
+      )
+
       fireEvent.change(
         screen.getByTestId('sshPassword'),
         { target: { value: '123' } }
@@ -841,6 +859,7 @@ describe('InstanceForm', () => {
       expect.objectContaining({
         sshHost: 'localhost',
         sshPort: '1771',
+        sshUsername: 'username',
         sshPassword: '123',
       })
     )
@@ -879,6 +898,11 @@ describe('InstanceForm', () => {
         { target: { value: '1771' } }
       )
 
+      fireEvent.change(
+        screen.getByTestId('sshUsername'),
+        { target: { value: 'username' } }
+      )
+
       fireEvent.change(
         screen.getByTestId('sshPrivateKey'),
         { target: { value: '123444' } }
@@ -898,6 +922,7 @@ describe('InstanceForm', () => {
       expect.objectContaining({
         sshHost: 'localhost',
         sshPort: '1771',
+        sshUsername: 'username',
         sshPrivateKey: '123444',
         sshPassphrase: '123444',
       })

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

@@ -262,6 +262,9 @@ const AddStandaloneForm = (props: Props) => {
       if (!values.sshPort) {
         errs.sshPort = fieldDisplayNames.sshPort
       }
+      if (!values.sshUsername) {
+        errs.sshUsername = fieldDisplayNames.sshUsername
+      }
       if (values.sshPassType === SshPassType.PrivateKey && !values.sshPrivateKey) {
         errs.sshPrivateKey = fieldDisplayNames.sshPrivateKey
       }

redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/constants.ts

@@ -21,5 +21,6 @@ export const fieldDisplayNames = {
   sentinelMasterName: 'Primary Group Name',
   sshHost: 'SSH Host',
   sshPort: 'SSH Port',
-  sshPrivateKey: 'SSH Private Key'
+  sshPrivateKey: 'SSH Private Key',
+  sshUsername: 'SSH Username',
 }

redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/form-components/SSHDetails.tsx

@@ -121,7 +121,7 @@ const SSHDetails = (props: Props) => {
           className={flexGroupClassName}
         >
           <EuiFlexItem className={cx(flexItemClassName)}>
-            <EuiFormRow label="Username">
+            <EuiFormRow label="Username*">
               <EuiFieldText
                 name="sshUsername"
                 id="sshUsername"
@@ -196,6 +196,7 @@ const SSHDetails = (props: Props) => {
                   value={formik.values.sshPrivateKey ?? ''}
                   onChange={formik.handleChange}
                   fullWidth
+                  maxLength={50_000}
                   placeholder="Enter SSH Private Key"
                   data-testid="sshPrivateKey"
                 />