#RI-5030-5031 (#2683)

Author: AmirAllayarovSofteq

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

@@ -197,16 +197,15 @@ const SSHDetails = (props: Props) => {
           >
             <EuiFlexItem className={flexItemClassName}>
               <EuiFormRow label="Private Key*">
-                <EuiFieldPassword
-                  type="password"
+                <EuiTextArea
                   name="sshPrivateKey"
                   id="sshPrivateKey"
                   data-testid="sshPrivateKey"
                   fullWidth
                   className="passwordField"
                   maxLength={50_000}
                   placeholder="Enter SSH Private Key in PEM format"
-                  value={formik.values.sshPrivateKey === true ? SECURITY_FIELD : formik.values.sshPrivateKey ?? ''}
+                  value={formik.values.sshPrivateKey === true ? SECURITY_FIELD : formik?.values?.sshPrivateKey?.replace(/./g, '*') ?? ''}
                   onChange={formik.handleChange}
                   onFocus={() => {
                     if (formik.values.sshPrivateKey === true) {

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

@@ -456,12 +456,10 @@ const InstanceFormWrapper = (props: Props) => {
       database.sentinelMaster.password = sentinelMasterPassword
     }
 
+    const payload = getFormUpdates(database, omit(editedInstance, ['id']))
     if (isCloneMode) {
-      // name need for success message
-      const payload = getFormUpdates(database, omit(editedInstance, ['id', 'name']))
       handleCloneDatabase(payload)
     } else {
-      const payload = getFormUpdates(database, omit(editedInstance, 'id'))
       handleEditDatabase(payload)
     }
   }

redisinsight/ui/src/pages/instance/InstancePage.tsx

@@ -1,7 +1,7 @@
 import { EuiResizableContainer } from '@elastic/eui'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
-import { useHistory, useParams } from 'react-router-dom'
+import { useParams } from 'react-router-dom'
 import cx from 'classnames'
 
 import { setInitialAnalyticsSettings } from 'uiSrc/slices/analytics/settings'
@@ -66,7 +66,6 @@ const InstancePage = ({ routes = [] }: Props) => {
   const [isShouldChildrenRerender, setIsShouldChildrenRerender] = useState(false)
 
   const dispatch = useDispatch()
-  const history = useHistory()
   const { instanceId: connectionInstanceId } = useParams<{ instanceId: string }>()
   const { isShowCli, isShowHelper } = useSelector(cliSettingsSelector)
   const { data: modulesData } = useSelector(instancesSelector)

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

@@ -483,7 +483,7 @@ export function updateInstanceAction({ id, ...payload }: Instance, onSuccess?: (
 }
 
 // Asynchronous thunk action
-export function cloneInstanceAction({ id, name, ...payload }: Partial<Instance>, onSuccess?: (id?: string) => void) {
+export function cloneInstanceAction({ id, ...payload }: Partial<Instance>, onSuccess?: (id?: string) => void) {
   return async (dispatch: AppDispatch) => {
     dispatch(defaultInstanceChanging())
 
@@ -494,7 +494,7 @@ export function cloneInstanceAction({ id, name, ...payload }: Partial<Instance>,
         dispatch(defaultInstanceChangingSuccess())
         dispatch<any>(fetchInstancesAction())
 
-        dispatch(addMessageNotification(successMessages.ADDED_NEW_INSTANCE(name ?? '')))
+        dispatch(addMessageNotification(successMessages.ADDED_NEW_INSTANCE(payload.name ?? '')))
         onSuccess?.(id)
       }
     } catch (_err) {

redisinsight/ui/src/utils/tests/comparisons/diff.spec.ts

@@ -18,7 +18,7 @@ describe('getDiffKeysOfObjectValues', () => {
 
 const getFormUpdatesTests: any[] = [
   [{ name: 'name' }, { name: 'name' }, {}],
-  [{ name: '' }, { name: 'name' }, { name: '' }],
+  [{ name: '' }, { name: 'name' }, { name: null }],
   [{ name: 'name' }, { name: '' }, { name: 'name' }],
   [{ name: 'name', port: 123 }, { name: '', port: 123 }, { name: 'name' }],
   [{ name: 'name', port: 123 }, { name: '', port: 1 }, { name: 'name', port: 123 }],