Skip to content

#RI-4119 - edit sni #1990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 24, 2023
Merged

#RI-4119 - edit sni #1990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc0677c
#RI-4119 - SNI not saved for connections
egor-zalenski Apr 20, 2023
edb07d0
#RI-4119 - fix tests
egor-zalenski Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions redisinsight/ui/src/pages/browser/components/key-list/KeyList.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { cloneDeep } from 'lodash'
import { fireEvent } from '@testing-library/react'
import { cleanup, mockedStore, render, waitFor, screen, clearStoreActions } from 'uiSrc/utils/test-utils'
import { KeysStoreData, KeyViewType, SearchMode } from 'uiSrc/slices/interfaces/keys'
import { deleteSelectedKey, keysSelector, setLastBatchKeys } from 'uiSrc/slices/browser/keys'
import { deleteKey, keysSelector, setLastBatchKeys } from 'uiSrc/slices/browser/keys'
import { apiService } from 'uiSrc/services'
import KeyList from './KeyList'

Expand Down Expand Up @@ -196,7 +196,7 @@ describe('KeyList', () => {
fireEvent.click(screen.getByTestId('submit-delete-key'))

const expectedActions = [
deleteSelectedKey()
deleteKey()
]
expect(clearStoreActions(store.getActions().slice(-1))).toEqual(clearStoreActions(expectedActions))
})
Expand Down
3 changes: 2 additions & 1 deletion redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ const AddStandaloneForm = (props: Props) => {
provider,
ssh,
sshPassType = SshPassType.Password,
sshOptions
sshOptions,
},
initialValues: initialValuesProp,
width,
Expand Down Expand Up @@ -162,6 +162,7 @@ const AddStandaloneForm = (props: Props) => {
showDb: !!db,
showCompressor: compressor !== NONE,
sni: !!servername,
servername,
newCaCert: '',
newCaCertName: '',
selectedCaCertName,
Expand Down
6 changes: 4 additions & 2 deletions redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceFormWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ const getInitialValues = (editedInstance: Nullable<Instance>) => ({
: (editedInstance ? '' : undefined),
tls: !!editedInstance?.tls ?? false,
ssh: !!editedInstance?.ssh ?? false,
servername: editedInstance?.tlsServername,
sshPassType: editedInstance?.sshOptions
? (editedInstance.sshOptions.privateKey ? SshPassType.PrivateKey : SshPassType.Password)
: SshPassType.Password
Expand All @@ -87,7 +88,7 @@ const InstanceFormWrapper = (props: Props) => {
const [initialValues, setInitialValues] = useState(getInitialValues(editedInstance))
const [isCloneMode, setIsCloneMode] = useState<boolean>(false)

const { host, port, name, username, password, timeout, tls, ssh, sshPassType } = initialValues
const { host, port, name, username, password, timeout, tls, ssh, sshPassType, servername } = initialValues

const { loadingChanging: loadingStandalone } = useSelector(instancesSelector)
const { loading: loadingSentinel } = useSelector(sentinelSelector)
Expand Down Expand Up @@ -541,7 +542,8 @@ const InstanceFormWrapper = (props: Props) => {
sentinelMasterUsername,
sentinelMasterPassword,
ssh,
sshPassType
sshPassType,
servername,
}

const getSubmitButtonText = () => {
Expand Down