diff --git a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.tsx b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.tsx index 30b2749457..0719215afb 100644 --- a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.tsx +++ b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.tsx @@ -31,7 +31,7 @@ export const ChangeRequestHeader: FC<{ changeRequest: IChangeRequest }> = ({ - + ({ diff --git a/frontend/src/component/changeRequest/ChangeRequestSidebar/EnvironmentChangeRequest/EnvironmentChangeRequest.tsx b/frontend/src/component/changeRequest/ChangeRequestSidebar/EnvironmentChangeRequest/EnvironmentChangeRequest.tsx index 186d6ffb56..9b05a68ec6 100644 --- a/frontend/src/component/changeRequest/ChangeRequestSidebar/EnvironmentChangeRequest/EnvironmentChangeRequest.tsx +++ b/frontend/src/component/changeRequest/ChangeRequestSidebar/EnvironmentChangeRequest/EnvironmentChangeRequest.tsx @@ -103,7 +103,7 @@ export const EnvironmentChangeRequest: FC<{ diff --git a/frontend/src/component/changeRequest/ChangeRequestStatusBadge/ChangeRequestStatusBadge.tsx b/frontend/src/component/changeRequest/ChangeRequestStatusBadge/ChangeRequestStatusBadge.tsx index 67e6bca332..3e24a05c81 100644 --- a/frontend/src/component/changeRequest/ChangeRequestStatusBadge/ChangeRequestStatusBadge.tsx +++ b/frontend/src/component/changeRequest/ChangeRequestStatusBadge/ChangeRequestStatusBadge.tsx @@ -1,10 +1,16 @@ import { VFC } from 'react'; -import { ChangeRequestState } from '../changeRequest.types'; +import { IChangeRequest } from '../changeRequest.types'; import { Badge } from 'component/common/Badge/Badge'; -import { AccessTime, Check, CircleOutlined, Close } from '@mui/icons-material'; +import { + AccessTime, + Check, + CircleOutlined, + Close, + Info, +} from '@mui/icons-material'; interface IChangeRequestStatusBadgeProps { - state: ChangeRequestState; + changeRequest: IChangeRequest | undefined; } const ReviewRequiredBadge: VFC = () => ( @@ -16,8 +22,12 @@ const ReviewRequiredBadge: VFC = () => ( const DraftBadge: VFC = () => Draft; export const ChangeRequestStatusBadge: VFC = ({ - state, + changeRequest, }) => { + if (!changeRequest) { + return null; + } + const { state } = changeRequest; switch (state) { case 'Draft': return ; @@ -47,12 +57,21 @@ export const ChangeRequestStatusBadge: VFC = ({ Rejected ); - case 'Scheduled': + case 'Scheduled': { + const { schedule } = changeRequest; + const color = schedule?.status === 'pending' ? 'warning' : 'error'; + const icon = + schedule?.status === 'pending' ? ( + + ) : ( + + ); return ( - }> + Scheduled ); + } default: return ; } diff --git a/frontend/src/component/changeRequest/ProjectChangeRequests/ChangeRequestsTabs/ChangeRequestStatusCell.tsx b/frontend/src/component/changeRequest/ProjectChangeRequests/ChangeRequestsTabs/ChangeRequestStatusCell.tsx index 8f6df82463..e23b9f7d3f 100644 --- a/frontend/src/component/changeRequest/ProjectChangeRequests/ChangeRequestsTabs/ChangeRequestStatusCell.tsx +++ b/frontend/src/component/changeRequest/ProjectChangeRequests/ChangeRequestsTabs/ChangeRequestStatusCell.tsx @@ -1,18 +1,23 @@ import { VFC } from 'react'; import { TextCell } from 'component/common/Table/cells/TextCell/TextCell'; -import { ChangeRequestState } from 'component/changeRequest/changeRequest.types'; +import { + ChangeRequestState, + IChangeRequest, +} from 'component/changeRequest/changeRequest.types'; import { ChangeRequestStatusBadge } from 'component/changeRequest/ChangeRequestStatusBadge/ChangeRequestStatusBadge'; interface IChangeRequestStatusCellProps { value?: string | null; // FIXME: proper type + row: { original: IChangeRequest }; } export const ChangeRequestStatusCell: VFC = ({ value, + row: { original }, }) => { const renderState = () => { if (!value) return null; - return ; + return ; }; if (!value) {