1
0
mirror of https://github.com/Unleash/unleash.git synced 2025-08-04 13:48:56 +02:00

Chore(1-3882)/add diff border (#10244)

Adds a border around all the JSON diffs panels to align better with the
sketches and to mesh better with the existing change cards in CRs.

<img width="1051" alt="image"
src="https://github.com/user-attachments/assets/b4e81c34-630b-436b-8de2-9e6e6893b3fb"
/>
This commit is contained in:
Thomas Heartman 2025-06-30 14:17:49 +02:00 committed by GitHub
parent f18509665d
commit 88514077f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 37 additions and 20 deletions

View File

@ -51,4 +51,14 @@ export const Tabs = ({ children }: PropsWithChildren) => (
</MuiTabs> </MuiTabs>
); );
export const TabPanel = MuiTabPanel; export const TabPanel = styled(MuiTabPanel, {
shouldForwardProp: (prop) => prop !== 'variant',
})<{ variant?: 'diff' | 'change' }>(({ theme, variant }) =>
variant === 'diff'
? {
padding: theme.spacing(2),
borderRadius: theme.shape.borderRadiusLarge,
border: `1px solid ${theme.palette.divider}`,
}
: {},
);

View File

@ -114,7 +114,7 @@ export const EnvironmentStrategyExecutionOrder = ({
))} ))}
</StyledStrategyExecutionWrapper> </StyledStrategyExecutionWrapper>
</TabPanel> </TabPanel>
<TabPanel> <TabPanel variant='diff'>
<EnvironmentStrategyOrderDiff <EnvironmentStrategyOrderDiff
preData={preData} preData={preData}
data={data} data={data}

View File

@ -1,5 +1,7 @@
import { styled } from '@mui/material'; import { styled } from '@mui/material';
import { EventDiff } from 'component/events/EventDiff/EventDiff'; import { EventDiff } from 'component/events/EventDiff/EventDiff';
import { useUiFlag } from 'hooks/useUiFlag';
import { Fragment } from 'react';
const StyledCodeSection = styled('div')(({ theme }) => ({ const StyledCodeSection = styled('div')(({ theme }) => ({
overflowX: 'auto', overflowX: 'auto',
@ -17,8 +19,12 @@ interface IDiffProps {
data: StrategyIds; data: StrategyIds;
} }
export const EnvironmentStrategyOrderDiff = ({ preData, data }: IDiffProps) => ( export const EnvironmentStrategyOrderDiff = ({ preData, data }: IDiffProps) => {
<StyledCodeSection> const useNewDiff = useUiFlag('improvedJsonDiff');
const Wrapper = useNewDiff ? Fragment : StyledCodeSection;
return (
<Wrapper>
<EventDiff <EventDiff
entry={{ entry={{
preData: preData.strategyIds, preData: preData.strategyIds,
@ -26,5 +32,6 @@ export const EnvironmentStrategyOrderDiff = ({ preData, data }: IDiffProps) => (
}} }}
sort={(a, b) => a.index - b.index} sort={(a, b) => a.index - b.index}
/> />
</StyledCodeSection> </Wrapper>
); );
};

View File

@ -131,7 +131,7 @@ const StartMilestone: FC<{
<TabPanel> <TabPanel>
<ReleasePlanMilestone readonly milestone={newMilestone} /> <ReleasePlanMilestone readonly milestone={newMilestone} />
</TabPanel> </TabPanel>
<TabPanel> <TabPanel variant='diff'>
<EventDiff <EventDiff
entry={{ entry={{
preData: previousMilestone, preData: previousMilestone,
@ -245,7 +245,7 @@ const AddReleasePlan: FC<{
<TabPanel> <TabPanel>
<ReleasePlan plan={planPreview} readonly /> <ReleasePlan plan={planPreview} readonly />
</TabPanel> </TabPanel>
<TabPanel> <TabPanel variant='diff'>
<EventDiff <EventDiff
entry={{ entry={{
preData: currentReleasePlan, preData: currentReleasePlan,

View File

@ -105,7 +105,7 @@ export const SegmentChangeDetails: FC<{
</ChangeItemWrapper> </ChangeItemWrapper>
<TabPanel /> <TabPanel />
<TabPanel> <TabPanel sx={{ mt: 1 }} variant='diff'>
<SegmentDiff <SegmentDiff
change={change} change={change}
currentSegment={referenceSegment} currentSegment={referenceSegment}
@ -141,7 +141,7 @@ export const SegmentChangeDetails: FC<{
constraints={change.payload.constraints} constraints={change.payload.constraints}
/> />
</TabPanel> </TabPanel>
<TabPanel> <TabPanel variant='diff'>
<SegmentDiff <SegmentDiff
change={change} change={change}
currentSegment={referenceSegment} currentSegment={referenceSegment}

View File

@ -164,7 +164,7 @@ const DeleteStrategy: FC<{
<StrategyExecution strategy={referenceStrategy} /> <StrategyExecution strategy={referenceStrategy} />
)} )}
</TabPanel> </TabPanel>
<TabPanel> <TabPanel variant='diff'>
<StrategyDiff <StrategyDiff
change={change} change={change}
currentStrategy={referenceStrategy} currentStrategy={referenceStrategy}
@ -266,7 +266,7 @@ const UpdateStrategy: FC<{
</StyledBox> </StyledBox>
) : null} ) : null}
</TabPanel> </TabPanel>
<TabPanel> <TabPanel variant='diff'>
<StrategyDiff <StrategyDiff
change={change} change={change}
currentStrategy={referenceStrategy} currentStrategy={referenceStrategy}
@ -320,7 +320,7 @@ const AddStrategy: FC<{
</StyledBox> </StyledBox>
) : null} ) : null}
</TabPanel> </TabPanel>
<TabPanel> <TabPanel variant='diff'>
<StrategyDiff change={change} currentStrategy={undefined} /> <StrategyDiff change={change} currentStrategy={undefined} />
</TabPanel> </TabPanel>
</> </>