From 580a9e6a96c5f878cd0dc11a97718c62c5eba7c5 Mon Sep 17 00:00:00 2001 From: Thomas Heartman Date: Fri, 20 Jun 2025 10:56:30 +0200 Subject: [PATCH] include segment names on deleted segments too --- .../Changes/Change/SegmentChange.tsx | 103 ++++++++++-------- 1 file changed, 55 insertions(+), 48 deletions(-) diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/SegmentChange.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/SegmentChange.tsx index fadd3b334f..bf03e069d8 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/SegmentChange.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/SegmentChange.tsx @@ -7,6 +7,7 @@ import type { } from '../../../changeRequest.types'; import { SegmentChangeDetails } from './SegmentChangeDetails.tsx'; import { ConflictWarning } from './ConflictWarning.tsx'; +import { useSegment } from 'hooks/api/getters/useSegment/useSegment.ts'; interface ISegmentChangeProps { segmentChange: ISegmentChange; @@ -20,61 +21,67 @@ export const SegmentChange: FC = ({ onNavigate, actions, changeRequestState, -}) => ( - ({ - marginTop: theme.spacing(2), - marginBottom: theme.spacing(2), - overflow: 'hidden', - })} - > - { + const { segment } = useSegment(segmentChange.payload.id); + + return ( + ({ - backgroundColor: theme.palette.neutral.light, - borderRadius: (theme) => - `${theme.shape.borderRadiusLarge}px ${theme.shape.borderRadiusLarge}px 0 0`, - border: '1px solid', - borderColor: (theme) => - segmentChange.conflict - ? theme.palette.warning.border - : theme.palette.divider, - borderBottom: 'none', + marginTop: theme.spacing(2), + marginBottom: theme.spacing(2), overflow: 'hidden', })} > - ({ + backgroundColor: theme.palette.neutral.light, + borderRadius: (theme) => + `${theme.shape.borderRadiusLarge}px ${theme.shape.borderRadiusLarge}px 0 0`, + border: '1px solid', + borderColor: (theme) => + segmentChange.conflict + ? theme.palette.warning.border + : theme.palette.divider, + borderBottom: 'none', + overflow: 'hidden', + })} > - Segment name: - - + - {segmentChange.payload.name} - + Segment name: + + + + {segmentChange.payload.name || segment?.name} + + + - - - -); + + + ); +};