Skip to content

Commit 0fb6225

Browse files
authored
Merge pull request #696 from AppQuality/fix-ux-filters-tags-counters
🔧 fix(FiltersTags.tsx): import useCallback from react
2 parents e66bf72 + c426cd4 commit 0fb6225

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

src/pages/Campaign/useWidgets/Experience/widgets/Insights/filters/FiltersTags.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
} from 'src/features/uxFilters';
1111
import { styled } from 'styled-components';
1212
import { getSeverity } from '../utils';
13+
import { useFilterData } from './useFilterData';
1314

1415
const buttonHeight = appTheme.space.lg; // 32
1516
const sectionMargin = appTheme.space.sm; // 12
@@ -73,9 +74,10 @@ const StyledButton = styled(Button)`
7374

7475
export const FiltersTags = () => {
7576
const { t } = useTranslation();
76-
const data = getCurrentUxData();
77-
7877
const dispatch = useAppDispatch();
78+
const data = getCurrentUxData();
79+
const { counters: severitiesCounters } = useFilterData('severities');
80+
const { counters: clustersCounters } = useFilterData('clusters');
7981

8082
if (!data || !data.clusters || !data.severities) return null;
8183

@@ -114,14 +116,16 @@ export const FiltersTags = () => {
114116
color={getSeverityInfo(getSeverity(item) as Severities, t).color}
115117
size="large"
116118
>
117-
{item.name}
119+
{data.severities.available.find((s) => s.id === item.id)?.name} (
120+
{severitiesCounters[item.id] ?? 0})
118121
<Tag.Close onClick={removeSeverity(item.id)} />
119122
</Tag>
120123
))}
121124

122125
{data.clusters.selected.map((item) => (
123126
<Tag key={item.id} size="large" hue={appTheme.palette.grey[200]}>
124-
{item.name}
127+
{data.clusters.available.find((s) => s.id === item.id)?.name} (
128+
{clustersCounters[item.id] ?? 0})
125129
<Tag.Close onClick={removeUseCase(item.id)} />
126130
</Tag>
127131
))}

src/pages/Campaign/useWidgets/Experience/widgets/Insights/filters/SeverityFilter.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ import { CounterMultiselect } from '@appquality/unguess-design-system';
22
import { useTranslation } from 'react-i18next';
33
import { useAppDispatch } from 'src/app/hooks';
44
import { getCurrentUxData, updateFilters } from 'src/features/uxFilters';
5-
import { appTheme } from 'src/app/theme';
5+
import { getSeverityInfo } from 'src/common/components/utils/getSeverityInfo';
66
import { useFilterData } from './useFilterData';
7+
import { getSeverity } from '../utils';
78

89
export const SeverityFilter = () => {
910
const { t } = useTranslation();
@@ -45,10 +46,7 @@ export const SeverityFilter = () => {
4546
className: `dropdown-severities-item-${item.name.toLowerCase()}`,
4647
label: `${item.name} (${counters[item.id] ?? 0})`,
4748
style: {
48-
color:
49-
appTheme.colors.bySeverity[
50-
item.name.toLocaleLowerCase() as Severities
51-
],
49+
color: getSeverityInfo(getSeverity(item) as Severities, t).color,
5250
},
5351
disabled:
5452
!counters[item.id] &&

0 commit comments

Comments
 (0)