From 9ad2c8f7ff81e3a590b75471249b89badabee5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivar=20Conradi=20=C3=98sthus?= <ivarconr@gmail.com>
Date: Thu, 14 Oct 2021 11:01:22 +0200
Subject: [PATCH] fix: link to toggle view

---
 .../feature/FeatureToggleList/FeatureToggleList.jsx          | 5 +++++
 .../FeatureToggleListItem/FeatureToggleListItem.jsx          | 4 +++-
 frontend/src/component/feature/FeatureToggleList/index.jsx   | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/frontend/src/component/feature/FeatureToggleList/FeatureToggleList.jsx b/frontend/src/component/feature/FeatureToggleList/FeatureToggleList.jsx
index 740baab557..984ec20be4 100644
--- a/frontend/src/component/feature/FeatureToggleList/FeatureToggleList.jsx
+++ b/frontend/src/component/feature/FeatureToggleList/FeatureToggleList.jsx
@@ -35,6 +35,7 @@ const FeatureToggleList = ({
     toggleFeature,
     archive,
     loading,
+    flags,
 }) => {
     const { hasAccess } = useContext(AccessContext);
     const styles = useStyles();
@@ -72,6 +73,8 @@ const FeatureToggleList = ({
                     revive={revive}
                     hasAccess={hasAccess}
                     className={'skeleton'}
+                    flags={flags}
+                    archive={archive}
                 />
             ));
         }
@@ -91,6 +94,7 @@ const FeatureToggleList = ({
                         toggleFeature={toggleFeature}
                         revive={revive}
                         hasAccess={hasAccess}
+                        flags={flags}
                     />
                 ))}
                 elseShow={
@@ -223,6 +227,7 @@ FeatureToggleList.propTypes = {
     history: PropTypes.object.isRequired,
     loading: PropTypes.bool,
     currentProjectId: PropTypes.string.isRequired,
+    flags: PropTypes.object,
 };
 
 export default FeatureToggleList;
diff --git a/frontend/src/component/feature/FeatureToggleList/FeatureToggleListItem/FeatureToggleListItem.jsx b/frontend/src/component/feature/FeatureToggleList/FeatureToggleListItem/FeatureToggleListItem.jsx
index 1d1e418be3..f12f816700 100644
--- a/frontend/src/component/feature/FeatureToggleList/FeatureToggleListItem/FeatureToggleListItem.jsx
+++ b/frontend/src/component/feature/FeatureToggleList/FeatureToggleListItem/FeatureToggleListItem.jsx
@@ -28,6 +28,7 @@ const FeatureToggleListItem = ({
     metricsLastMinute = { yes: 0, no: 0, isFallback: true },
     revive,
     hasAccess,
+    flags = {},
     ...rest
 }) => {
     const styles = useStyles();
@@ -51,7 +52,7 @@ const FeatureToggleListItem = ({
             <span className={classnames(styles.listItemLink)}>
                 <ConditionallyRender condition={!isArchive} show={
                     <Link
-                        to={getTogglePath(feature.project, name)}
+                        to={getTogglePath(feature.project, name, flags.E)}
                         className={classnames(
                             commonStyles.listLink,
                             commonStyles.truncate
@@ -127,6 +128,7 @@ FeatureToggleListItem.propTypes = {
     metricsLastMinute: PropTypes.object,
     revive: PropTypes.func,
     hasAccess: PropTypes.func.isRequired,
+    flags: PropTypes.object,
 };
 
 export default memo(FeatureToggleListItem);
diff --git a/frontend/src/component/feature/FeatureToggleList/index.jsx b/frontend/src/component/feature/FeatureToggleList/index.jsx
index ca3bc71419..3f6c13836b 100644
--- a/frontend/src/component/feature/FeatureToggleList/index.jsx
+++ b/frontend/src/component/feature/FeatureToggleList/index.jsx
@@ -22,6 +22,7 @@ function resolveCurrentProjectId(settings) {
 
 export const mapStateToPropsConfigurable = isFeature => state => {
     const featureMetrics = state.featureMetrics.toJS();
+    const flags = state.uiConfig.toJS().flags;
     const settings = state.settings.toJS().feature || {};
     let features = isFeature
         ? state.features.toJS()
@@ -131,6 +132,7 @@ export const mapStateToPropsConfigurable = isFeature => state => {
         featureMetrics,
         archive: !isFeature,
         settings,
+        flags,
         loading: state.apiCalls.fetchTogglesState.loading,
     };
 };