Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 18 additions & 6 deletions client/src/app/pages/advisory-details/advisory-details.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ import React from "react";

import {
Button,
Flex,
FlexItem,
Label,
PageSection,
Split,
SplitItem,
Expand Down Expand Up @@ -48,12 +51,21 @@ export const AdvisoryDetails: React.FC = () => {
<PageSection variant="light">
<Split>
<SplitItem isFilled>
<TextContent>
<Text component="h1">
{advisory?.document_id ?? advisoryId ?? ""}
</Text>
<Text component="p">Advisory detail information</Text>
</TextContent>
<Flex>
<FlexItem spacer={{ default: "spacerSm" }}>
<TextContent>
<Text component="h1">
{advisory?.document_id ?? advisoryId ?? ""}
</Text>
<Text component="p">Advisory detail information</Text>
</TextContent>
</FlexItem>
<FlexItem>
{advisory?.labels.type && (
<Label color="blue">{advisory?.labels.type}</Label>
)}
</FlexItem>
</Flex>
</SplitItem>
<SplitItem>
{!isFetching && (
Expand Down
8 changes: 7 additions & 1 deletion client/src/app/pages/advisory-list/advisory-context.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ import { useFetchAdvisories } from "@app/queries/advisories";
interface IAdvisorySearchContext {
tableControls: ITableControls<
AdvisorySummary,
"identifier" | "title" | "severity" | "modified" | "vulnerabilities",
| "identifier"
| "title"
| "severity"
| "type"
| "modified"
| "vulnerabilities",
"identifier" | "severity" | "modified",
"" | "average_severity" | "modified",
string
Expand Down Expand Up @@ -51,6 +56,7 @@ export const AdvisorySearchProvider: React.FunctionComponent<
identifier: "ID",
title: "Title",
severity: "Aggregated Severity",
type: "Type",
modified: "Revision",
vulnerabilities: "Vulnerabilities",
},
Expand Down
6 changes: 5 additions & 1 deletion client/src/app/pages/advisory-list/advisory-table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export const AdvisoryTable: React.FC = () => {
<Th {...getThProps({ columnKey: "identifier" })} />
<Th {...getThProps({ columnKey: "title" })} />
<Th {...getThProps({ columnKey: "severity" })} />
<Th {...getThProps({ columnKey: "type" })} />
<Th {...getThProps({ columnKey: "modified" })} />
<Th {...getThProps({ columnKey: "vulnerabilities" })} />
</TableHeaderContentWithControls>
Expand Down Expand Up @@ -111,7 +112,7 @@ export const AdvisoryTable: React.FC = () => {
</NavLink>
</Td>
<Td
width={40}
width={30}
modifier="truncate"
{...getTdProps({ columnKey: "title" })}
>
Expand All @@ -131,6 +132,9 @@ export const AdvisoryTable: React.FC = () => {
/>
)}
</Td>
<Td width={10} {...getTdProps({ columnKey: "type" })}>
{item.labels.type}
</Td>
<Td
width={10}
modifier="truncate"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export const AdvisoriesByVulnerability: React.FC<
identifier: "ID",
title: "Title",
severity: "Aggregated Severity",
type: "Type",
revision: "Revision",
vulnerabilities: "Vulnerabilities",
},
Expand Down Expand Up @@ -93,6 +94,7 @@ export const AdvisoriesByVulnerability: React.FC<
<Th {...getThProps({ columnKey: "identifier" })} />
<Th {...getThProps({ columnKey: "title" })} />
<Th {...getThProps({ columnKey: "severity" })} />
<Th {...getThProps({ columnKey: "type" })} />
<Th {...getThProps({ columnKey: "revision" })} />
<Th {...getThProps({ columnKey: "vulnerabilities" })} />
</TableHeaderContentWithControls>
Expand All @@ -114,7 +116,7 @@ export const AdvisoriesByVulnerability: React.FC<
</Link>
</Td>
<Td
width={50}
width={45}
modifier="truncate"
{...getTdProps({ columnKey: "title" })}
>
Expand All @@ -128,6 +130,13 @@ export const AdvisoriesByVulnerability: React.FC<
showScore
/>
</Td>
<Td
width={10}
modifier="truncate"
{...getTdProps({ columnKey: "type" })}
>
{item.labels.type}
</Td>
<Td
width={10}
modifier="truncate"
Expand Down
Loading