Skip to content

Commit c1e58de

Browse files
olavtarolavtar
authored
Single Source Report Adjustments (#180)
* Removing of 'Red Hat Remediation available' for single source report and parts of summary card. Signed-off-by: Olga Lavtar <[email protected]>
1 parent 5bcd2b3 commit c1e58de

File tree

6 files changed

+81
-95
lines changed

6 files changed

+81
-95
lines changed

‎src/main/resources/freemarker/templates/generated/main.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/resources/freemarker/templates/generated/vendor.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/resources/freemarker/templates/generated/vendor.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ui/src/components/DepCompoundTable.tsx‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import React, {useState} from 'react';
2-
32
import {
43
Card,
54
CardBody,
@@ -20,20 +19,17 @@ import {
2019
} from '@patternfly/react-core';
2120
import {ExpandableRowContent, Table, TableVariant, Tbody, Td, TdProps, Th, Thead, Tr} from '@patternfly/react-table';
2221
import FilterIcon from '@patternfly/react-icons/dist/esm/icons/filter-icon';
23-
2422
import {Dependency} from '../api/report';
2523
import {useTable} from '../hooks/useTable';
2624
import {useTableControls} from '../hooks/useTableControls';
2725
import {SimplePagination} from './TableControls/SimplePagination';
2826
import {DependencyLink} from './DependencyLink';
29-
import {RemediationsCount} from './RemediationsCount';
3027
import {TransitiveDependenciesTable} from './TransitiveDependenciesTable';
3128
import {VulnerabilitiesTable} from './VulnerabilitiesTable';
3229
import {VulnerabilitiesCountBySeverity} from './VulnerabilitiesCountBySeverity'
3330
import {extractDependencyVersion} from '../utils/utils';
3431
import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
35-
36-
import { ConditionalTableBody } from './TableControls/ConditionalTableBody';
32+
import {ConditionalTableBody} from './TableControls/ConditionalTableBody';
3733

3834
export const DepCompoundTable = ({ name, dependencies }: { name: string; dependencies: Dependency[] }) => {
3935
// Filters
@@ -154,8 +150,7 @@ export const DepCompoundTable = ({ name, dependencies }: { name: string; depende
154150
<Th>{columnNames.version}</Th>
155151
<Th>{columnNames.direct}</Th>
156152
<Th>{columnNames.transitive}</Th>
157-
<Th>{columnNames.rhRemediation}</Th>
158-
<Th />
153+
{/*<Th>{columnNames.rhRemediation}</Th>*/}
159154
</Tr>
160155
</Thead>
161156
<ConditionalTableBody
@@ -224,17 +219,12 @@ export const DepCompoundTable = ({ name, dependencies }: { name: string; depende
224219
<VulnerabilitiesCountBySeverity transitiveDependencies={item.transitive} />
225220
</Flex>
226221
) : 0}
227-
228-
{/*{item.transitive*/}
229-
{/* .map((e) => e.issues.length)*/}
230-
{/* .reduce((prev, current) =>*/}
231-
{/* prev + current, 0)}*/}
232-
</Td>
233-
<Td width={15}
234-
dataLabel={columnNames.rhRemediation}
235-
>
236-
<RemediationsCount dependency={item} />
237222
</Td>
223+
{/*<Td width={15}*/}
224+
{/* dataLabel={columnNames.rhRemediation}*/}
225+
{/*>*/}
226+
{/* <RemediationsCount dependency={item} />*/}
227+
{/*</Td>*/}
238228
</Tr>
239229
{isRowExpanded ? (
240230
<Tr isExpanded={isRowExpanded}>

‎ui/src/components/RemediationsCount.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const RemediationsCount: React.FC<RemediationsCountProps> = ({ dependency
1818
// : 0;
1919

2020
const directRemediationsCount = 0;
21-
const transitiveRemediationsCount = 2;
21+
const transitiveRemediationsCount = 0;
2222

2323
return (
2424
<>

‎ui/src/components/SummaryCard.tsx‎

Lines changed: 70 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {
2-
Button,
32
Card,
43
CardBody,
54
CardHeader,
@@ -12,16 +11,12 @@ import {
1211
Grid,
1312
GridItem,
1413
Icon,
15-
List,
16-
ListItem,
1714
Title,
1815
TitleSizes,
1916
} from '@patternfly/react-core';
2017
import ExclamationTriangleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon';
21-
import RedhatIcon from '@patternfly/react-icons/dist/esm/icons/redhat-icon';
2218
import {useAppContext} from '../App';
2319
import {ChartCard} from './ChartCard';
24-
import SecurityCheckIcon from '../images/security-check.svg';
2520
import {getSourceName, getSources} from '../api/report';
2621

2722
export const SummaryCard = () => {
@@ -34,7 +29,8 @@ export const SummaryCard = () => {
3429
</Icon>&nbsp;Red Hat Overview of security Issues
3530
</Title>
3631
<Divider />
37-
<GridItem md={6}>
32+
{/*<GridItem md={6}>*/}
33+
<GridItem>
3834
<Card isFlat isFullHeight>
3935
<CardHeader>
4036
<CardTitle>
@@ -70,74 +66,74 @@ export const SummaryCard = () => {
7066
<Divider/>
7167
</Card>
7268
</GridItem>
73-
<GridItem md={6}>
74-
<Card isFlat>
75-
<DescriptionListGroup>
76-
<CardTitle component="h4">
77-
<DescriptionListTerm style={{fontSize: "large"}}>
78-
<Icon isInline status="info">
79-
<RedhatIcon style={{fill: "#cc0000"}}/>
80-
</Icon>&nbsp;
81-
Red Hat Remediations
82-
</DescriptionListTerm>
83-
</CardTitle>
84-
<CardBody>
85-
<DescriptionListDescription>
86-
<List isPlain>
87-
<ListItem>
88-
<Icon isInline status="success">
89-
<img src={SecurityCheckIcon} alt="Security Check Icon"/>
90-
</Icon>&nbsp;
91-
10+ vulnerable packages
92-
</ListItem>
93-
</List>
94-
</DescriptionListDescription>
95-
</CardBody>
96-
</DescriptionListGroup>
97-
</Card>&nbsp;
98-
<Card isFlat>
99-
<DescriptionListGroup>
100-
<CardTitle component="h4">
101-
<DescriptionListTerm style={{fontSize: "large"}}>
102-
Subscribe to stay updated
103-
</DescriptionListTerm>
104-
</CardTitle>
105-
<CardBody>
106-
<DescriptionListDescription>
107-
<List isPlain>
108-
<ListItem>
109-
Do you want to subscribe for Red Hat Trusted Content Service to keep your
110-
projects risk profile updated?
111-
</ListItem>
112-
<ListItem>
113-
<Button variant="primary" size="sm">
114-
Sign up
115-
</Button>
116-
</ListItem>
117-
</List>
118-
</DescriptionListDescription>
119-
</CardBody>
120-
</DescriptionListGroup>
121-
</Card>&nbsp;
122-
<Card isFlat>
123-
<DescriptionListGroup>
124-
<CardTitle component="h4">
125-
<DescriptionListTerm style={{fontSize: "large"}}>
126-
Licenses
127-
</DescriptionListTerm>
128-
</CardTitle>
129-
<CardBody>
130-
<DescriptionListDescription>
131-
<List isPlain>
132-
<ListItem>
133-
Some info here
134-
</ListItem>
135-
</List>
136-
</DescriptionListDescription>
137-
</CardBody>
138-
</DescriptionListGroup>
139-
</Card>
140-
</GridItem>
69+
{/*<GridItem md={6}>*/}
70+
{/* <Card isFlat>*/}
71+
{/* <DescriptionListGroup>*/}
72+
{/* <CardTitle component="h4">*/}
73+
{/* <DescriptionListTerm style={{fontSize: "large"}}>*/}
74+
{/* <Icon isInline status="info">*/}
75+
{/* <RedhatIcon style={{fill: "#cc0000"}}/>*/}
76+
{/* </Icon>&nbsp;*/}
77+
{/* Red Hat Remediations*/}
78+
{/* </DescriptionListTerm>*/}
79+
{/* </CardTitle>*/}
80+
{/* <CardBody>*/}
81+
{/* <DescriptionListDescription>*/}
82+
{/* <List isPlain>*/}
83+
{/* <ListItem>*/}
84+
{/* <Icon isInline status="success">*/}
85+
{/* <img src={SecurityCheckIcon} alt="Security Check Icon"/>*/}
86+
{/* </Icon>&nbsp;*/}
87+
{/* 10+ vulnerable packages*/}
88+
{/* </ListItem>*/}
89+
{/* </List>*/}
90+
{/* </DescriptionListDescription>*/}
91+
{/* </CardBody>*/}
92+
{/* </DescriptionListGroup>*/}
93+
{/* </Card>&nbsp;*/}
94+
{/* <Card isFlat>*/}
95+
{/* <DescriptionListGroup>*/}
96+
{/* <CardTitle component="h4">*/}
97+
{/* <DescriptionListTerm style={{fontSize: "large"}}>*/}
98+
{/* Subscribe to stay updated*/}
99+
{/* </DescriptionListTerm>*/}
100+
{/* </CardTitle>*/}
101+
{/* <CardBody>*/}
102+
{/* <DescriptionListDescription>*/}
103+
{/* <List isPlain>*/}
104+
{/* <ListItem>*/}
105+
{/* Do you want to subscribe for Red Hat Trusted Content Service to keep your*/}
106+
{/* projects risk profile updated?*/}
107+
{/* </ListItem>*/}
108+
{/* <ListItem>*/}
109+
{/* <Button variant="primary" size="sm">*/}
110+
{/* Sign up*/}
111+
{/* </Button>*/}
112+
{/* </ListItem>*/}
113+
{/* </List>*/}
114+
{/* </DescriptionListDescription>*/}
115+
{/* </CardBody>*/}
116+
{/* </DescriptionListGroup>*/}
117+
{/* </Card>&nbsp;*/}
118+
{/* <Card isFlat>*/}
119+
{/* <DescriptionListGroup>*/}
120+
{/* <CardTitle component="h4">*/}
121+
{/* <DescriptionListTerm style={{fontSize: "large"}}>*/}
122+
{/* Licenses*/}
123+
{/* </DescriptionListTerm>*/}
124+
{/* </CardTitle>*/}
125+
{/* <CardBody>*/}
126+
{/* <DescriptionListDescription>*/}
127+
{/* <List isPlain>*/}
128+
{/* <ListItem>*/}
129+
{/* Some info here*/}
130+
{/* </ListItem>*/}
131+
{/* </List>*/}
132+
{/* </DescriptionListDescription>*/}
133+
{/* </CardBody>*/}
134+
{/* </DescriptionListGroup>*/}
135+
{/* </Card>*/}
136+
{/*</GridItem>*/}
141137
</Grid>
142138
);
143139
};

0 commit comments

Comments
 (0)