diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/FeatureChange.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/FeatureChange.tsx index d111f3218a..5aae905dc7 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/FeatureChange.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/FeatureChange.tsx @@ -66,6 +66,13 @@ const InlineList = styled('ul')(({ theme }) => ({ }, })); +const ChangeInnerBox = styled(Box)(({ theme }) => ({ + padding: theme.spacing(3), + '&:has(.delete-strategy-information-wrapper)': { + backgroundColor: theme.palette.error.light, + }, +})); + export const FeatureChange: FC<{ actions: ReactNode; index: number; @@ -134,7 +141,7 @@ export const FeatureChange: FC<{ } /> - ({ padding: theme.spacing(3) })}> + {(change.action === 'addDependency' || change.action === 'deleteDependency') && ( )} - + ); }; diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/StrategyChange.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/StrategyChange.tsx index 5fbfb1ffcc..34963b07e8 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/StrategyChange.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/StrategyChange.tsx @@ -25,7 +25,7 @@ export const ChangeItemWrapper = styled(Box)({ alignItems: 'center', }); -const ChangeItemCreateEditWrapper = styled(Box)(({ theme }) => ({ +const ChangeItemCreateEditDeleteWrapper = styled(Box)(({ theme }) => ({ display: 'grid', gridTemplateColumns: 'auto auto', justifyContent: 'space-between', @@ -142,7 +142,7 @@ export const StrategyChange: VFC<{ <> {change.action === 'addStrategy' && ( <> - +
{actions}
-
+ )} {change.action === 'deleteStrategy' && ( - - - ({ - color: theme.palette.error.main, - })} - > - - Deleting strategy: - - {hasNameField(change.payload) && ( - - - - )} - -
{actions}
-
+ <> + + + ({ + color: theme.palette.error.main, + })} + > + - Deleting strategy: + + {hasNameField(change.payload) && ( + + + + )} + +
{actions}
+
+ + { + + } + + } + /> + )} {change.action === 'updateStrategy' && ( <> @@ -214,7 +228,7 @@ export const StrategyChange: VFC<{ currentStrategy={currentStrategy} change={change} /> - +
{actions}
-
+ ({ width: '100%', display: 'flex', flexDirection: 'column', -}); + '&.constraint-list-element': { + borderRadius: theme.shape.borderRadiusMedium, + backgroundColor: theme.palette.background.default, + }, +})); const StyledHelpWrapper = styled(Tooltip)(({ theme }) => ({ marginLeft: theme.spacing(0.75), @@ -224,7 +228,10 @@ export const ConstraintList = forwardRef< } return ( - + {constraints.map((constraint, index) => ( prop !== 'isDisabled', })<{ isDisabled: boolean | null }>(({ theme, isDisabled }) => ({ border: `1px solid ${theme.palette.divider}`, - borderRadius: theme.shape.borderRadiusMedium, + '&.segment-accordion': { + borderRadius: theme.shape.borderRadiusMedium, + }, boxShadow: 'none', margin: 0, transition: 'all 0.1s ease', @@ -70,7 +72,7 @@ export const SegmentItem: VFC = ({ const [isOpen, setIsOpen] = useState(isExpanded || false); return ( - + ({ diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/StrategyDraggableItem/StrategyItem/StrategyExecution/ConstraintItem/ConstraintItem.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/StrategyDraggableItem/StrategyItem/StrategyExecution/ConstraintItem/ConstraintItem.tsx index 642499e9c2..91680bc098 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/StrategyDraggableItem/StrategyItem/StrategyExecution/ConstraintItem/ConstraintItem.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/StrategyDraggableItem/StrategyItem/StrategyExecution/ConstraintItem/ConstraintItem.tsx @@ -11,6 +11,7 @@ const StyledContainer = styled('div')(({ theme }) => ({ width: '100%', padding: theme.spacing(2, 3), borderRadius: theme.shape.borderRadiusMedium, + background: theme.palette.background.default, border: `1px solid ${theme.palette.divider}`, })); diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/StrategyDraggableItem/StrategyItem/StrategyExecution/StrategyExecution.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/StrategyDraggableItem/StrategyItem/StrategyExecution/StrategyExecution.tsx index 80571b75a5..e28bbd0e67 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/StrategyDraggableItem/StrategyItem/StrategyExecution/StrategyExecution.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/StrategyDraggableItem/StrategyItem/StrategyExecution/StrategyExecution.tsx @@ -51,6 +51,7 @@ const StyledValueContainer = styled(Box)(({ theme }) => ({ padding: theme.spacing(2, 3), border: `1px solid ${theme.palette.divider}`, borderRadius: theme.shape.borderRadiusMedium, + background: theme.palette.background.default, })); const StyledValueSeparator = styled('span')(({ theme }) => ({