Skip to content

fixed color display on bug status table #681

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 1 commit into from
Nov 10, 2023
Merged

fixed color display on bug status table #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/pages/Bug/Drawer/Circle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ export const Circle = styled(CircleFill)<{
border-radius: 50%;
color: ${({ color }) => color};
margin-right: ${({ theme }) => theme.space.xs};
min-width: auto;
`;
30 changes: 15 additions & 15 deletions src/pages/Bugs/Content/BugsTable/utils/mapBugsToTableData.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import { SM, Tag, Tooltip } from '@appquality/unguess-design-system';
import { useTranslation } from 'react-i18next';
import { appTheme } from 'src/app/theme';
import { SeverityTag } from 'src/common/components/tag/SeverityTag';
import { Pipe } from 'src/common/components/Pipe';
import { getSelectedBugId } from 'src/features/bugsPage/bugsPageSlice';
import { ReactComponent as FatherIcon } from 'src/assets/icons/bug-type-unique.svg';
import { Meta } from 'src/common/components/Meta';
import styled from 'styled-components';
import { getPriorityInfo } from 'src/common/components/utils/getPriorityInfo';
import { Pipe } from 'src/common/components/Pipe';
import { TextAlign } from 'src/common/components/Table';
import { BugStateIcon } from 'src/common/components/BugStateIcon';
import { SeverityTag } from 'src/common/components/tag/SeverityTag';
import { getCustomStatusInfo } from 'src/common/components/utils/getCustomStatusInfo';
import { BugTitle } from '../components/BugTitle';
import { getPriorityInfo } from 'src/common/components/utils/getPriorityInfo';
import { getSelectedBugId } from 'src/features/bugsPage/bugsPageSlice';
import { Circle } from 'src/pages/Bug/Drawer/Circle';
import styled from 'styled-components';
import { TableBugType } from '../../../types';
import { BugTitle } from '../components/BugTitle';

const AlignmentDiv = styled.div<{
alignment?: TextAlign;
Expand Down Expand Up @@ -124,14 +124,14 @@ export const mapBugsToTableData = (bugs: TableBugType[]) => {
)}
<Pipe size="small" />
<Tag isRegular={!isPillBold} hue="rgba(0,0,0,0)">
<Tag.Avatar>
<BugStateIcon
size="small"
{...appTheme.colors.byBugState[
bug.custom_status.name as BugState
]}
/>
</Tag.Avatar>
<Circle
color={`#${bug.custom_status.color}`}
{...(bug.custom_status.id === 1 && {
style: {
border: `2px solid ${appTheme.palette.grey[400]}`,
},
})}
/>
{getCustomStatusInfo(bug.custom_status.name as BugState, t).text}
</Tag>
{!bug.read && (
Expand Down