Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
118d0b4
feat(layout): create layout wrapper component and use it in all pages
marcbon Feb 23, 2023
7367086
wip(Taag): create component to finally move in des-sys
iacopolea Feb 20, 2023
08c901e
feat(Tag): remove component pill
iacopolea Feb 20, 2023
2ce83b6
wip(Tag): start removing IconPill
iacopolea Feb 20, 2023
8e1ac23
fix(Tag): adjust device icon size
iacopolea Feb 20, 2023
e38d466
refactor(StatusPill): use Tag
iacopolea Feb 22, 2023
2c0052c
feat(Tag): manage secondary text and html basic props
iacopolea Feb 22, 2023
282b170
rework(Tag): use normal tag for need review pill
iacopolea Feb 22, 2023
3230f5d
chore(Tag): remove IconPill
iacopolea Feb 22, 2023
3a29f8b
feat(Tag): use Tag for filter recap
iacopolea Feb 23, 2023
a54b08e
chore(Tag): init use same Tag component everywhere
iacopolea Feb 23, 2023
e42c596
rework(Tag): remove Counter from des-sys
iacopolea Feb 23, 2023
2fea9dc
fix(Tag): remove unused variable
iacopolea Feb 23, 2023
8a06e5e
feat(Tag): default bg grey[100]
iacopolea Feb 23, 2023
898958f
fix(Tag): different secondary text min width
iacopolea Feb 23, 2023
dba771d
feat(Tag): update severity pill design logic
iacopolea Feb 23, 2023
4ad4141
rework(Tag): use Tag for siblings
iacopolea Feb 23, 2023
b7c8758
fix: need review icon
iacopolea Feb 23, 2023
93e7e5b
fix: restore need review behaviour and margin
iacopolea Feb 23, 2023
308dd9a
fix(Tag): remove avatar with no text
iacopolea Feb 23, 2023
da166af
refactor(Tag): use Tag in bug header
iacopolea Feb 23, 2023
1097489
refactor(Tag): rename pills in tags
iacopolea Feb 24, 2023
5b0725b
fix(Tag): status tag colors
iacopolea Feb 24, 2023
44ae23a
chore(Tag): remove default prop hue when present
iacopolea Feb 24, 2023
b396669
chore: update design system and use its icons
iacopolea Feb 27, 2023
9d4ec90
chore: update design system
iacopolea Feb 27, 2023
c80bd12
chore: use design system Tag component and remove the working draft
iacopolea Feb 27, 2023
58bf4e2
fix(Tag): remove duplicates imports
iacopolea Feb 27, 2023
f40bc2a
chore: remove unused icons
iacopolea Feb 27, 2023
5181641
fix(bugs-table): add bold logic
iacopolea Feb 27, 2023
38e4fa6
chore: cleanup some useless defaults
iacopolea Feb 27, 2023
b76d46a
feat(Tag): use Tag for bugheader
iacopolea Feb 27, 2023
2b4b358
chore: remove unused variable
iacopolea Feb 27, 2023
2c3facb
fix: combing with design team
iacopolea Feb 27, 2023
2ac02e8
fix(Tag): remove separator on breakpoint small and under
iacopolea Feb 28, 2023
844805c
chore: update des sys
iacopolea Feb 28, 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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "1.4.0",
"private": true,
"dependencies": {
"@appquality/unguess-design-system": "2.12.76",
"@appquality/unguess-design-system": "2.12.79",
"@headwayapp/react-widget": "^0.0.4",
"@reduxjs/toolkit": "^1.8.0",
"@rtk-query/codegen-openapi": "^1.0.0-alpha.1",
Expand Down
4 changes: 4 additions & 0 deletions src/assets/icons/bug-type-unique.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions src/common/components/BugDetail/BugDuplicates/BugItem.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { BugCard } from 'src/common/components/BugCard/BugCardWithIcon';
import { theme as globalTheme } from 'src/app/theme';
import { Pill } from 'src/common/components/pills/Pill';
import { Span } from '@appquality/unguess-design-system';
import { Span, Tag } from '@appquality/unguess-design-system';
import styled from 'styled-components';
import { Link } from 'react-router-dom';
import { useLocalizeRoute } from 'src/hooks/useLocalizedRoute';
Expand Down Expand Up @@ -63,7 +62,7 @@ export const BugItem = ({
{pills ? (
<BugCard.Footer>
{pills.map((pill) => (
<Pill>{pill}</Pill>
<Tag>{pill}</Tag>
))}
</BugCard.Footer>
) : null}
Expand Down
5 changes: 3 additions & 2 deletions src/common/components/BugDetail/DetailsItems.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import styled from 'styled-components';
import { theme as globalTheme } from 'src/app/theme';
import { SeverityPill } from 'src/common/components/pills/SeverityPill';
import { SeverityTag } from 'src/common/components/tag/SeverityTag';
import { Bug, BugAdditionalField } from 'src/features/api';
import { MD, Span } from '@appquality/unguess-design-system';
import { Trans, useTranslation } from 'react-i18next';
Expand Down Expand Up @@ -72,7 +72,8 @@ export default ({
<Label style={{ marginBottom: globalTheme.space.xs }}>
{t('__BUGS_PAGE_BUG_DETAIL_DETAILS_BUG_SEVERITY_LABEL')}
</Label>
<SeverityPill
<SeverityTag
hasBackground
severity={bug.severity.name.toLowerCase() as Severities}
/>
</DetailsItem>
Expand Down
20 changes: 10 additions & 10 deletions src/common/components/BugDetail/Meta/NeedReviewPill.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { SM, Tooltip } from '@appquality/unguess-design-system';
import { IconPill } from 'src/common/components/pills/IconPill';
import { SM, Tooltip, Tag } from '@appquality/unguess-design-system';
import { ReactComponent as NeedReviewIcon } from 'src/assets/icons/pill-icon-need-review.svg';
import { useTranslation } from 'react-i18next';
import { theme } from 'src/app/theme';

export const NeedReviewPill = () => {
const { t } = useTranslation();
Expand All @@ -11,14 +11,14 @@ export const NeedReviewPill = () => {
type="light"
content={t('__BUGS_PAGE_BUG_DETAIL_NEED_REVIEW_TOOLTIP')}
>
<span>
<IconPill
size="medium"
iconPosition="right"
title={<SM>{t('__BUGS_PAGE_BUG_DETAIL_NEED_REVIEW')}</SM>}
icon={<NeedReviewIcon />}
/>
</span>
<div>
<SM tag="span" style={{ marginRight: theme.space.xxs }}>
{t('__BUGS_PAGE_BUG_DETAIL_NEED_REVIEW')}
</SM>
<Tag hue="rgba(0,0,0,0)" isRound>
<NeedReviewIcon />
</Tag>
</div>
</Tooltip>
);
};
60 changes: 30 additions & 30 deletions src/common/components/BugDetail/Meta/index.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { XL, MD, SM } from '@appquality/unguess-design-system';
import { XL, MD, SM, Tag } from '@appquality/unguess-design-system';
import { ReactComponent as OSIcon } from 'src/assets/icons/environment-icon.svg';
import { ReactComponent as SmartphoneIcon } from 'src/assets/icons/pill-icon-smartphone.svg';
import { ReactComponent as TabletIcon } from 'src/assets/icons/pill-icon-tablet.svg';
import { ReactComponent as DesktopIcon } from 'src/assets/icons/pill-icon-desktop.svg';
import { SeverityPill } from 'src/common/components/pills/SeverityPill';
import { SeverityTag } from 'src/common/components/tag/SeverityTag';
import styled from 'styled-components';
import { theme as globalTheme } from 'src/app/theme';
import { Bug } from 'src/features/api';
import { IconPill } from 'src/common/components/pills/IconPill';
import { Pipe } from 'src/common/components/Pipe';
import { WrappedText } from 'src/common/components/WrappedText';
import { NeedReviewPill } from './NeedReviewPill';
Expand Down Expand Up @@ -39,7 +38,7 @@ function getDeviceIcon(device: string) {
case 'desktop':
return <DesktopIcon />;
default:
return null;
return <TabletIcon />;
}
}

Expand All @@ -55,7 +54,10 @@ export default ({
}) => (
<Container>
<SeverityContainer>
<SeverityPill severity={bug.severity.name.toLowerCase() as Severities} />
<SeverityTag
hasBackground
severity={bug.severity.name.toLowerCase() as Severities}
/>
{bug.status.id === 4 && <NeedReviewPill />}
</SeverityContainer>
<XL
Expand All @@ -70,37 +72,35 @@ export default ({
</XL>
<MD
style={{
color: globalTheme.palette.grey[600],
color: globalTheme.palette.grey[700],
marginBottom: globalTheme.space.md,
}}
>
{bug.title.context ? bug.title.context.join(', ') : null}
</MD>
<BugInfo>
<SM style={{ textTransform: 'capitalize' }}>{bug.type.name}</SM>
<Pipe style={{ height: globalTheme.lineHeights.md }} />
<IconPill
size="medium"
title={
<SM>
{bug.device.type === 'desktop'
? bug.device.desktop_type
: `${bug.device.manufacturer} ${bug.device.model}`}
</SM>
}
icon={getDeviceIcon(bug.device.type)}
style={{ textTransform: 'capitalize' }}
/>
<IconPill
size="medium"
title={
<SM>
{bug.device.os} {bug.device.os_version}
</SM>
}
icon={<OSIcon />}
style={{ textTransform: 'capitalize' }}
/>
<SM
isBold
style={{
textTransform: 'capitalize',
color: globalTheme.palette.grey[700],
}}
>
{bug.type.name}
</SM>
<Pipe size="regular" style={{ height: globalTheme.lineHeights.md }} />
<Tag hue="white" style={{ textTransform: 'capitalize' }}>
<Tag.Avatar>{getDeviceIcon(bug.device.type)}</Tag.Avatar>
{bug.device.type === 'desktop'
? bug.device.desktop_type
: `${bug.device.manufacturer} ${bug.device.model}`}
</Tag>
<Tag hue="white" style={{ textTransform: 'capitalize' }}>
<Tag.Avatar>
<OSIcon />
</Tag.Avatar>
{bug.device.os} {bug.device.os_version}
</Tag>
</BugInfo>
</Container>
);
79 changes: 0 additions & 79 deletions src/common/components/pills/IconPill.tsx

This file was deleted.

20 changes: 0 additions & 20 deletions src/common/components/pills/Pill.tsx

This file was deleted.

25 changes: 0 additions & 25 deletions src/common/components/pills/SeverityPill.tsx

This file was deleted.

44 changes: 0 additions & 44 deletions src/common/components/pills/StatusPill.tsx

This file was deleted.

36 changes: 36 additions & 0 deletions src/common/components/tag/SeverityTag.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/* eslint-disable security/detect-object-injection */
import { Tag } from '@appquality/unguess-design-system';
import { theme } from 'src/app/theme';
import { capitalizeFirstLetter } from 'src/common/capitalizeFirstLetter';

interface SeverityTagProps {
severity: Severities;
counter?: number;
hasBackground?: boolean;
size?: 'small' | 'medium' | 'large';
isRegular?: boolean;
}

export const SeverityTag = ({
severity,
counter,
hasBackground,
size,
isRegular,
}: SeverityTagProps) => (
<Tag
size={size}
color={theme.colors.bySeverity[severity]}
hue={
hasBackground ? `${theme.colors.bySeverity[severity]}14` : 'rgba(0,0,0,0)'
}
isRegular={isRegular}
>
{capitalizeFirstLetter(severity)}
{typeof counter !== 'undefined' && (
<Tag.SecondaryText isBold color={theme.palette.grey[700]}>
{counter}
</Tag.SecondaryText>
)}
</Tag>
);
Loading