From edbd25fd5f30960929475091a7e93d34be52b465 Mon Sep 17 00:00:00 2001 From: Thomas Heartman Date: Wed, 2 Jul 2025 11:46:45 +0200 Subject: [PATCH] get rid of p > p errors --- .../Changes/Change/ArchiveFeatureChange.tsx | 4 ++-- .../Changes/Change/Change.styles.tsx | 8 ++++--- .../Changes/Change/ChangeSegmentName.tsx | 14 +------------ .../EnvironmentStrategyExecutionOrder.tsx | 2 +- .../NameWithChangeInfo/NameWithChangeInfo.tsx | 4 ++-- .../Changes/Change/ReleasePlanChange.tsx | 19 ++++++++++------- .../Changes/Change/SegmentChangeDetails.tsx | 5 ++++- .../Changes/Change/StrategyChange.tsx | 21 +++++++++++++++---- 8 files changed, 44 insertions(+), 33 deletions(-) diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ArchiveFeatureChange.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ArchiveFeatureChange.tsx index 76fb8428e1..f52d87d881 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ArchiveFeatureChange.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ArchiveFeatureChange.tsx @@ -1,8 +1,8 @@ import type { FC, ReactNode } from 'react'; -import { Box, styled } from '@mui/material'; +import { styled } from '@mui/material'; import { ChangeItemInfo, ChangeItemWrapper } from './Change.styles.tsx'; -const ArchiveBox = styled(Box)(({ theme }) => ({ +const ArchiveBox = styled('span')(({ theme }) => ({ display: 'flex', alignItems: 'center', color: theme.palette.error.main, diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/Change.styles.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/Change.styles.tsx index 722c53e42e..7ba979b1bd 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/Change.styles.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/Change.styles.tsx @@ -1,9 +1,11 @@ import { styled, Typography } from '@mui/material'; import type { PropsWithChildren } from 'react'; -const Action = styled(Typography)(({ theme }) => ({ - whiteSpace: 'nowrap', -})); +export const Action = styled(({ children, ...props }: PropsWithChildren) => ( + + {children} + +))(({ theme }) => ({})); export const Deleted = styled(Action)(({ theme }) => ({ color: theme.palette.error.main, diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ChangeSegmentName.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ChangeSegmentName.tsx index f039f8803e..863684ae27 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ChangeSegmentName.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ChangeSegmentName.tsx @@ -1,6 +1,4 @@ import type { FC } from 'react'; -import { styled } from '@mui/material'; -import { textTruncated } from 'themes/themeStyles'; import { NameWithChangeInfo } from './NameWithChangeInfo/NameWithChangeInfo.tsx'; type ChangeSegmentNameProps = { @@ -8,17 +6,7 @@ type ChangeSegmentNameProps = { previousName?: string; }; -const Truncated = styled('div')(() => ({ - ...textTruncated, - maxWidth: 500, - display: 'flex', -})); - export const ChangeSegmentName: FC = ({ name, previousName, -}) => ( - - - -); +}) => ; diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/EnvironmentStrategyExecutionOrder/EnvironmentStrategyExecutionOrder.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/EnvironmentStrategyExecutionOrder/EnvironmentStrategyExecutionOrder.tsx index 141e0e68cc..62034c66d9 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/EnvironmentStrategyExecutionOrder/EnvironmentStrategyExecutionOrder.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/EnvironmentStrategyExecutionOrder/EnvironmentStrategyExecutionOrder.tsx @@ -96,7 +96,7 @@ export const EnvironmentStrategyExecutionOrder = ({ -

Updating strategy execution order to

+ Updating strategy execution order to
diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/NameWithChangeInfo/NameWithChangeInfo.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/NameWithChangeInfo/NameWithChangeInfo.tsx index 963418031d..538e0d433f 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/NameWithChangeInfo/NameWithChangeInfo.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/NameWithChangeInfo/NameWithChangeInfo.tsx @@ -3,7 +3,7 @@ import { Typography, styled } from '@mui/material'; import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; import { textTruncated } from 'themes/themeStyles'; -const Truncated = styled('div')(() => ({ +const Truncated = styled('span')(() => ({ ...textTruncated, maxWidth: 500, })); @@ -30,7 +30,7 @@ export const NameWithChangeInfo: FC<{ condition={Boolean(newName)} show={ - {newName} + {newName} } /> diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ReleasePlanChange.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ReleasePlanChange.tsx index 279f243f9b..d382fbda1e 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ReleasePlanChange.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ReleasePlanChange.tsx @@ -47,10 +47,11 @@ const DeleteReleasePlan: FC<{ sx={(theme) => ({ color: theme.palette.error.main, })} + component='span' > - Deleting release plan - {releasePlan.name} + {releasePlan.name} {actions} @@ -86,10 +87,12 @@ const StartMilestone: FC<{ - + + Start milestone - {newMilestone.name} + + {newMilestone.name} +
@@ -158,10 +161,12 @@ const AddReleasePlan: FC<{ <> - + + Adding release plan - {planPreview.name} + + {planPreview.name} + {actions} @@ -174,7 +179,7 @@ const AddReleasePlan: FC<{ - + Replacing{' '} {' '} release plan with - {planPreview.name} + {planPreview.name}
diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/SegmentChangeDetails.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/SegmentChangeDetails.tsx index f2e717b891..0c9d98e062 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/SegmentChangeDetails.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/SegmentChangeDetails.tsx @@ -77,6 +77,7 @@ export const SegmentChangeDetails: FC<{ ({ color: theme.palette.error.main, })} @@ -112,7 +113,9 @@ export const SegmentChangeDetails: FC<{ /> - Editing segment + + Editing segment + {actionsWithTabs} diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/StrategyChange.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/StrategyChange.tsx index 5386fec308..9df84629c5 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/StrategyChange.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/StrategyChange.tsx @@ -84,18 +84,30 @@ const EditHeader: FC<{ willBeDisabled?: boolean; }> = ({ wasDisabled = false, willBeDisabled = false }) => { if (wasDisabled && willBeDisabled) { - return Editing strategy; + return ( + + Editing strategy + + ); } if (!wasDisabled && willBeDisabled) { - return Editing strategy; + return ( + + Editing strategy + + ); } if (wasDisabled && !willBeDisabled) { - return Editing strategy; + return ( + + Editing strategy + + ); } - return Editing strategy; + return Editing strategy; }; const hasDiff = (object: unknown, objectToCompare: unknown) => @@ -125,6 +137,7 @@ const DeleteStrategy: FC<{ ({ color: theme.palette.error.main, })}