From 0dd3ada1ee19b0a31d4794e4980ac1662829fb27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivar=20Conradi=20=C3=98sthus?= Date: Fri, 1 Oct 2021 19:38:34 +0200 Subject: [PATCH] fix: render new link if enabled --- .../FeatureToggleListNewItem/FeatureToggleListNewItem.tsx | 5 ++++- frontend/src/utils/route-path-helpers.ts | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/FeatureToggleListNewItem.tsx b/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/FeatureToggleListNewItem.tsx index 33f3b685d9..6e42a6e5b5 100644 --- a/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/FeatureToggleListNewItem.tsx +++ b/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/FeatureToggleListNewItem.tsx @@ -15,6 +15,7 @@ import ConditionallyRender from '../../../common/ConditionallyRender'; import useToast from '../../../../hooks/useToast'; import { getTogglePath } from '../../../../utils/route-path-helpers'; import { SyntheticEvent } from 'react-router/node_modules/@types/react'; +import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig'; interface IFeatureToggleListNewItemProps { name: string; @@ -36,6 +37,8 @@ const FeatureToggleListNewItem = ({ projectId, name ); + const { uiConfig } = useUiConfig(); + const styles = useStyles(); const history = useHistory(); @@ -43,7 +46,7 @@ const FeatureToggleListNewItem = ({ const onClick = (e: SyntheticEvent) => { if (!ref.current?.contains(e.target)) { - history.push(getTogglePath(projectId, name)); + history.push(getTogglePath(projectId, name, uiConfig.flags.E)); } }; diff --git a/frontend/src/utils/route-path-helpers.ts b/frontend/src/utils/route-path-helpers.ts index 4a7db71b32..2fc7fd769f 100644 --- a/frontend/src/utils/route-path-helpers.ts +++ b/frontend/src/utils/route-path-helpers.ts @@ -1,5 +1,5 @@ -export const getTogglePath = (projectId: string, featureToggleName: string) => { - return `/projects/${projectId}/features/${featureToggleName}/strategies`; +export const getTogglePath = (projectId: string, featureToggleName: string, newPath: boolean) => { + return `/projects/${projectId}/features${newPath ? '2' : ''}/${featureToggleName}/strategies`; }; export const getToggleCopyPath = (