RI-5917-ShowTTL-checkbox-for-hash-fields #3624
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,76 @@ | ||
| import React from 'react' | ||
| import { instance, mock } from 'ts-mockito' | ||
| import { render, screen, fireEvent } from 'uiSrc/utils/test-utils' | ||
| import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry' | ||
| import { INSTANCE_ID_MOCK } from 'uiSrc/mocks/handlers/instances/instancesHandlers' | ||
| import { Props, HashDetails } from './HashDetails' | ||
|
|
||
| const mockedProps = mock<Props>() | ||
|
|
||
| jest.mock('uiSrc/telemetry', () => ({ | ||
| ...jest.requireActual('uiSrc/telemetry'), | ||
| sendEventTelemetry: jest.fn(), | ||
| })) | ||
|
|
||
| describe('HashDetails', () => { | ||
| beforeEach(() => { | ||
| jest.clearAllMocks() | ||
| }) | ||
| it('should render', () => { | ||
| expect(render(<HashDetails {...instance(mockedProps)} />)).toBeTruthy() | ||
| }) | ||
|
|
||
| it('should render subheader', () => { | ||
| render(<HashDetails {...instance(mockedProps)} />) | ||
| expect(screen.getByText('Show TTL')).toBeInTheDocument() | ||
| }) | ||
|
|
||
| it('opens and closes the add item panel', () => { | ||
| render( | ||
| <HashDetails | ||
| {...instance(mockedProps)} | ||
| onOpenAddItemPanel={() => {}} | ||
| onCloseAddItemPanel={() => {}} | ||
| /> | ||
| ) | ||
| fireEvent.click(screen.getByText('+')) | ||
| expect(screen.getByText('Save')).toBeInTheDocument() | ||
| fireEvent.click(screen.getByText('Cancel')) | ||
| expect(screen.queryByText('Save')).not.toBeInTheDocument() | ||
| }) | ||
|
|
||
| it('toggles the show TTL button', () => { | ||
| render(<HashDetails {...instance(mockedProps)} />) | ||
| const el = screen.getByTestId('test-check-ttl') as HTMLInputElement | ||
| expect(el.checked).toBe(true) | ||
| fireEvent.click(el) | ||
| expect(el.checked).toBe(false) | ||
| }) | ||
|
|
||
| it('should call proper telemetry event after click on showTtl', () => { | ||
| const sendEventTelemetryMock = jest.fn(); | ||
| (sendEventTelemetry as jest.Mock).mockImplementation(() => sendEventTelemetryMock) | ||
|
|
||
| render(<HashDetails {...instance(mockedProps)} />) | ||
|
|
||
| fireEvent.click(screen.getByTestId('test-check-ttl')) | ||
|
|
||
| expect(sendEventTelemetry).toBeCalledWith({ | ||
| event: TelemetryEvent.SHOW_HASH_TTL_CLICKED, | ||
| eventData: { | ||
| databaseId: INSTANCE_ID_MOCK, | ||
| action: 'hide' | ||
| } | ||
| }) | ||
|
|
||
| fireEvent.click(screen.getByTestId('test-check-ttl')) | ||
|
|
||
| expect(sendEventTelemetry).toBeCalledWith({ | ||
| event: TelemetryEvent.SHOW_HASH_TTL_CLICKED, | ||
| eventData: { | ||
| databaseId: INSTANCE_ID_MOCK, | ||
| action: 'show' | ||
| } | ||
| }) | ||
| }) | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import React from 'react' | ||
| import { render, fireEvent } from 'uiSrc/utils/test-utils' | ||
| import { KeyDetailsSubheader } from './KeyDetailsSubheader' | ||
|
|
||
| describe('KeyDetailsSubheader', () => { | ||
| const props = { | ||
| showTtl: false, | ||
| onShowTtl: jest.fn(), | ||
| onAddKey: jest.fn(), | ||
| } | ||
|
|
||
| it('should render', () => { | ||
| const { getByText, getByTestId } = render(<KeyDetailsSubheader {...props} />) | ||
| expect(getByText('Show TTL')).toBeInTheDocument() | ||
| expect(getByTestId('btn-add-key')).toBeInTheDocument() | ||
| }) | ||
|
|
||
| it('calls onShowTtl when checkbox is clicked', () => { | ||
| const { getByLabelText } = render(<KeyDetailsSubheader {...props} />) | ||
| fireEvent.click(getByLabelText('Show TTL')) | ||
| expect(props.onShowTtl).toHaveBeenCalledWith(true) | ||
| }) | ||
|
|
||
| it('calls onAddKey when add key button is clicked', () => { | ||
| const { getByTestId } = render(<KeyDetailsSubheader {...props} />) | ||
| fireEvent.click(getByTestId('btn-add-key')) | ||
| expect(props.onAddKey).toHaveBeenCalled() | ||
| }) | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| import React from 'react' | ||
|
|
||
| import { EuiButton, EuiCheckbox, EuiFlexGroup, EuiFlexItem } from '@elastic/eui' | ||
| import AutoSizer from 'react-virtualized-auto-sizer' | ||
|
|
||
| import VerticalDivider from 'uiSrc/pages/rdi/statistics/components/vertical-divider' | ||
| import { KeyDetailsHeaderFormatter } from '../../../key-details-header/components/key-details-header-formatter' | ||
| import styles from './styles.module.scss' | ||
|
|
||
| interface Props { | ||
| showTtl: boolean | ||
| onShowTtl: (checked: boolean) => void | ||
| onAddKey: () => void | ||
| } | ||
|
|
||
| export const KeyDetailsSubheader = ({ | ||
| showTtl, | ||
| onShowTtl, | ||
| onAddKey | ||
| }: Props) => ( | ||
| <div className={styles.subheaderContainer}> | ||
| <AutoSizer disableHeight> | ||
| {({ width = 0 }) => ( | ||
| <div style={{ width }}> | ||
| <EuiFlexGroup justifyContent="flexEnd"> | ||
| <EuiFlexItem className={styles.keyFormatter__item}> | ||
|
||
| <KeyDetailsHeaderFormatter width={width} /> | ||
| </EuiFlexItem> | ||
| <VerticalDivider variant="half" /> | ||
| <EuiFlexItem className={styles.showTtl__item}> | ||
| <EuiCheckbox | ||
| id="showField" | ||
| name="showTtl" | ||
| label="Show TTL" | ||
| className={styles.showTtl__checkbox} | ||
| checked={showTtl} | ||
| onChange={(e) => onShowTtl(e.target.checked)} | ||
| data-testId="test-check-ttl" | ||
| /> | ||
| </EuiFlexItem> | ||
| <VerticalDivider variant="half" /> | ||
| <EuiFlexItem className={styles.addBtn__container}> | ||
| <EuiButton | ||
| fill | ||
| color="secondary" | ||
| onClick={onAddKey} | ||
| data-testid="btn-add-key" | ||
| > | ||
| + | ||
| </EuiButton> | ||
| </EuiFlexItem> | ||
| </EuiFlexGroup> | ||
| </div> | ||
| )} | ||
| </AutoSizer> | ||
| </div> | ||
| ) | ||
|
|
||
| export default KeyDetailsSubheader | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| .subheaderContainer { | ||
| padding: 12px 18px 0px 18px; | ||
|
|
||
| .keyFormatter__item { | ||
| max-width: 100px; | ||
| margin-right: 0; | ||
| } | ||
|
|
||
| .showTtl__item { | ||
| max-width: 110px; | ||
| display: 'flex'; | ||
| margin-left: 0; | ||
| .showTtl__checkbox { | ||
| font-weight: 400; | ||
| font-size: 14px; | ||
| margin: auto; | ||
|
|
||
| :global(.euiCheckbox__input) { | ||
| color: var(--controlsBorderColor) !important; | ||
| } | ||
|
|
||
| :global(.euiCheckbox__square) { | ||
| width: 18px !important; | ||
| height: 18px !important; | ||
| border: 1px solid var(--controlsBorderColor) !important; | ||
| border-radius: 4px !important; | ||
| box-shadow: none !important; | ||
| } | ||
|
|
||
| :global(.euiCheckbox__label) { | ||
| color: var(--controlsLabelColor) !important; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .addBtn__container { | ||
| max-width: 40px; | ||
| align-self: center; | ||
| margin-right: 0 !important; | ||
| :global(.euiButton) { | ||
| height: 24px !important; | ||
| width: 27px !important; | ||
| min-width: 27px !important; | ||
|
|
||
| :global(.euiButton__content) { | ||
| padding: 0 !important; | ||
| :global(.euiButton__text) { | ||
| font-size: 12px !important; | ||
| font-weight: 400 !important; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I do not recommend using here VerticalDivider from rdi statistics components, could you please change it to Divider from common components? Maybe add property to have an ability use vertical