diff --git a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.styles.tsx b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.styles.tsx index e4c98c65f7..1ade47cc4d 100644 --- a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.styles.tsx +++ b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.styles.tsx @@ -25,7 +25,7 @@ export const StyledHeader = styled(Typography)(({ theme }) => ({ })); export const StyledCard = styled(Card)(({ theme }) => ({ - padding: theme.spacing(0.5, 1), + padding: theme.spacing(0.75, 1.5), backgroundColor: theme.palette.tertiary.light, })); diff --git a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.tsx b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.tsx index 9aee1d6be9..ee3b1ed2cd 100644 --- a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.tsx +++ b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.tsx @@ -41,9 +41,9 @@ export const ChangeRequestHeader: FC<{ changeRequest: IChangeRequest }> = ({ /> - + ({ marginLeft: theme.spacing(1.5) })}> - + Environment:{' '} ({ })); const StyledButtonBox = styled(Box)(({ theme }) => ({ - marginTop: theme.spacing(2), + marginTop: theme.spacing(3), display: 'flex', justifyContent: 'flex-end', })); @@ -157,7 +160,14 @@ export const ChangeRequestOverview: FC = () => { - + + } + > {changeRequest.approvals?.map(approver => ( { imageUrl={approver.createdBy.imageUrl} /> ))} - {' '} + diff --git a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestReviewers/ChangeRequestReviewers.tsx b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestReviewers/ChangeRequestReviewers.tsx index 84b939096b..e7477aff7a 100644 --- a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestReviewers/ChangeRequestReviewers.tsx +++ b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestReviewers/ChangeRequestReviewers.tsx @@ -1,12 +1,29 @@ import { Box, Paper, styled, Typography } from '@mui/material'; -import React, { FC } from 'react'; +import React, { FC, ReactNode } from 'react'; import { ConditionallyRender } from '../../../common/ConditionallyRender/ConditionallyRender'; const StyledBox = styled(Box)(({ theme }) => ({ marginBottom: theme.spacing(2), })); -export const ChangeRequestReviewers: FC = ({ children }) => { +export const ChangeRequestReviewersHeader: FC<{ + actualApprovals: number; + minApprovals: number; +}> = ({ actualApprovals, minApprovals }) => { + return ( + <> + Reviewers{' '} + + ({actualApprovals}/{minApprovals} required) + + + ); +}; + +export const ChangeRequestReviewers: FC<{ header: ReactNode }> = ({ + header, + children, +}) => { return ( { borderRadius: theme => `${theme.shape.borderRadiusLarge}px`, })} > - Reviewers + {header} 0} diff --git a/frontend/src/component/changeRequest/ChangeRequestSidebar/ChangeRequestSidebar.tsx b/frontend/src/component/changeRequest/ChangeRequestSidebar/ChangeRequestSidebar.tsx index 4fb733c85b..e4dc1bd26d 100644 --- a/frontend/src/component/changeRequest/ChangeRequestSidebar/ChangeRequestSidebar.tsx +++ b/frontend/src/component/changeRequest/ChangeRequestSidebar/ChangeRequestSidebar.tsx @@ -47,8 +47,7 @@ export const StyledSuccessIcon = styled(CheckCircle)(({ theme }) => ({ marginRight: theme.spacing(1), })); -export const StyledFlexAlignCenterBox = styled(Box)(({ theme }) => ({ - paddingTop: theme.spacing(3), +export const StyledFlexAlignCenterBox = styled(Box)(() => ({ marginLeft: 'auto', display: 'flex', alignItems: 'center', @@ -143,7 +142,7 @@ export const ChangeRequestSidebar: VFC = ({ > } + header={} > {data?.map(environmentChangeRequest => ( void; count: number }> = ({ onClick, count, }) => ( - ); @@ -74,7 +74,7 @@ export const EnvironmentChangeRequest: FC<{ You request changes for these feature toggles: {children} - +