diff --git a/src/components/BetaLiteral.tsx b/src/components/BetaLiteral.tsx new file mode 100644 index 000000000..3f6a4aad3 --- /dev/null +++ b/src/components/BetaLiteral.tsx @@ -0,0 +1,9 @@ +import { Text } from '@taskany/bricks/harmony'; + +export const BetaLiteral: React.FC, 'size'>> = ({ size }) => { + return ( + + {String.fromCharCode(0x03b2)} + + ); +}; diff --git a/src/components/CriteriaForm/CriteriaForm.tsx b/src/components/CriteriaForm/CriteriaForm.tsx index 260f18a79..ea80a7dc8 100644 --- a/src/components/CriteriaForm/CriteriaForm.tsx +++ b/src/components/CriteriaForm/CriteriaForm.tsx @@ -20,6 +20,7 @@ import { FilterAutoCompleteInput } from '../FilterAutoCompleteInput/FilterAutoCo import { AddInlineTrigger } from '../AddInlineTrigger/AddInlineTrigger'; import { StateDot } from '../StateDot/StateDot'; import { JiraTaskBadge, JiraTaskBadgeIcon } from '../JiraTaskBadge/JiraTaskBadge'; +import { BetaLiteral } from '../BetaLiteral'; import { tr } from './CriteriaForm.i18n'; import s from './CriteriaForm.module.css'; @@ -335,14 +336,14 @@ export const CriteriaForm = ({ const isEditMode = values != null && !!values.title?.length; - const radios = useMemo>(() => { - const base: Array<{ value: CriteriaFormMode; title: string }> = [ + const radios = useMemo>(() => { + const base: Array<{ value: CriteriaFormMode; title: string; iconRight?: React.ReactNode }> = [ { title: tr('Simple'), value: 'simple' }, { title: tr('Goal'), value: 'goal' }, ]; if (externalAllowed) { - base.push({ title: tr('Task'), value: 'task' }); + base.push({ title: tr('Task'), value: 'task', iconRight: }); } return base; @@ -465,6 +466,7 @@ export const CriteriaForm = ({ key={radio.value} text={radio.title} value={radio.value} + iconRight={radio.iconRight} /> ))} diff --git a/src/components/GoalActivityFeed/GoalActivityFeed.tsx b/src/components/GoalActivityFeed/GoalActivityFeed.tsx index 2ccb5ab15..5c3d42ab2 100644 --- a/src/components/GoalActivityFeed/GoalActivityFeed.tsx +++ b/src/components/GoalActivityFeed/GoalActivityFeed.tsx @@ -217,7 +217,7 @@ export const GoalActivityFeed = forwardRef id.id)]} - externalAllowed={allowedServices?.jira || false} + externalAllowed={(user?.settings?.beta && allowedServices?.jira) || false} /> ))}