fix(ExternalTasks): show external task form only for beta users

taskany-inc · Sep 12, 2024 · 568bfc3 · 568bfc3
1 parent a25dcfd
commit 568bfc3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/components/BetaLiteral.tsx b/src/components/BetaLiteral.tsx
@@ -0,0 +1,9 @@
+import { Text } from '@taskany/bricks/harmony';
+
+export const BetaLiteral: React.FC<Pick<React.ComponentProps<typeof Text>, 'size'>> = ({ size }) => {
+    return (
+        <Text as="span" color="var(--brand-color)" size={size}>
+            {String.fromCharCode(0x03b2)}
+        </Text>
+    );
+};
diff --git 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<Array<{ value: CriteriaFormMode; title: string }>>(() => {
-        const base: Array<{ value: CriteriaFormMode; title: string }> = [
+    const radios = useMemo<Array<{ value: CriteriaFormMode; title: string; iconRight?: React.ReactNode }>>(() => {
+        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: <BetaLiteral size="s" /> });
         }
 
         return base;
@@ -465,6 +466,7 @@ export const CriteriaForm = ({
                                             key={radio.value}
                                             text={radio.title}
                                             value={radio.value}
+                                            iconRight={radio.iconRight}
                                         />
                                     ))}
                                 </Switch>

diff --git a/src/components/GoalActivityFeed/GoalActivityFeed.tsx b/src/components/GoalActivityFeed/GoalActivityFeed.tsx
@@ -217,7 +217,7 @@ export const GoalActivityFeed = forwardRef<HTMLDivElement, GoalActivityFeedProps
                                     validateGoalCriteriaBindings={validateGoalCriteriaBindings}
                                     validityData={criteriaValidityData}
                                     filter={[goal.id, ...parentGoalIds.map((id) => id.id)]}
-                                    externalAllowed={allowedServices?.jira || false}
+                                    externalAllowed={(user?.settings?.beta && allowedServices?.jira) || false}
                                 />
                             </GoalFormPopupTrigger>
                         ))}