rocky-linux
/
peridot
mirror of https://github.com/rocky-linux/peridot.git
4
0
Fork 0
Code Issues Projects Releases Activity

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] 2022-11-02 17:45:19 +00:00 committed by GitHub
parent 67fb8751fd d778d5843c
commit e37a5bac58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 118 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apollo/ui/src/components/Overview.tsx
View File

@ -34,7 +34,6 @@ import {
AddIcon, AddIcon,
ArrowLeftIcon, ArrowLeftIcon,
ArrowRightIcon, ArrowRightIcon,
ChevronDownIcon,
MinusIcon, MinusIcon,
SearchIcon, SearchIcon,
} from '@chakra-ui/icons'; } from '@chakra-ui/icons';
@ -69,7 +68,6 @@ import {
import { import {
severityToBadge, severityToBadge,
severityToText, severityToText,
typeToBadge,
typeToText, typeToText,
} from 'apollo/ui/src/enumToText'; } from 'apollo/ui/src/enumToText';
import { import {
@ -77,7 +75,6 @@ import {
ListAdvisoriesFiltersTypeEnum, ListAdvisoriesFiltersTypeEnum,
} from 'bazel-bin/apollo/proto/v1/client_typescript'; } from 'bazel-bin/apollo/proto/v1/client_typescript';
import { import {
AdvisorySeverity,
V1Advisory, V1Advisory,
V1AdvisoryType, V1AdvisoryType,
} from 'bazel-bin/apollo/proto/v1/client_typescript/models'; } from 'bazel-bin/apollo/proto/v1/client_typescript/models';
@ -432,7 +429,7 @@ export const Overview = () => {
textAlign="center" textAlign="center"
pr={0} pr={0}
> >
{severityToBadge(a.severity)} {severityToBadge(a.severity, a.type)}
</Td> </Td>
<Td backgroundColor={idx % 2 ? 'gray.50' : undefined}> <Td backgroundColor={idx % 2 ? 'gray.50' : undefined}>
<Link <Link

4
apollo/ui/src/components/Root.tsx
View File

@ -50,6 +50,7 @@ export const Root = () => {
alignItems="stretch" alignItems="stretch"
> >
<Box <Box
as="header"
background={`linear-gradient(to bottom right, ${COLOR_RESF_GREEN}, ${COLOR_RESF_BLUE})`} background={`linear-gradient(to bottom right, ${COLOR_RESF_GREEN}, ${COLOR_RESF_BLUE})`}
display="flex" display="flex"
flexDirection="row" flexDirection="row"
@ -61,12 +62,14 @@ export const Root = () => {
<HStack flexGrow={1} height="90%" spacing="2"> <HStack flexGrow={1} height="90%" spacing="2">
<RESFLogo className="fill-current text-white" /> <RESFLogo className="fill-current text-white" />
<Text <Text
as="h1"
borderLeft="1px solid" borderLeft="1px solid"
pl="2" pl="2"
lineHeight="30px" lineHeight="30px"
fontSize="xl" fontSize="xl"
fontWeight="300" fontWeight="300"
color="white" color="white"
whiteSpace="nowrap"
> >
Product Errata Product Errata
</Text> </Text>
@ -80,6 +83,7 @@ export const Root = () => {
</Switch> </Switch>
</Box> </Box>
<Box <Box
as="footer"
px="4" px="4"
// backgroundColor="#10859E" // backgroundColor="#10859E"
background={`linear-gradient(to top left, ${COLOR_RESF_GREEN}, ${COLOR_RESF_BLUE})`} background={`linear-gradient(to top left, ${COLOR_RESF_GREEN}, ${COLOR_RESF_BLUE})`}

2
apollo/ui/src/components/ShowErrata.tsx
View File

@ -158,7 +158,7 @@ export const ShowErrata = (props: ShowErrataProps) => {
spacing="6" spacing="6"
mb={2} mb={2}
> >
{severityToBadge(errata.severity, 40)} {severityToBadge(errata.severity, errata.type, 40)}
<VStack alignItems="stretch" spacing="0" flexGrow={1}> <VStack alignItems="stretch" spacing="0" flexGrow={1}>
<HStack justifyContent="space-between"> <HStack justifyContent="space-between">
<Text fontSize="lg" fontWeight="bold"> <Text fontSize="lg" fontWeight="bold">

226
apollo/ui/src/enumToText.tsx
View File

@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
import { Box, Tag, TagProps } from '@chakra-ui/react'; import { Box, Tag, TagProps, Tooltip } from '@chakra-ui/react';
import { import {
AdvisorySeverity, AdvisorySeverity,
V1AdvisoryType, V1AdvisoryType,
@ -53,106 +53,119 @@ export const severityToText = (severity?: AdvisorySeverity): string => {
}; };
export const severityToBadge = ( export const severityToBadge = (
severity?: AdvisorySeverity, severity: AdvisorySeverity | undefined,
type: V1AdvisoryType | undefined,
size: number = 20 size: number = 20
): React.ReactNode => { ): React.ReactNode => {
return { return (
[AdvisorySeverity.Critical]: ( <Tooltip
<Box label={`${typeToText(type)}${
as="svg" type === V1AdvisoryType.Security ? ` / ${severityToText(severity)}` : ''
version="1.1" }`}
id="prefix__Layer_1" placement="top-start"
xmlns="http://www.w3.org/2000/svg" hasArrow
x="0" >
y="0" {
viewBox="0 0 24 24" {
xmlSpace="preserve" [AdvisorySeverity.Critical]: (
width={`${size}px`} <Box
height={`${size}px`} as="svg"
display="inline-block" version="1.1"
> id="prefix__Layer_1"
<g fill="#ED1C24"> xmlns="http://www.w3.org/2000/svg"
<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" /> x="0"
<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" /> y="0"
</g> viewBox="0 0 24 24"
</Box> xmlSpace="preserve"
), width={`${size}px`}
[AdvisorySeverity.Important]: ( height={`${size}px`}
<Box display="inline-block"
as="svg" >
width={`${size}px`} <g fill="#ED1C24">
height={`${size}px`} <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" />
display="inline-block" <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" />
xmlns="http://www.w3.org/2000/svg" </g>
viewBox="0 0 24 24" </Box>
> ),
<g fill="#F47B2A"> [AdvisorySeverity.Important]: (
<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" /> <Box
<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" /> as="svg"
</g> width={`${size}px`}
</Box> height={`${size}px`}
), display="inline-block"
[AdvisorySeverity.Moderate]: ( xmlns="http://www.w3.org/2000/svg"
<Box viewBox="0 0 24 24"
as="svg" >
width={`${size}px`} <g fill="#F47B2A">
height={`${size}px`} <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" />
display="inline-block" <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" />
version="1.1" </g>
id="prefix__Layer_1" </Box>
xmlns="http://www.w3.org/2000/svg" ),
x="0" [AdvisorySeverity.Moderate]: (
y="0" <Box
viewBox="0 0 24 24" as="svg"
xmlSpace="preserve" width={`${size}px`}
> height={`${size}px`}
<path display="inline-block"
fill="#ffc31a" version="1.1"
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" id="prefix__Layer_1"
/> xmlns="http://www.w3.org/2000/svg"
<path x="0"
fill="#ffc31a" y="0"
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" viewBox="0 0 24 24"
/> xmlSpace="preserve"
</Box> >
), <path
[AdvisorySeverity.Low]: ( fill="#ffc31a"
<Box 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"
as="svg" />
width={`${size}px`} <path
height={`${size}px`} fill="#ffc31a"
display="inline-block" 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"
version="1.1" />
id="prefix__Layer_1" </Box>
xmlns="http://www.w3.org/2000/svg" ),
x="0" [AdvisorySeverity.Low]: (
y="0" <Box
viewBox="0 0 24 24" as="svg"
xmlSpace="preserve" width={`${size}px`}
> height={`${size}px`}
<g fill="#39B54A"> display="inline-block"
<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" /> version="1.1"
<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" /> id="prefix__Layer_1"
</g> xmlns="http://www.w3.org/2000/svg"
</Box> x="0"
), y="0"
[AdvisorySeverity.Unknown]: ( viewBox="0 0 24 24"
<Box xmlSpace="preserve"
as="svg" >
width={`${size}px`} <g fill="#39B54A">
height={`${size}px`} <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" />
display="inline-block" <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" />
xmlns="http://www.w3.org/2000/svg" </g>
viewBox="0 0 24 24" </Box>
> ),
<g fill="#009444"> [AdvisorySeverity.Unknown]: (
<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" /> <Box
<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" /> as="svg"
<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" /> width={`${size}px`}
</g> height={`${size}px`}
</Box> display="inline-block"
), xmlns="http://www.w3.org/2000/svg"
}[severity || AdvisorySeverity.Unknown]; 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 => { export const typeToText = (type?: V1AdvisoryType): string => {
@ -167,18 +180,3 @@ export const typeToText = (type?: V1AdvisoryType): string => {
return 'Unknown'; 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>
);
};