Skip to content

Commit 010ae62

Browse files
authored
Merge pull request #681 from AppQuality/fix-table-bugs-status
fixed color display on bug status table
2 parents 7998354 + 13b56b4 commit 010ae62

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

src/pages/Bug/Drawer/Circle.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ export const Circle = styled(CircleFill)<{
1111
border-radius: 50%;
1212
color: ${({ color }) => color};
1313
margin-right: ${({ theme }) => theme.space.xs};
14+
min-width: auto;
1415
`;

src/pages/Bugs/Content/BugsTable/utils/mapBugsToTableData.tsx

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import { SM, Tag, Tooltip } from '@appquality/unguess-design-system';
22
import { useTranslation } from 'react-i18next';
33
import { appTheme } from 'src/app/theme';
4-
import { SeverityTag } from 'src/common/components/tag/SeverityTag';
5-
import { Pipe } from 'src/common/components/Pipe';
6-
import { getSelectedBugId } from 'src/features/bugsPage/bugsPageSlice';
74
import { ReactComponent as FatherIcon } from 'src/assets/icons/bug-type-unique.svg';
85
import { Meta } from 'src/common/components/Meta';
9-
import styled from 'styled-components';
10-
import { getPriorityInfo } from 'src/common/components/utils/getPriorityInfo';
6+
import { Pipe } from 'src/common/components/Pipe';
117
import { TextAlign } from 'src/common/components/Table';
12-
import { BugStateIcon } from 'src/common/components/BugStateIcon';
8+
import { SeverityTag } from 'src/common/components/tag/SeverityTag';
139
import { getCustomStatusInfo } from 'src/common/components/utils/getCustomStatusInfo';
14-
import { BugTitle } from '../components/BugTitle';
10+
import { getPriorityInfo } from 'src/common/components/utils/getPriorityInfo';
11+
import { getSelectedBugId } from 'src/features/bugsPage/bugsPageSlice';
12+
import { Circle } from 'src/pages/Bug/Drawer/Circle';
13+
import styled from 'styled-components';
1514
import { TableBugType } from '../../../types';
15+
import { BugTitle } from '../components/BugTitle';
1616

1717
const AlignmentDiv = styled.div<{
1818
alignment?: TextAlign;
@@ -124,14 +124,14 @@ export const mapBugsToTableData = (bugs: TableBugType[]) => {
124124
)}
125125
<Pipe size="small" />
126126
<Tag isRegular={!isPillBold} hue="rgba(0,0,0,0)">
127-
<Tag.Avatar>
128-
<BugStateIcon
129-
size="small"
130-
{...appTheme.colors.byBugState[
131-
bug.custom_status.name as BugState
132-
]}
133-
/>
134-
</Tag.Avatar>
127+
<Circle
128+
color={`#${bug.custom_status.color}`}
129+
{...(bug.custom_status.id === 1 && {
130+
style: {
131+
border: `2px solid ${appTheme.palette.grey[400]}`,
132+
},
133+
})}
134+
/>
135135
{getCustomStatusInfo(bug.custom_status.name as BugState, t).text}
136136
</Tag>
137137
{!bug.read && (

0 commit comments

Comments
 (0)