diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyEmpty/FeatureStrategyEmpty.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyEmpty/FeatureStrategyEmpty.tsx index 8be9907cca..df51797341 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyEmpty/FeatureStrategyEmpty.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyEmpty/FeatureStrategyEmpty.tsx @@ -1,3 +1,4 @@ +// deprecated; remove with the `flagOverviewRedesign` flag import { Link } from 'react-router-dom'; import { Box, styled } from '@mui/material'; import useFeatureStrategyApi from 'hooks/api/actions/useFeatureStrategyApi/useFeatureStrategyApi'; diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/EnvironmentAccordionBody.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/EnvironmentAccordionBody.tsx index 459ae04cb8..abb24d5b36 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/EnvironmentAccordionBody.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/EnvironmentAccordionBody.tsx @@ -9,7 +9,6 @@ import useFeatureStrategyApi from 'hooks/api/actions/useFeatureStrategyApi/useFe import { formatUnknownError } from 'utils/formatUnknownError'; import useToast from 'hooks/useToast'; import type { IFeatureEnvironment } from 'interfaces/featureToggle'; -import { FeatureStrategyEmpty } from 'component/feature/FeatureStrategy/FeatureStrategyEmpty/FeatureStrategyEmpty'; import { useRequiredPathParam } from 'hooks/useRequiredPathParam'; import { useFeature } from 'hooks/api/getters/useFeature/useFeature'; import { useChangeRequestApi } from 'hooks/api/actions/useChangeRequestApi/useChangeRequestApi'; @@ -239,103 +238,85 @@ export const EnvironmentAccordionBody = ({ ); }; + const Strategies = () => { + return strategies.length < 50 || !manyStrategiesPagination ? ( + + {strategies.map((strategy, index) => ( + + {index > 0 ? : null} + + + + ))} + + ) : ( + + + We noticed you're using a high number of activation + strategies. To ensure a more targeted approach, consider + leveraging constraints or segments. + + + {page.map((strategy, index) => ( + + {index > 0 ? : null} + + + + ))} + + setPageIndex(page - 1)} + /> + + ); + }; + return (
- {releasePlans.length > 0 || strategies.length > 0 ? ( - - {releasePlans.map((plan) => ( - - - - ))} -
  • - {releasePlans.length > 0 ? ( - - ) : null} - {strategies.length < 50 || - !manyStrategiesPagination ? ( - - {strategies.map((strategy, index) => ( - - {index > 0 ? ( - - ) : null} - - - - ))} - - ) : ( - - - We noticed you're using a high number of - activation strategies. To ensure a more - targeted approach, consider leveraging - constraints or segments. - - - {page.map((strategy, index) => ( - - {index > 0 ? ( - - ) : null} - - - - ))} - - - setPageIndex(page - 1) - } + + {releasePlans.length > 0 ? ( + <> + {releasePlans.map((plan) => ( + + - - )} -
  • -
    - ) : ( - - )} + + ))} + {strategies.length > 0 ? ( +
  • + + +
  • + ) : null} + + ) : strategies.length > 0 ? ( + + ) : null} +
    );