Skip to content

Commit 4a7893f

Browse files
David-DB88davitbejanyan
andauthored
[FE] Fix consumers topic label position (#3383)
* change Consumers Topic lable position * changed conditional padding row with typeScript * removed table title style from theme, changed TableHeaderConsumerCell style * changed consumers Table Header Cell and test cases * refactor ListItem.spec.tsx * removed data test id --------- Co-authored-by: davitbejanyan <[email protected]>
1 parent c153d6f commit 4a7893f

File tree

6 files changed

+21
-17
lines changed

6 files changed

+21
-17
lines changed

kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import * as Metrics from 'components/common/Metrics';
1414
import { Tag } from 'components/common/Tag/Tag.styled';
1515
import groupBy from 'lodash/groupBy';
1616
import { Table } from 'components/common/table/Table/Table.styled';
17-
import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
1817
import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
1918
import {
2019
deleteConsumerGroup,
@@ -27,6 +26,7 @@ import { Dropdown } from 'components/common/Dropdown';
2726
import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
2827
import { Action, ResourceType } from 'generated-sources';
2928
import { ActionDropdownItem } from 'components/common/ActionComponent';
29+
import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
3030

3131
import ListItem from './ListItem';
3232

@@ -137,7 +137,6 @@ const Details: React.FC = () => {
137137
<Table isFullwidth>
138138
<thead>
139139
<tr>
140-
<TableHeaderCell> </TableHeaderCell>
141140
<TableHeaderCell title="Topic" />
142141
<TableHeaderCell title="Messages behind" />
143142
</tr>
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import styled from 'styled-components';
22

3-
export const ToggleButton = styled.td`
4-
padding: 8px 8px 8px 16px !important;
5-
width: 30px;
3+
export const FlexWrapper = styled.div`
4+
display: flex;
5+
align-items: center;
6+
gap: 8px;
67
`;

kafka-ui-react-app/src/components/ConsumerGroups/Details/ListItem.tsx

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
88
import { TableKeyLink } from 'components/common/table/Table/TableKeyLink.styled';
99

1010
import TopicContents from './TopicContents/TopicContents';
11-
import { ToggleButton } from './ListItem.styled';
11+
import { FlexWrapper } from './ListItem.styled';
1212

1313
interface Props {
1414
clusterName: ClusterName;
@@ -30,14 +30,16 @@ const ListItem: React.FC<Props> = ({ clusterName, name, consumers }) => {
3030
return (
3131
<>
3232
<tr>
33-
<ToggleButton>
34-
<IconButtonWrapper onClick={() => setIsOpen(!isOpen)} aria-hidden>
35-
<MessageToggleIcon isOpen={isOpen} />
36-
</IconButtonWrapper>
37-
</ToggleButton>
38-
<TableKeyLink>
39-
<Link to={clusterTopicPath(clusterName, name)}>{name}</Link>
40-
</TableKeyLink>
33+
<td>
34+
<FlexWrapper>
35+
<IconButtonWrapper onClick={() => setIsOpen(!isOpen)} aria-hidden>
36+
<MessageToggleIcon isOpen={isOpen} />
37+
</IconButtonWrapper>
38+
<TableKeyLink>
39+
<Link to={clusterTopicPath(clusterName, name)}>{name}</Link>
40+
</TableKeyLink>
41+
</FlexWrapper>
42+
</td>
4143
<td>{getTotalMessagesBehind()}</td>
4244
</tr>
4345
{isOpen && <TopicContents consumers={consumers} />}

kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ describe('Details component', () => {
6464
expect(screen.getByText(groupId)).toBeInTheDocument();
6565

6666
expect(screen.getByRole('table')).toBeInTheDocument();
67-
expect(screen.getAllByRole('columnheader').length).toEqual(3);
67+
expect(screen.getAllByRole('columnheader').length).toEqual(2);
6868

6969
expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
7070
});

kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/ListItem.spec.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ describe('ListItem', () => {
4040
});
4141

4242
it('should renders list item with topic content open', async () => {
43-
await userEvent.click(screen.getAllByRole('cell')[0].children[0]);
43+
await userEvent.click(
44+
screen.getByRole('cell', { name: 'cluster1' }).children[0].children[0]
45+
);
4446
expect(screen.getByText('Consumer ID')).toBeInTheDocument();
4547
});
4648
});

kafka-ui-react-app/src/components/common/table/Table/TableKeyLink.styled.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ const tableLinkMixin = css(
1818
`
1919
);
2020

21-
export const TableKeyLink = styled.td`
21+
export const TableKeyLink = styled.div`
2222
${tableLinkMixin}
2323
`;

0 commit comments

Comments
 (0)