diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/Change.styles.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/Change.styles.tsx index 4069f7b6a6..86d9ccada5 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/Change.styles.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/Change.styles.tsx @@ -2,7 +2,7 @@ import { styled, Typography, type TypographyProps } from '@mui/material'; import type { FC, PropsWithChildren } from 'react'; export const Action: FC = ({ children, ...props }) => ( - + {children} ); diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/FeatureChange.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/FeatureChange.tsx index 0a78a7252d..5b7ca6fe40 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/FeatureChange.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/FeatureChange.tsx @@ -7,7 +7,10 @@ import type { import { objectId } from 'utils/objectId'; import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; import { Alert, Box, styled } from '@mui/material'; -import { ToggleStatusChange } from './ToggleStatusChange.tsx'; +import { + LegacyToggleStatusChange, + ToggleStatusChange, +} from './ToggleStatusChange.tsx'; import { LegacyStrategyChange } from './LegacyStrategyChange.tsx'; import { VariantPatch } from './VariantPatch/VariantPatch.tsx'; import { EnvironmentStrategyExecutionOrder } from './EnvironmentStrategyExecutionOrder/EnvironmentStrategyExecutionOrder.tsx'; @@ -114,6 +117,10 @@ export const FeatureChange: FC<{ ? DependencyChange : LegacyDependencyChange; + const StatusChangeComponent = useDiffableChangeComponent + ? ToggleStatusChange + : LegacyToggleStatusChange; + return ( )} {change.action === 'updateEnabled' && ( - diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ToggleStatusChange.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ToggleStatusChange.tsx index 4d4d595ba0..c49ad4831b 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ToggleStatusChange.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ToggleStatusChange.tsx @@ -1,12 +1,37 @@ import type { FC, ReactNode } from 'react'; +import { Box } from '@mui/material'; import { Badge } from 'component/common/Badge/Badge'; -import { ChangeItemInfo, ChangeItemWrapper } from './Change.styles'; +import { ChangeItemWrapper as LegacyChangeItemWrapper } from './LegacyStrategyChange.tsx'; +import { Action, ChangeItemInfo, ChangeItemWrapper } from './Change.styles'; interface IToggleStatusChange { enabled: boolean; actions?: ReactNode; } +/** + * @deprecated use ToggleStatusChange instead; remove with flag crDiffView + */ +export const LegacyToggleStatusChange: FC = ({ + enabled, + actions, +}) => { + return ( + + + New status + ({ marginLeft: theme.spacing(1) })} + color={enabled ? 'success' : 'error'} + > + {enabled ? ' Enabled' : 'Disabled'} + + + {actions} + + ); +}; + export const ToggleStatusChange: FC = ({ enabled, actions, @@ -14,7 +39,7 @@ export const ToggleStatusChange: FC = ({ return ( - New status + New status {enabled ? ' Enabled' : 'Disabled'}