mirror of
https://github.com/rocky-linux/peridot.git
synced 2024-12-20 17:58:29 +00:00
Merge pull request #58 from TheTedAdams/product-errata-header-fix
Fix header wrapping in safari. Add tooltip to type/severity row icons
This commit is contained in:
resf-prow[bot]
GitHub
commit
e37a5bac58
@ -34,7 +34,6 @@ import {
|
||||
AddIcon,
|
||||
ArrowLeftIcon,
|
||||
ArrowRightIcon,
|
||||
ChevronDownIcon,
|
||||
MinusIcon,
|
||||
SearchIcon,
|
||||
} from '@chakra-ui/icons';
|
||||
@ -69,7 +68,6 @@ import {
|
||||
import {
|
||||
severityToBadge,
|
||||
severityToText,
|
||||
typeToBadge,
|
||||
typeToText,
|
||||
} from 'apollo/ui/src/enumToText';
|
||||
import {
|
||||
@ -77,7 +75,6 @@ import {
|
||||
ListAdvisoriesFiltersTypeEnum,
|
||||
} from 'bazel-bin/apollo/proto/v1/client_typescript';
|
||||
import {
|
||||
AdvisorySeverity,
|
||||
V1Advisory,
|
||||
V1AdvisoryType,
|
||||
} from 'bazel-bin/apollo/proto/v1/client_typescript/models';
|
||||
@ -432,7 +429,7 @@ export const Overview = () => {
|
||||
textAlign="center"
|
||||
pr={0}
|
||||
>
|
||||
{severityToBadge(a.severity)}
|
||||
{severityToBadge(a.severity, a.type)}
|
||||
</Td>
|
||||
<Td backgroundColor={idx % 2 ? 'gray.50' : undefined}>
|
||||
<Link
|
||||
|
||||
@ -50,6 +50,7 @@ export const Root = () => {
|
||||
alignItems="stretch"
|
||||
>
|
||||
<Box
|
||||
as="header"
|
||||
background={`linear-gradient(to bottom right, ${COLOR_RESF_GREEN}, ${COLOR_RESF_BLUE})`}
|
||||
display="flex"
|
||||
flexDirection="row"
|
||||
@ -61,12 +62,14 @@ export const Root = () => {
|
||||
<HStack flexGrow={1} height="90%" spacing="2">
|
||||
<RESFLogo className="fill-current text-white" />
|
||||
<Text
|
||||
as="h1"
|
||||
borderLeft="1px solid"
|
||||
pl="2"
|
||||
lineHeight="30px"
|
||||
fontSize="xl"
|
||||
fontWeight="300"
|
||||
color="white"
|
||||
whiteSpace="nowrap"
|
||||
>
|
||||
Product Errata
|
||||
</Text>
|
||||
@ -80,6 +83,7 @@ export const Root = () => {
|
||||
</Switch>
|
||||
</Box>
|
||||
<Box
|
||||
as="footer"
|
||||
px="4"
|
||||
// backgroundColor="#10859E"
|
||||
background={`linear-gradient(to top left, ${COLOR_RESF_GREEN}, ${COLOR_RESF_BLUE})`}
|
||||
|
||||
@ -158,7 +158,7 @@ export const ShowErrata = (props: ShowErrataProps) => {
|
||||
spacing="6"
|
||||
mb={2}
|
||||
>
|
||||
{severityToBadge(errata.severity, 40)}
|
||||
{severityToBadge(errata.severity, errata.type, 40)}
|
||||
<VStack alignItems="stretch" spacing="0" flexGrow={1}>
|
||||
<HStack justifyContent="space-between">
|
||||
<Text fontSize="lg" fontWeight="bold">
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
import { Box, Tag, TagProps } from '@chakra-ui/react';
|
||||
import { Box, Tag, TagProps, Tooltip } from '@chakra-ui/react';
|
||||
import {
|
||||
AdvisorySeverity,
|
||||
V1AdvisoryType,
|
||||
@ -53,106 +53,119 @@ export const severityToText = (severity?: AdvisorySeverity): string => {
|
||||
};
|
||||
|
||||
export const severityToBadge = (
|
||||
severity?: AdvisorySeverity,
|
||||
severity: AdvisorySeverity | undefined,
|
||||
type: V1AdvisoryType | undefined,
|
||||
size: number = 20
|
||||
): React.ReactNode => {
|
||||
return {
|
||||
[AdvisorySeverity.Critical]: (
|
||||
<Box
|
||||
as="svg"
|
||||
version="1.1"
|
||||
id="prefix__Layer_1"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
x="0"
|
||||
y="0"
|
||||
viewBox="0 0 24 24"
|
||||
xmlSpace="preserve"
|
||||
width={`${size}px`}
|
||||
height={`${size}px`}
|
||||
display="inline-block"
|
||||
>
|
||||
<g fill="#ED1C24">
|
||||
<path d="M22.2 19.2l-8.8-16c-.2-.3-.5-.6-.8-.7-.3-.1-.7-.1-1.1 0-.3.1-.6.4-.8.7l-8.8 16c-.3.5-.2 1 0 1.5.3.5.8.7 1.3.8h17.7c.3 0 .5-.1.8-.2.2-.1.4-.3.5-.6.2-.4.2-1 0-1.5zm-18.8.6L12 4.3l8.6 15.5H3.4z" />
|
||||
<path d="M12 15.7c-.2 0-.4.1-.6.2-.2.2-.2.4-.2.6v.8c0 .3.2.6.4.7.3.1.6.1.8 0s.4-.4.4-.7v-.8c0-.2-.1-.4-.2-.6-.2-.1-.4-.2-.6-.2zM11.2 9v5c0 .3.2.6.4.7.3.1.6.1.8 0 .3-.1.4-.4.4-.7V9c0-.3-.2-.6-.4-.7-.3-.1-.6-.1-.8 0s-.4.4-.4.7z" />
|
||||
</g>
|
||||
</Box>
|
||||
),
|
||||
[AdvisorySeverity.Important]: (
|
||||
<Box
|
||||
as="svg"
|
||||
width={`${size}px`}
|
||||
height={`${size}px`}
|
||||
display="inline-block"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<g fill="#F47B2A">
|
||||
<path d="M22.2 19.2l-8.8-16c-.2-.3-.5-.6-.8-.7-.3-.1-.7-.1-1.1 0-.3.1-.6.4-.8.7l-8.8 16c-.3.5-.2 1 0 1.5.3.5.8.7 1.3.8h17.7c.3 0 .5-.1.8-.2.2-.1.4-.3.5-.6.2-.4.2-1 0-1.5zm-18.8.6L12 4.3l8.6 15.5H3.4z" />
|
||||
<path d="M12 15.7c-.2 0-.4.1-.6.2-.2.2-.2.4-.2.6v.8c0 .3.2.6.4.7.3.1.6.1.8 0s.4-.4.4-.7v-.8c0-.2-.1-.4-.2-.6-.2-.1-.4-.2-.6-.2zM11.2 9v5c0 .3.2.6.4.7.3.1.6.1.8 0 .3-.1.4-.4.4-.7V9c0-.3-.2-.6-.4-.7-.3-.1-.6-.1-.8 0s-.4.4-.4.7z" />
|
||||
</g>
|
||||
</Box>
|
||||
),
|
||||
[AdvisorySeverity.Moderate]: (
|
||||
<Box
|
||||
as="svg"
|
||||
width={`${size}px`}
|
||||
height={`${size}px`}
|
||||
display="inline-block"
|
||||
version="1.1"
|
||||
id="prefix__Layer_1"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
x="0"
|
||||
y="0"
|
||||
viewBox="0 0 24 24"
|
||||
xmlSpace="preserve"
|
||||
>
|
||||
<path
|
||||
fill="#ffc31a"
|
||||
d="M22.2 19.2l-8.8-16c-.2-.3-.5-.6-.8-.7-.3-.1-.7-.1-1.1 0-.3.1-.6.4-.8.7l-8.8 16c-.3.5-.2 1 0 1.5.3.5.8.7 1.3.8h17.7c.3 0 .5-.1.8-.2.2-.1.4-.3.5-.6.2-.4.2-1 0-1.5zm-18.8.6L12 4.3l8.6 15.5H3.4z"
|
||||
/>
|
||||
<path
|
||||
fill="#ffc31a"
|
||||
d="M12 15.7c-.2 0-.4.1-.6.2-.2.2-.2.4-.2.6v.8c0 .3.2.6.4.7.3.1.6.1.8 0s.4-.4.4-.7v-.8c0-.2-.1-.4-.2-.6-.2-.1-.4-.2-.6-.2zM11.2 9v5c0 .3.2.6.4.7.3.1.6.1.8 0 .3-.1.4-.4.4-.7V9c0-.3-.2-.6-.4-.7-.3-.1-.6-.1-.8 0s-.4.4-.4.7z"
|
||||
/>
|
||||
</Box>
|
||||
),
|
||||
[AdvisorySeverity.Low]: (
|
||||
<Box
|
||||
as="svg"
|
||||
width={`${size}px`}
|
||||
height={`${size}px`}
|
||||
display="inline-block"
|
||||
version="1.1"
|
||||
id="prefix__Layer_1"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
x="0"
|
||||
y="0"
|
||||
viewBox="0 0 24 24"
|
||||
xmlSpace="preserve"
|
||||
>
|
||||
<g fill="#39B54A">
|
||||
<path d="M22.2 19.2l-8.8-16c-.2-.3-.5-.6-.8-.7-.3-.1-.7-.1-1.1 0-.3.1-.6.4-.8.7l-8.8 16c-.3.5-.2 1 0 1.5.3.5.8.7 1.3.8h17.7c.3 0 .5-.1.8-.2.2-.1.4-.3.5-.6.2-.4.2-1 0-1.5zm-18.8.6L12 4.3l8.6 15.5H3.4z" />
|
||||
<path d="M12 15.7c-.2 0-.4.1-.6.2-.2.2-.2.4-.2.6v.8c0 .3.2.6.4.7.3.1.6.1.8 0s.4-.4.4-.7v-.8c0-.2-.1-.4-.2-.6-.2-.1-.4-.2-.6-.2zM11.2 9v5c0 .3.2.6.4.7.3.1.6.1.8 0 .3-.1.4-.4.4-.7V9c0-.3-.2-.6-.4-.7-.3-.1-.6-.1-.8 0s-.4.4-.4.7z" />
|
||||
</g>
|
||||
</Box>
|
||||
),
|
||||
[AdvisorySeverity.Unknown]: (
|
||||
<Box
|
||||
as="svg"
|
||||
width={`${size}px`}
|
||||
height={`${size}px`}
|
||||
display="inline-block"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<g fill="#009444">
|
||||
<path d="M22 5.6c0-.2 0-.3-.1-.4s-.2-.2-.4-.3L12.3 2h-.5L2.5 4.9c-.1 0-.3.1-.4.2-.1.2-.1.3-.1.5C2 6 1.6 15 6 19.5c.8.8 1.7 1.5 2.8 1.9 1 .4 2.2.6 3.3.6s2.2-.2 3.3-.6c1-.4 2-1.1 2.7-1.9C22.4 14.9 22 5.9 22 5.6zm-5 12.9c-1.3 1.4-3.1 2.1-5 2.1s-3.7-.7-5-2.1C3.6 15 3.4 8 3.4 6.1L12 3.4l8.6 2.7c0 1.9-.2 8.9-3.6 12.4z" />
|
||||
<path d="M5.4 7c-.2 0-.3.1-.4.3-.1.1-.1.3-.1.4.1 2.1.6 7.2 3.1 9.8 1 1.1 2.4 1.7 3.9 1.6h.1c1.5 0 2.9-.6 3.9-1.6 2.5-2.6 3-7.7 3.2-9.8 0-.2 0-.3-.1-.4s-.2-.2-.4-.3l-6.4-2h-.4L5.4 7zm12.3 1.2c-.2 2.1-.7 6.3-2.7 8.3-.8.8-1.8 1.2-2.9 1.2H12c-1.1 0-2.1-.4-2.9-1.2-2-2.1-2.5-6.2-2.7-8.3L12 6.5l5.7 1.7z" />
|
||||
<path d="M8.9 12.5l1.4 2.1c.1.2.3.3.6.3.2 0 .4-.1.5-.3l3.6-4.3c.2-.2.2-.5.1-.7-.1-.2-.3-.4-.5-.5-.3 0-.5.1-.7.2L11 13l-.9-1.3c-.1-.2-.3-.3-.5-.3s-.4 0-.6.1c-.2.1-.3.3-.3.5 0 .1.1.3.2.5z" />
|
||||
</g>
|
||||
</Box>
|
||||
),
|
||||
}[severity || AdvisorySeverity.Unknown];
|
||||
return (
|
||||
<Tooltip
|
||||
label={`${typeToText(type)}${
|
||||
type === V1AdvisoryType.Security ? ` / ${severityToText(severity)}` : ''
|
||||
}`}
|
||||
placement="top-start"
|
||||
hasArrow
|
||||
>
|
||||
{
|
||||
{
|
||||
[AdvisorySeverity.Critical]: (
|
||||
<Box
|
||||
as="svg"
|
||||
version="1.1"
|
||||
id="prefix__Layer_1"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
x="0"
|
||||
y="0"
|
||||
viewBox="0 0 24 24"
|
||||
xmlSpace="preserve"
|
||||
width={`${size}px`}
|
||||
height={`${size}px`}
|
||||
display="inline-block"
|
||||
>
|
||||
<g fill="#ED1C24">
|
||||
<path d="M22.2 19.2l-8.8-16c-.2-.3-.5-.6-.8-.7-.3-.1-.7-.1-1.1 0-.3.1-.6.4-.8.7l-8.8 16c-.3.5-.2 1 0 1.5.3.5.8.7 1.3.8h17.7c.3 0 .5-.1.8-.2.2-.1.4-.3.5-.6.2-.4.2-1 0-1.5zm-18.8.6L12 4.3l8.6 15.5H3.4z" />
|
||||
<path d="M12 15.7c-.2 0-.4.1-.6.2-.2.2-.2.4-.2.6v.8c0 .3.2.6.4.7.3.1.6.1.8 0s.4-.4.4-.7v-.8c0-.2-.1-.4-.2-.6-.2-.1-.4-.2-.6-.2zM11.2 9v5c0 .3.2.6.4.7.3.1.6.1.8 0 .3-.1.4-.4.4-.7V9c0-.3-.2-.6-.4-.7-.3-.1-.6-.1-.8 0s-.4.4-.4.7z" />
|
||||
</g>
|
||||
</Box>
|
||||
),
|
||||
[AdvisorySeverity.Important]: (
|
||||
<Box
|
||||
as="svg"
|
||||
width={`${size}px`}
|
||||
height={`${size}px`}
|
||||
display="inline-block"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<g fill="#F47B2A">
|
||||
<path d="M22.2 19.2l-8.8-16c-.2-.3-.5-.6-.8-.7-.3-.1-.7-.1-1.1 0-.3.1-.6.4-.8.7l-8.8 16c-.3.5-.2 1 0 1.5.3.5.8.7 1.3.8h17.7c.3 0 .5-.1.8-.2.2-.1.4-.3.5-.6.2-.4.2-1 0-1.5zm-18.8.6L12 4.3l8.6 15.5H3.4z" />
|
||||
<path d="M12 15.7c-.2 0-.4.1-.6.2-.2.2-.2.4-.2.6v.8c0 .3.2.6.4.7.3.1.6.1.8 0s.4-.4.4-.7v-.8c0-.2-.1-.4-.2-.6-.2-.1-.4-.2-.6-.2zM11.2 9v5c0 .3.2.6.4.7.3.1.6.1.8 0 .3-.1.4-.4.4-.7V9c0-.3-.2-.6-.4-.7-.3-.1-.6-.1-.8 0s-.4.4-.4.7z" />
|
||||
</g>
|
||||
</Box>
|
||||
),
|
||||
[AdvisorySeverity.Moderate]: (
|
||||
<Box
|
||||
as="svg"
|
||||
width={`${size}px`}
|
||||
height={`${size}px`}
|
||||
display="inline-block"
|
||||
version="1.1"
|
||||
id="prefix__Layer_1"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
x="0"
|
||||
y="0"
|
||||
viewBox="0 0 24 24"
|
||||
xmlSpace="preserve"
|
||||
>
|
||||
<path
|
||||
fill="#ffc31a"
|
||||
d="M22.2 19.2l-8.8-16c-.2-.3-.5-.6-.8-.7-.3-.1-.7-.1-1.1 0-.3.1-.6.4-.8.7l-8.8 16c-.3.5-.2 1 0 1.5.3.5.8.7 1.3.8h17.7c.3 0 .5-.1.8-.2.2-.1.4-.3.5-.6.2-.4.2-1 0-1.5zm-18.8.6L12 4.3l8.6 15.5H3.4z"
|
||||
/>
|
||||
<path
|
||||
fill="#ffc31a"
|
||||
d="M12 15.7c-.2 0-.4.1-.6.2-.2.2-.2.4-.2.6v.8c0 .3.2.6.4.7.3.1.6.1.8 0s.4-.4.4-.7v-.8c0-.2-.1-.4-.2-.6-.2-.1-.4-.2-.6-.2zM11.2 9v5c0 .3.2.6.4.7.3.1.6.1.8 0 .3-.1.4-.4.4-.7V9c0-.3-.2-.6-.4-.7-.3-.1-.6-.1-.8 0s-.4.4-.4.7z"
|
||||
/>
|
||||
</Box>
|
||||
),
|
||||
[AdvisorySeverity.Low]: (
|
||||
<Box
|
||||
as="svg"
|
||||
width={`${size}px`}
|
||||
height={`${size}px`}
|
||||
display="inline-block"
|
||||
version="1.1"
|
||||
id="prefix__Layer_1"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
x="0"
|
||||
y="0"
|
||||
viewBox="0 0 24 24"
|
||||
xmlSpace="preserve"
|
||||
>
|
||||
<g fill="#39B54A">
|
||||
<path d="M22.2 19.2l-8.8-16c-.2-.3-.5-.6-.8-.7-.3-.1-.7-.1-1.1 0-.3.1-.6.4-.8.7l-8.8 16c-.3.5-.2 1 0 1.5.3.5.8.7 1.3.8h17.7c.3 0 .5-.1.8-.2.2-.1.4-.3.5-.6.2-.4.2-1 0-1.5zm-18.8.6L12 4.3l8.6 15.5H3.4z" />
|
||||
<path d="M12 15.7c-.2 0-.4.1-.6.2-.2.2-.2.4-.2.6v.8c0 .3.2.6.4.7.3.1.6.1.8 0s.4-.4.4-.7v-.8c0-.2-.1-.4-.2-.6-.2-.1-.4-.2-.6-.2zM11.2 9v5c0 .3.2.6.4.7.3.1.6.1.8 0 .3-.1.4-.4.4-.7V9c0-.3-.2-.6-.4-.7-.3-.1-.6-.1-.8 0s-.4.4-.4.7z" />
|
||||
</g>
|
||||
</Box>
|
||||
),
|
||||
[AdvisorySeverity.Unknown]: (
|
||||
<Box
|
||||
as="svg"
|
||||
width={`${size}px`}
|
||||
height={`${size}px`}
|
||||
display="inline-block"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<g fill="#009444">
|
||||
<path d="M22 5.6c0-.2 0-.3-.1-.4s-.2-.2-.4-.3L12.3 2h-.5L2.5 4.9c-.1 0-.3.1-.4.2-.1.2-.1.3-.1.5C2 6 1.6 15 6 19.5c.8.8 1.7 1.5 2.8 1.9 1 .4 2.2.6 3.3.6s2.2-.2 3.3-.6c1-.4 2-1.1 2.7-1.9C22.4 14.9 22 5.9 22 5.6zm-5 12.9c-1.3 1.4-3.1 2.1-5 2.1s-3.7-.7-5-2.1C3.6 15 3.4 8 3.4 6.1L12 3.4l8.6 2.7c0 1.9-.2 8.9-3.6 12.4z" />
|
||||
<path d="M5.4 7c-.2 0-.3.1-.4.3-.1.1-.1.3-.1.4.1 2.1.6 7.2 3.1 9.8 1 1.1 2.4 1.7 3.9 1.6h.1c1.5 0 2.9-.6 3.9-1.6 2.5-2.6 3-7.7 3.2-9.8 0-.2 0-.3-.1-.4s-.2-.2-.4-.3l-6.4-2h-.4L5.4 7zm12.3 1.2c-.2 2.1-.7 6.3-2.7 8.3-.8.8-1.8 1.2-2.9 1.2H12c-1.1 0-2.1-.4-2.9-1.2-2-2.1-2.5-6.2-2.7-8.3L12 6.5l5.7 1.7z" />
|
||||
<path d="M8.9 12.5l1.4 2.1c.1.2.3.3.6.3.2 0 .4-.1.5-.3l3.6-4.3c.2-.2.2-.5.1-.7-.1-.2-.3-.4-.5-.5-.3 0-.5.1-.7.2L11 13l-.9-1.3c-.1-.2-.3-.3-.5-.3s-.4 0-.6.1c-.2.1-.3.3-.3.5 0 .1.1.3.2.5z" />
|
||||
</g>
|
||||
</Box>
|
||||
),
|
||||
}[severity || AdvisorySeverity.Unknown]
|
||||
}
|
||||
</Tooltip>
|
||||
);
|
||||
};
|
||||
|
||||
export const typeToText = (type?: V1AdvisoryType): string => {
|
||||
@ -167,18 +180,3 @@ export const typeToText = (type?: V1AdvisoryType): string => {
|
||||
return 'Unknown';
|
||||
}
|
||||
};
|
||||
|
||||
export const typeToBadge = (
|
||||
type?: V1AdvisoryType,
|
||||
size: TagProps['size'] = 'sm'
|
||||
): React.ReactNode => {
|
||||
return (
|
||||
<Tag
|
||||
variant="outline"
|
||||
size={size}
|
||||
colorScheme={type === V1AdvisoryType.Security ? 'orange' : 'gray'}
|
||||
>
|
||||
{typeToText(type)}
|
||||
</Tag>
|
||||
);
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user