Skip to content

feat(bugs): Add siblings column #411

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 3 commits into from
Jan 27, 2023
Merged

feat(bugs): Add siblings column #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0be6fc5
feat(bugs): Add siblings column
d-beezee Jan 25, 2023
ebc16da
feat(bugs): Add sibling column header
d-beezee Jan 27, 2023
84172bd
fix(bugs): Use correct data and order on sibling column
d-beezee Jan 27, 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
1 change: 1 addition & 0 deletions src/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
"__BUGS_SEARCH_INPUT_PLACEHOLDER": "Search bugs",
"__BUGS_SEVERITY_FILTER_ITEM_NO_ITEMS": "Severity",
"__BUGS_TABLE_BUG_ID_HEADER_COLUMN": "Bug id",
"__BUGS_TABLE_DUPLICATE_HEADER_COLUMN": "Duplicates",
"__BUGS_TABLE_SEVERITY_HEADER_COLUMN": "Severity",
"__BUGS_TABLE_TITLE_HEADER_COLUMN": "Bug",
"__BUGS_TYPES_FILTER_ITEM_NO_ITEMS": "Typology",
Expand Down
1 change: 1 addition & 0 deletions src/locales/it/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
"__BUGS_SEARCH_INPUT_PLACEHOLDER": "Cerca bug",
"__BUGS_SEVERITY_FILTER_ITEM_NO_ITEMS": "Severity",
"__BUGS_TABLE_BUG_ID_HEADER_COLUMN": "Bug id",
"__BUGS_TABLE_DUPLICATE_HEADER_COLUMN": "Duplicati",
"__BUGS_TABLE_SEVERITY_HEADER_COLUMN": "Severity",
"__BUGS_TABLE_TITLE_HEADER_COLUMN": "Bug",
"__BUGS_TYPES_FILTER_ITEM_NO_ITEMS": "Tipologia",
Expand Down
4 changes: 4 additions & 0 deletions src/pages/Bugs/BugsTable/assets/father-icon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/pages/Bugs/BugsTable/hooks/useTableColumns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ export const useTableColumns = () => {
header: t('__BUGS_TABLE_TITLE_HEADER_COLUMN'),
width: 'auto',
},
{
key: 'siblings',
header: t('__BUGS_TABLE_DUPLICATE_HEADER_COLUMN'),
width: '90px',
},
{
key: 'severity',
header: t('__BUGS_TABLE_SEVERITY_HEADER_COLUMN'),
Expand Down
1 change: 1 addition & 0 deletions src/pages/Bugs/BugsTable/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export interface TableDatum {
id: string;
bugId: ReactNode;
title: ReactNode;
siblings: number;
severity: ReactNode;
created: string;
updated?: string;
Expand Down
37 changes: 31 additions & 6 deletions src/pages/Bugs/BugsTable/utils/mapBugsToTableData.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
import { TFunction } from 'react-i18next';
import { theme } from 'src/app/theme';
import { SM } from '@appquality/unguess-design-system';
import { theme as globalTheme } from 'src/app/theme';
import { Pill } from 'src/common/components/pills/Pill';
import { SeverityPill } from 'src/common/components/pills/SeverityPill';
import { Pipe } from 'src/common/components/Pipe';
import { getSelectedBugId } from 'src/features/bugsPage/bugsPageSlice';
import { TableBugType } from '../../types';
import styled from 'styled-components';
import { BugTitle } from '../components/BugTitle';
import { TableBugType } from '../../types';
import { ReactComponent as FatherIcon } from '../assets/father-icon.svg';

const DuplicateContainer = styled((props) => <SM isBold {...props} />)`
display: flex;
align-items: center;
justify-content: center;
gap: ${({ theme }) => theme.space.xxs};
line-height: ${({ theme }) => theme.lineHeights.md};
`;

export const mapBugsToTableData = (bugs: TableBugType[], t: TFunction) => {
const currentBugId = getSelectedBugId();
Expand All @@ -15,8 +26,17 @@ export const mapBugsToTableData = (bugs: TableBugType[], t: TFunction) => {
return {
key: bug.id.toString(),
id: bug.id.toString(),
siblings:
bug.siblings > 0 ? (
<DuplicateContainer>
{!bug.duplicated_of_id ? (
<FatherIcon style={{ color: globalTheme.palette.grey[500] }} />
) : null}
+{bug.siblings}
</DuplicateContainer>
) : null,
bugId: (
<span style={{ color: theme.palette.grey[700] }}>
<span style={{ color: globalTheme.palette.grey[700] }}>
{bug.id.toString()}
</span>
),
Expand All @@ -37,7 +57,10 @@ export const mapBugsToTableData = (bugs: TableBugType[], t: TFunction) => {
{bug.type.name && (
<>
<Pipe size="small" />
<Pill isBold={isPillBold} style={{ marginLeft: theme.space.xs }}>
<Pill
isBold={isPillBold}
style={{ marginLeft: globalTheme.space.xs }}
>
{bug.type.name}
</Pill>
</>
Expand All @@ -48,7 +71,7 @@ export const mapBugsToTableData = (bugs: TableBugType[], t: TFunction) => {
<Pill
isBold
backgroundColor="transparent"
color={theme.palette.blue[600]}
color={globalTheme.palette.blue[600]}
>
{t('__PAGE_BUGS_UNREAD_PILL', 'Unread')}
</Pill>
Expand All @@ -60,7 +83,9 @@ export const mapBugsToTableData = (bugs: TableBugType[], t: TFunction) => {
created: bug.created,
updated: bug.updated,
borderColor:
theme.colors.bySeverity[bug.severity.name.toLowerCase() as Severities],
globalTheme.colors.bySeverity[
bug.severity.name.toLowerCase() as Severities
],
};
});
};