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

Jump to bottom

GUI miscellaneous #5 #1025

Merged
merged 19 commits into from
Oct 17, 2018
Merged

GUI miscellaneous #5 #1025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d2a984c
Fix alignment for Reports Hosts table
swaterkamp Oct 17, 2018
2b634cc
Fix alignment for Reports Ports table
swaterkamp Oct 17, 2018
d90e779
Fix alignment for Reports Applications table
swaterkamp Oct 17, 2018
7f37b70
Fix alignment for Reports OperatingSystems table
swaterkamp Oct 17, 2018
f40f2c1
Fix alignment for Reports CVEs table
swaterkamp Oct 17, 2018
15bfea1
Fix alignment for Reports Closed CVEs table
swaterkamp Oct 17, 2018
3fea34c
Fix alignment for Reports TLS Certificates table
swaterkamp Oct 17, 2018
9159aba
Fix alignment for ScanConfigs details tables
swaterkamp Oct 17, 2018
2750ecc
Move InfoTable column of task details
swaterkamp Oct 17, 2018
5ab7dfb
Remove double row in Tasks listpage table
swaterkamp Oct 17, 2018
53dd8f6
Fix alignment of Trend column in Task listpage table
swaterkamp Oct 17, 2018
1736b2c
Update imports
swaterkamp Oct 17, 2018
7d0cff2
Reduce Reports counts in Tasks table to one number
swaterkamp Oct 17, 2018
1bd8bef
Rename Last column in Tasks table
swaterkamp Oct 17, 2018
8326576
Remove double row for "Scan Results" in Reports table header
swaterkamp Oct 17, 2018
b80d402
Change report icons on task detailspage
swaterkamp Oct 17, 2018
ff165d0
Add link to NVTs filtered by family for ScanConfig details
swaterkamp Oct 17, 2018
230be9e
Remove border of Progressbar
swaterkamp Oct 17, 2018
4e85b25
2D-ify SeverityClassLabels
swaterkamp Oct 17, 2018
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
1 change: 0 additions & 1 deletion gsa/src/web/components/bar/progressbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ const ProgressBarBox = styled.div`
background: ${Theme.darkGray};
vertical-align: middle;
text-align: center;
border: 1px solid ${Theme.inputBorderGray};

@media print {
background: none;
Expand Down
4 changes: 1 addition & 3 deletions gsa/src/web/components/label/severityclass.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ const Label = styled.div`
font-weight: normal;
font-style: normal;
color: white;
padding: 0;
border-width: 1px;
border-style: outset;
padding: 1px;
display: inline-block;
width: 60px;
height: 1.5em;
Expand Down
22 changes: 11 additions & 11 deletions gsa/src/web/pages/reports/applicationstable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,21 @@ import React from 'react';

import {_, _l} from 'gmp/locale/lang';

import PropTypes from '../../utils/proptypes.js';
import PropTypes from 'web/utils/proptypes';

import SeverityBar from '../../components/bar/severitybar.js';
import SeverityBar from 'web/components/bar/severitybar';

import IconDivider from '../../components/layout/icondivider.js';
import IconDivider from 'web/components/layout/icondivider';

import DetailsLink from '../../components/link/detailslink.js';
import DetailsLink from 'web/components/link/detailslink';

import TableData from '../../components/table/data.js';
import TableHead from '../../components/table/head.js';
import TableHeader from '../../components/table/header.js';
import TableRow from '../../components/table/row.js';
import TableData from 'web/components/table/data';
import TableHead from 'web/components/table/head';
import TableHeader from 'web/components/table/header';
import TableRow from 'web/components/table/row';

import {createEntitiesTable} from '../../entities/table.js';
import CpeIcon from '../../components/icon/cpeicon';
import {createEntitiesTable} from 'web/entities/table';
import CpeIcon from 'web/components/icon/cpeicon';

