diff --git a/frontend/src/component/common/LifecycleFilters/LifecycleFilters.tsx b/frontend/src/component/common/LifecycleFilters/LifecycleFilters.tsx index 6ce070168d..ec9c911407 100644 --- a/frontend/src/component/common/LifecycleFilters/LifecycleFilters.tsx +++ b/frontend/src/component/common/LifecycleFilters/LifecycleFilters.tsx @@ -64,12 +64,11 @@ export const LifecycleFilters = ({ total, children, countData, - sx, }: ILifecycleFiltersBaseProps) => { const current = state.lifecycle?.values ?? []; return ( - + {lifecycleOptions.map(({ label, value }) => { const isActive = diff --git a/frontend/src/component/feature/FeatureToggleList/FeatureToggleFilters/FeatureLifecycleFilters.tsx b/frontend/src/component/feature/FeatureToggleList/FeatureToggleFilters/FeatureLifecycleFilters.tsx index 299490ae54..3c59374a29 100644 --- a/frontend/src/component/feature/FeatureToggleList/FeatureToggleFilters/FeatureLifecycleFilters.tsx +++ b/frontend/src/component/feature/FeatureToggleList/FeatureToggleFilters/FeatureLifecycleFilters.tsx @@ -1,31 +1,9 @@ import type { FC, ReactNode } from 'react'; +import { Box } from '@mui/material'; import type { FilterItemParamHolder } from '../../../filter/Filters/Filters.tsx'; -import type { LifecycleStage } from '../../FeatureView/FeatureOverview/FeatureLifecycle/LifecycleStage.tsx'; import { useLifecycleCount } from 'hooks/api/getters/useLifecycleCount/useLifecycleCount'; -import type { FeatureLifecycleCountSchema } from 'openapi'; import { LifecycleFilters } from '../../../common/LifecycleFilters/LifecycleFilters.tsx'; -const getStageCount = ( - lifecycle: LifecycleStage['name'] | null, - lifecycleCount?: FeatureLifecycleCountSchema, -) => { - if (!lifecycleCount) { - return undefined; - } - - if (lifecycle === null) { - return ( - (lifecycleCount.initial || 0) + - (lifecycleCount.preLive || 0) + - (lifecycleCount.live || 0) + - (lifecycleCount.completed || 0) - ); - } - - const key = lifecycle === 'pre-live' ? 'preLive' : lifecycle; - return lifecycleCount[key]; -}; - interface ILifecycleFiltersProps { state: FilterItemParamHolder; onChange: (value: FilterItemParamHolder) => void; @@ -49,17 +27,15 @@ export const FeatureLifecycleFilters: FC = ({ ); return ( - - `${theme.spacing(1.5)} ${theme.spacing(3)} 0 ${theme.spacing(3)}`, - }} - > - {children} - + ({ padding: theme.spacing(1.5, 3, 0, 3) })}> + + {children} + + ); };