diff --git a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestRequestedApprovers/ChangeRequestRequestedApprovers.tsx b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestRequestedApprovers/ChangeRequestRequestedApprovers.tsx index b67a14a52c..36b8623dc6 100644 --- a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestRequestedApprovers/ChangeRequestRequestedApprovers.tsx +++ b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestRequestedApprovers/ChangeRequestRequestedApprovers.tsx @@ -350,31 +350,21 @@ export const ChangeRequestRequestedApprovers: FC<{ saveClicked={saveClicked} /> )} - {reviewers.map((reviewer) => ( - <> - {reviewer.status === 'approved' && ( - - )} - {reviewer.status === 'rejected' && ( - - )} - {reviewer.status === 'pending' && ( - - )} - - ))} + {reviewers.map((reviewer) => { + const key = reviewer.id; + const props = { + name: reviewer.name || 'Unknown user', + imageUrl: reviewer.imageUrl, + }; + switch (reviewer.status) { + case 'approved': + return ; + case 'rejected': + return ; + case 'pending': + return ; + } + })} ); }; diff --git a/frontend/src/component/impact-metrics/ChartConfigModal.tsx b/frontend/src/component/impact-metrics/ChartConfigModal/ChartConfigModal.tsx similarity index 71% rename from frontend/src/component/impact-metrics/ChartConfigModal.tsx rename to frontend/src/component/impact-metrics/ChartConfigModal/ChartConfigModal.tsx index 1e8202e118..04624c60ff 100644 --- a/frontend/src/component/impact-metrics/ChartConfigModal.tsx +++ b/frontend/src/component/impact-metrics/ChartConfigModal/ChartConfigModal.tsx @@ -8,12 +8,16 @@ import { TextField, Box, styled, + useTheme, + useMediaQuery, + Divider, } from '@mui/material'; import { ImpactMetricsControls } from './ImpactMetricsControls/ImpactMetricsControls.tsx'; -import { ImpactMetricsChartPreview } from './ImpactMetricsChartPreview.tsx'; -import { useChartFormState } from './hooks/useChartFormState.ts'; -import type { ChartConfig } from './types.ts'; +import { useChartFormState } from '../hooks/useChartFormState.ts'; +import type { ChartConfig } from '../types.ts'; import type { ImpactMetricsSeries } from 'hooks/api/getters/useImpactMetricsMetadata/useImpactMetricsMetadata'; +import { LabelsFilter } from './LabelFilter/LabelsFilter.tsx'; +import { ImpactMetricsChart } from '../ImpactMetricsChart.tsx'; export const StyledConfigPanel = styled(Box)(({ theme }) => ({ display: 'flex', @@ -62,6 +66,8 @@ export const ChartConfigModal: FC = ({ open, initialConfig, }); + const theme = useTheme(); + const screenBreakpoint = useMediaQuery(theme.breakpoints.down('lg')); const handleSave = () => { if (!isValid) return; @@ -111,21 +117,33 @@ export const ChartConfigModal: FC = ({ actions={actions} metricSeries={metricSeries} loading={loading} - availableLabels={currentAvailableLabels} /> - + ({ padding: theme.spacing(1) })}> + + + + {currentAvailableLabels ? ( + + ) : null} - + + ({ margin: theme.spacing(2, 3, 3) })}>