const Header = ({
currentSortBy,
Expand Down Expand Up @@ -122,7 +122,7 @@ const Row = ({
<TableData>
{occurrences.total}
</TableData>
<TableData align="center">
<TableData>
<SeverityBar severity={severity}/>
</TableData>
</TableRow>
Expand Down
20 changes: 10 additions & 10 deletions gsa/src/web/pages/reports/closedcvestable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ import React from 'react';

import {_, _l} from 'gmp/locale/lang';

import PropTypes from '../../utils/proptypes.js';
import PropTypes from 'web/utils/proptypes';

import SeverityBar from '../../components/bar/severitybar.js';
import SeverityBar from 'web/components/bar/severitybar';

import CveLink from '../../components/link/cvelink.js';
import DetailsLink from '../../components/link/detailslink.js';
import CveLink from 'web/components/link/cvelink';
import DetailsLink from 'web/components/link/detailslink';

import TableData from '../../components/table/data.js';
import TableHead from '../../components/table/head.js';
import TableHeader from '../../components/table/header.js';
import TableRow from '../../components/table/row.js';
import TableData from 'web/components/table/data';
import TableHead from 'web/components/table/head';
import TableHeader from 'web/components/table/header';
import TableRow from 'web/components/table/row';

import {createEntitiesTable} from '../../entities/table.js';
import {createEntitiesTable} from 'web/entities/table';

const Header = ({
currentSortDir,
Expand Down Expand Up @@ -115,7 +115,7 @@ const Row = ({entity}) => {
{source.description}
</DetailsLink>
</TableData>
<TableData align="center">
<TableData>
<SeverityBar severity={severity}/>
</TableData>
</TableRow>
Expand Down
20 changes: 10 additions & 10 deletions gsa/src/web/pages/reports/cvestable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@ import React from 'react';

import {_, _l} from 'gmp/locale/lang';

import PropTypes from '../../utils/proptypes.js';
import PropTypes from 'web/utils/proptypes';

import SeverityBar from '../../components/bar/severitybar.js';
import SeverityBar from 'web/components/bar/severitybar';

import Divider from '../../components/layout/divider.js';
import Divider from 'web/components/layout/divider';

import CveLink from '../../components/link/cvelink.js';
import CveLink from 'web/components/link/cvelink';

import TableData from '../../components/table/data.js';
import TableHead from '../../components/table/head.js';
import TableHeader from '../../components/table/header.js';
import TableRow from '../../components/table/row.js';
import TableData from 'web/components/table/data';
import TableHead from 'web/components/table/head';
import TableHeader from 'web/components/table/header';
import TableRow from 'web/components/table/row';

import {createEntitiesTable} from '../../entities/table.js';
import {createEntitiesTable} from 'web/entities/table';

const Header = ({
currentSortDir,
Expand Down Expand Up @@ -111,7 +111,7 @@ const Row = ({entity}) => {
<TableData>
{occurrences}
</TableData>
<TableData align="center">
<TableData>
<SeverityBar severity={severity}/>
</TableData>
</TableRow>
Expand Down
14 changes: 7 additions & 7 deletions gsa/src/web/pages/reports/errorstable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ import {_, _l} from 'gmp/locale/lang';

import {isDefined} from 'gmp/utils/identity';

import PropTypes from '../../utils/proptypes.js';
import PropTypes from 'web/utils/proptypes';

import DetailsLink from '../../components/link/detailslink.js';
import DetailsLink from 'web/components/link/detailslink';

import TableData from '../../components/table/data.js';
import TableHead from '../../components/table/head.js';
import TableHeader from '../../components/table/header.js';
import TableRow from '../../components/table/row.js';
import TableData from 'web/components/table/data';
import TableHead from 'web/components/table/head';
import TableHeader from 'web/components/table/header';
import TableRow from 'web/components/table/row';

import {createEntitiesTable} from '../../entities/table.js';
import {createEntitiesTable} from 'web/entities/table';

const Header = ({
currentSortDir,
Expand Down
34 changes: 17 additions & 17 deletions gsa/src/web/pages/reports/hoststable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@ import {_, _l} from 'gmp/locale/lang';

import {isDefined} from 'gmp/utils/identity';

import PropTypes from '../../utils/proptypes.js';
import PropTypes from 'web/utils/proptypes';

import SeverityBar from '../../components/bar/severitybar.js';
import SeverityBar from 'web/components/bar/severitybar';

import OsIcon from '../../components/icon/osicon.js';
import OsIcon from 'web/components/icon/osicon';

import DetailsLink from '../../components/link/detailslink.js';
import Link from '../../components/link/link.js';
import DetailsLink from 'web/components/link/detailslink';
import Link from 'web/components/link/link';

import TableData from '../../components/table/data.js';
import TableHead from '../../components/table/head.js';
import TableHeader from '../../components/table/header.js';
import TableRow from '../../components/table/row.js';
import TableData from 'web/components/table/data';
import TableHead from 'web/components/table/head';
import TableHeader from 'web/components/table/header';
import TableRow from 'web/components/table/row';

import {createEntitiesTable} from '../../entities/table.js';
import {createEntitiesTable} from 'web/entities/table';

const Header = ({
currentSortBy,
Expand Down Expand Up @@ -184,25 +184,25 @@ const Row = ({
osTxt={best_os_txt}
/>
</TableData>
<TableData align="center">
<TableData>
{result_counts.hole}
</TableData>
<TableData align="center">
<TableData>
{result_counts.warning}
</TableData>
<TableData align="center">
<TableData>
{result_counts.info}
</TableData>
<TableData align="center">
<TableData>
{result_counts.log}
</TableData>
<TableData align="center">
<TableData>
{result_counts.false_positive}
</TableData>
<TableData align="center">
<TableData>
{result_counts.total}
</TableData>
<TableData align="center">
<TableData>
<SeverityBar severity={severity}/>
</TableData>
</TableRow>
Expand Down
24 changes: 12 additions & 12 deletions gsa/src/web/pages/reports/operatingsystemstable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ import React from 'react';

import {_, _l} from 'gmp/locale/lang';

import PropTypes from '../../utils/proptypes.js';
import PropTypes from 'web/utils/proptypes';

import SeverityBar from '../../components/bar/severitybar.js';
import SeverityBar from 'web/components/bar/severitybar';

import OsIcon from '../../components/icon/osicon.js';
import OsIcon from 'web/components/icon/osicon';

import IconDivider from '../../components/layout/icondivider.js';
import IconDivider from 'web/components/layout/icondivider';

import Link from '../../components/link/link.js';
import Link from 'web/components/link/link';

import TableData from '../../components/table/data.js';
import TableHead from '../../components/table/head.js';
import TableHeader from '../../components/table/header.js';
import TableRow from '../../components/table/row.js';
import TableData from 'web/components/table/data';
import TableHead from 'web/components/table/head';
import TableHeader from 'web/components/table/header';
import TableRow from 'web/components/table/row';

import {createEntitiesTable} from '../../entities/table.js';
import {createEntitiesTable} from 'web/entities/table';

const Header = ({
currentSortDir,
Expand Down Expand Up @@ -127,10 +127,10 @@ const Row = ({
{cpe}
</Link>
</TableData>
<TableData align="center">
<TableData>
{hosts.count}
</TableData>
<TableData align="center">
<TableData>
<SeverityBar severity={severity}/>
</TableData>
</TableRow>
Expand Down
16 changes: 8 additions & 8 deletions gsa/src/web/pages/reports/portstable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ import React from 'react';

import {_, _l} from 'gmp/locale/lang';

import PropTypes from '../../utils/proptypes.js';
import PropTypes from 'web/utils/proptypes';

import SeverityBar from '../../components/bar/severitybar.js';
import SeverityBar from 'web/components/bar/severitybar';

import TableData from '../../components/table/data.js';
import TableHead from '../../components/table/head.js';
import TableHeader from '../../components/table/header.js';
import TableRow from '../../components/table/row.js';
import TableData from 'web/components/table/data';
import TableHead from 'web/components/table/head';
import TableHeader from 'web/components/table/header';
import TableRow from 'web/components/table/row';

import {createEntitiesTable} from '../../entities/table.js';
import {createEntitiesTable} from 'web/entities/table';

const Header = ({
currentSortBy,
Expand Down Expand Up @@ -89,7 +89,7 @@ const Row = ({entity}) => {
<TableData>
{hosts.count}
</TableData>
<TableData align="center">
<TableData>
<SeverityBar severity={severity}/>
</TableData>
</TableRow>
Expand Down
29 changes: 9 additions & 20 deletions gsa/src/web/pages/reports/table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ const Header = ({
<TableHeader>
<TableRow>
<TableHead
rowSpan="2"
width="25%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
Expand All @@ -62,7 +61,6 @@ const Header = ({
{_('Date')}
</TableHead>
<TableHead
rowSpan="2"
width="8%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
Expand All @@ -73,7 +71,6 @@ const Header = ({
</TableHead>
<TableHead
width="39%"
rowSpan="2"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'task' : false}
Expand All @@ -82,7 +79,6 @@ const Header = ({
{_('Task')}
</TableHead>
<TableHead
rowSpan="2"
width="8%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
Expand All @@ -91,22 +87,6 @@ const Header = ({
>
{_('Severity')}
</TableHead>
<TableHead
width="25%"
colSpan="5"
>
{_('Scan Results')}
</TableHead>
{isDefined(actionsColumn) ?
actionsColumn :
<TableHead
rowSpan="2"
width="8%"
align="center"
>{_('Actions')}</TableHead>
}
</TableRow>
<TableRow>
<TableHead
width="3%"
currentSortDir={currentSortDir}
Expand Down Expand Up @@ -152,6 +132,15 @@ const Header = ({
>
<SeverityClassLabel.FalsePositive/>
</TableHead>
{isDefined(actionsColumn) ?
actionsColumn :
<TableHead
width="8%"
align="center"
>
{_('Actions')}
</TableHead>
}
</TableRow>
</TableHeader>
);
Expand Down
5 changes: 3 additions & 2 deletions gsa/src/web/pages/reports/tlscertificatestable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ const Header = ({
{actions &&
<TableHead
width="5%"
align="center"
>
{_('Actions')}
</TableHead>
Expand Down Expand Up @@ -147,10 +148,10 @@ const Row = ({
<TableData>
{serial}
</TableData>
<TableData align="end">
<TableData>
{shortDate(notbefore)}
</TableData>
<TableData align="end">
<TableData>
{shortDate(notafter)}
</TableData>
<TableData>
Expand Down
Loading