diff --git a/frontend/src/component/project/Project/ProjectStatus/ProjectLifecycleSummary.tsx b/frontend/src/component/project/Project/ProjectStatus/ProjectLifecycleSummary.tsx index 3a2b9142ac..ecf58ea9b1 100644 --- a/frontend/src/component/project/Project/ProjectStatus/ProjectLifecycleSummary.tsx +++ b/frontend/src/component/project/Project/ProjectStatus/ProjectLifecycleSummary.tsx @@ -5,12 +5,12 @@ import useLoading from 'hooks/useLoading'; import { useRequiredPathParam } from 'hooks/useRequiredPathParam'; import type { FC } from 'react'; import { PrettifyLargeNumber } from 'component/common/PrettifyLargeNumber/PrettifyLargeNumber'; +import type { ProjectStatusSchemaLifecycleSummary } from 'openapi'; const LifecycleBox = styled('li')(({ theme }) => ({ padding: theme.spacing(2), borderRadius: theme.shape.borderRadiusExtraLarge, border: `2px solid ${theme.palette.divider}`, - width: '180px', - height: '175px', + gap: theme.spacing(4), display: 'flex', flexFlow: 'column', justifyContent: 'space-between', @@ -19,9 +19,10 @@ const LifecycleBox = styled('li')(({ theme }) => ({ const Wrapper = styled('ul')(({ theme }) => ({ display: 'grid', listStyle: 'none', - gridTemplateColumns: 'repeat(auto-fit, 180px)', + gridTemplateColumns: 'repeat(auto-fit, minmax(180px, 1fr))', gap: theme.spacing(1), justifyContent: 'center', + padding: 0, })); const Counter = styled('span')({ @@ -90,6 +91,13 @@ export const ProjectLifecycleSummary = () => { loading, '[data-loading-project-lifecycle-summary=true]', ); + const flagWord = (stage: keyof ProjectStatusSchemaLifecycleSummary) => { + if (data?.lifecycleSummary[stage].currentFlags === 1) { + return 'flag'; + } else { + return 'flags'; + } + }; return ( @@ -104,7 +112,7 @@ export const ProjectLifecycleSummary = () => { stage={{ name: 'initial' }} /> - flags in initial + {flagWord('initial')} in initial

{ stage={{ name: 'pre-live' }} /> - flags in pre-live + {flagWord('preLive')} in pre-live

{ stage={{ name: 'live' }} /> - flags in live + {flagWord('live')} in live

{ stage={{ name: 'completed' }} /> - flags in cleanup + {flagWord('completed')} in cleanup

{ stage={{ name: 'archived' }} /> - flags in archived + {flagWord('archived')} in archived

This month
diff --git a/frontend/src/component/project/Project/ProjectStatus/ProjectStatusModal.tsx b/frontend/src/component/project/Project/ProjectStatus/ProjectStatusModal.tsx index 8357c70350..98ca5917ef 100644 --- a/frontend/src/component/project/Project/ProjectStatus/ProjectStatusModal.tsx +++ b/frontend/src/component/project/Project/ProjectStatus/ProjectStatusModal.tsx @@ -1,5 +1,5 @@ import { styled } from '@mui/material'; -import { SidebarModal } from 'component/common/SidebarModal/SidebarModal'; +import { DynamicSidebarModal } from 'component/common/SidebarModal/SidebarModal'; import { ProjectResources } from './ProjectResources'; import { ProjectActivity } from './ProjectActivity'; import { ProjectHealth } from './ProjectHealth'; @@ -34,7 +34,7 @@ const HealthRow = styled('div')(({ theme }) => ({ export const ProjectStatusModal = ({ open, close }: Props) => { return ( - + @@ -45,6 +45,6 @@ export const ProjectStatusModal = ({ open, close }: Props) => { - + ); };