diff --git a/CHANGELOG.md b/CHANGELOG.md index 01eb8007f5..29e6dd3217 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [8.0.1] - (unreleased) ### Added +- Add type column to scan configs to allow filter and sort by scan config type [#1331](https://github.com/greenbone/gsa/pull/1331) - Add new DefaultFilterSettings to UserSettings [#1326](https://github.com/greenbone/gsa/pull/1326) - Add warning for IE11 [#1322](https://github.com/greenbone/gsa/pull/1322) - Add tests for label and img [#1313](https://github.com/greenbone/gsa/pull/1313) diff --git a/gsa/src/gmp/models/scanconfig.js b/gsa/src/gmp/models/scanconfig.js index 4e1ff9b16f..4ed6425a85 100644 --- a/gsa/src/gmp/models/scanconfig.js +++ b/gsa/src/gmp/models/scanconfig.js @@ -25,6 +25,8 @@ import {parseInt} from '../parser'; import Model from '../model'; +import _ from '../locale'; + export const EMPTY_SCAN_CONFIG_ID = '085569ce-73ed-11df-83c3-002264764cea'; export const FULL_AND_FAST_SCAN_CONFIG_ID = 'daba56c8-73ec-11df-a475-002264764cea'; @@ -32,6 +34,12 @@ export const FULL_AND_FAST_SCAN_CONFIG_ID = export const OSP_SCAN_CONFIG_TYPE = 1; export const OPENVAS_SCAN_CONFIG_TYPE = 0; +export const getTranslatedType = config => { + return config.scan_config_type === OSP_SCAN_CONFIG_TYPE + ? _('OSP') + : _('OpenVAS'); +}; + export const parse_count = count => { return !isEmpty(count) && count !== '-1' ? parseInt(count) : undefined; }; diff --git a/gsa/src/web/pages/scanconfigs/header.js b/gsa/src/web/pages/scanconfigs/header.js index 9d4ccdc9da..3a2ecd6c9d 100644 --- a/gsa/src/web/pages/scanconfigs/header.js +++ b/gsa/src/web/pages/scanconfigs/header.js @@ -47,6 +47,16 @@ const Header = ({ > {_('Name')} + + {_('Type')} + {_('Family')} diff --git a/gsa/src/web/pages/scanconfigs/row.js b/gsa/src/web/pages/scanconfigs/row.js index 4d49f7b64c..f561632141 100644 --- a/gsa/src/web/pages/scanconfigs/row.js +++ b/gsa/src/web/pages/scanconfigs/row.js @@ -38,6 +38,7 @@ import PropTypes from 'web/utils/proptypes'; import {na} from 'web/utils/render'; import Trend from './trend'; +import {getTranslatedType} from 'gmp/models/scanconfig'; const ScanConfigActions = withEntitiesActions( ({ @@ -100,6 +101,7 @@ const ScanConfigRow = ({ displayName={_('Scan Config')} onToggleDetailsClick={onToggleDetailsClick} /> + {getTranslatedType(entity.scan_config_type)} {na(entity.families.count)}