Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add beta badge to event timeline in new in unleash #8377

Merged
merged 3 commits into from
Oct 7, 2024
Merged

chore: add beta badge to event timeline in new in unleash #8377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62e8cf4
chore: add beta badge to event timeline in new in unleash
nunogois Oct 7, 2024
496638c
fix: badge on the right side of the title
nunogois Oct 7, 2024
68b5c32
fix: badge on the right of tooltip title
nunogois Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions frontend/src/component/layout/MainLayout/NavigationSidebar/NewInUnleash/NewInUnleash.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ type NewItem = {
show: boolean;
longDescription: ReactNode;
preview?: ReactNode;
beta?: boolean;
};

interface INewInUnleashProps {
Expand Down Expand Up @@ -174,6 +175,7 @@ export const NewInUnleash = ({
</p>
</>
),
beta: true,
},
];

Expand Down Expand Up @@ -218,6 +220,7 @@ export const NewInUnleash = ({
docsLink,
preview,
summary,
beta = false,
}) => (
<NewInUnleashItem
key={label}
Expand All @@ -243,6 +246,7 @@ export const NewInUnleash = ({
longDescription={longDescription}
docsLink={docsLink}
summary={summary}
beta={beta}
/>
),
)}
Expand Down
23 changes: 20 additions & 3 deletions frontend/src/component/layout/MainLayout/NavigationSidebar/NewInUnleash/NewInUnleashItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import {
} from '@mui/material';
import Close from '@mui/icons-material/Close';
import { NewInUnleashTooltip } from './NewInUnleashTooltip';
import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
import { Badge } from 'component/common/Badge/Badge';

const StyledItemButton = styled(ListItemButton)(({ theme }) => ({
outline: `1px solid ${theme.palette.divider}`,
Expand All @@ -26,6 +28,12 @@ const LabelWithSummary = styled('div')(({ theme }) => ({
flex: 1,
}));

const StyledItemTitle = styled('div')(({ theme }) => ({
display: 'flex',
gap: theme.spacing(1),
alignItems: 'center',
}));

const StyledItemButtonClose = styled(IconButton)(({ theme }) => ({
padding: theme.spacing(0.25),
}));
Expand All @@ -40,6 +48,7 @@ interface INewInUnleashItemProps {
docsLink: string;
preview?: ReactNode;
summary: string;
beta: boolean;
}

const useTooltip = () => {
Expand All @@ -66,6 +75,7 @@ export const NewInUnleashItem = ({
docsLink,
preview,
summary,
beta,
}: INewInUnleashItemProps) => {
const { open, handleTooltipOpen, handleTooltipClose } = useTooltip();

Expand All @@ -90,13 +100,20 @@ export const NewInUnleashItem = ({
onCheckItOut={onCheckItOut}
docsLink={docsLink}
preview={preview}
beta={beta}
>
<StyledItemButton>
{icon}
<LabelWithSummary>
<Typography fontWeight='bold' fontSize='small'>
{label}
</Typography>
<StyledItemTitle>
<Typography fontWeight='bold' fontSize='small'>
{label}
</Typography>
<ConditionallyRender
condition={beta}
show={<Badge color='secondary'>Beta</Badge>}
/>
</StyledItemTitle>
<Typography fontSize='small'>{summary}</Typography>
</LabelWithSummary>
<Tooltip title='Dismiss' arrow sx={{ marginLeft: 'auto' }}>
Expand Down
17 changes: 15 additions & 2 deletions ...nd/src/component/layout/MainLayout/NavigationSidebar/NewInUnleash/NewInUnleashTooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import {
import type { Link as RouterLink } from 'react-router-dom';
import OpenInNew from '@mui/icons-material/OpenInNew';
import { ReactComponent as UnleashLogo } from 'assets/img/logoWithWhiteText.svg';
import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
import { Badge } from 'component/common/Badge/Badge';

const Header = styled(Box)(({ theme }) => ({
backgroundColor: theme.palette.primary.light,
Expand Down Expand Up @@ -67,7 +69,10 @@ const LongDescription = styled(Box)(({ theme }) => ({
},
}));

const Title = styled(Typography)(({ theme }) => ({
const StyledTitle = styled('div')(({ theme }) => ({
display: 'flex',
gap: theme.spacing(1),
alignItems: 'center',
padding: theme.spacing(1, 0, 2, 0),
lineHeight: 1.5,
}));
Expand All @@ -85,6 +90,7 @@ export const NewInUnleashTooltip: FC<{
open: boolean;
preview?: ReactNode;
onClose: () => void;
beta: boolean;
}> = ({
children,
title,
Expand All @@ -94,6 +100,7 @@ export const NewInUnleashTooltip: FC<{
preview,
open,
onClose,
beta,
}) => (
<HtmlTooltip
disableFocusListener
Expand All @@ -119,7 +126,13 @@ export const NewInUnleashTooltip: FC<{
)}
</Header>
<Body>
<Title>{title}</Title>
<StyledTitle>
<Typography>{title}</Typography>
<ConditionallyRender
condition={beta}
show={<Badge color='secondary'>Beta</Badge>}
/>
</StyledTitle>
<LongDescription>{longDescription}</LongDescription>
<ReadMore>
<StyledLink
Expand Down
Loading