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

Notes and overrides indicators #898

Merged
merged 2 commits into from
Aug 30, 2018
Merged

Notes and overrides indicators #898

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d6af29
Update imports
swaterkamp Aug 30, 2018
f9d3af1
Add indicator to results whether notes or overrides are defined
swaterkamp Aug 30, 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
50 changes: 39 additions & 11 deletions gsa/src/web/pages/results/row.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
*
* Authors:
* Björn Ricks <bjoern.ricks@greenbone.net>
* Seffen Waterkamp <steffen.waterkamp@greenbone.net>
*
* Copyright:
* Copyright (C) 2017 - 2018 Greenbone Networks GmbH
Expand All @@ -23,27 +24,33 @@

import React from 'react';

import _ from 'gmp/locale';

import {longDate} from 'gmp/locale/date';

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

import {shorten} from 'gmp/utils/string';

import PropTypes from '../../utils/proptypes.js';
import {renderComponent} from '../../utils/render.js';
import PropTypes from 'web/utils/proptypes';
import {renderComponent} from 'web/utils/render';

import {withEntityRow, RowDetailsToggle} from 'web/entities/row';

import {withEntityRow, RowDetailsToggle} from '../../entities/row.js';
import SeverityBar from 'web/components/bar/severitybar';

import SeverityBar from '../../components/bar/severitybar.js';
import Icon from 'web/components/icon/icon';
import SolutionTypeIcon from 'web/components/icon/solutiontypeicon';

import SolutionTypeIcon from '../../components/icon/solutiontypeicon.js';
import IconDivider from 'web/components/layout/icondivider';
import Layout from 'web/components/layout/layout';

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

import TableRow from '../../components/table/row.js';
import TableData from '../../components/table/data.js';
import TableRow from 'web/components/table/row';
import TableData from 'web/components/table/data';

import ResultDelta from './delta.js';
import ResultDelta from './delta';

const Row = ({
actions,
Expand All @@ -56,7 +63,10 @@ const Row = ({
const {host} = entity;
const shown_name = isDefined(entity.name) ? entity.name : entity.nvt.oid;
const has_tags = isDefined(entity.nvt) && isDefined(entity.nvt.tags);

const hasActiveNotes =
entity.notes.filter(note => note.isActive()).length > 0;
const hasActiveOverrides =
entity.overrides.filter(override => override.isActive()).length > 0;
return (
<TableRow>
{delta &&
Expand All @@ -73,7 +83,25 @@ const Row = ({
name={entity.id}
onClick={onToggleDetailsClick}
>
{shown_name}
<Layout flex align="space-between">
<span>
{shown_name}
</span>
<IconDivider>
{hasActiveNotes &&
<Icon
img="new_note.svg"
title={_('There are notes for this result')}
/>
}
{hasActiveOverrides &&
<Icon
img="new_override.svg"
title={_('There are overrides for this result')}
/>
}
</IconDivider>
</Layout>
</RowDetailsToggle>
</TableData>
<TableData flex align="center">
Expand Down