Initialize severity value with 0 in powerfilter (backport #3031)

CHANGELOG.md

@@ -4,12 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [Unreleased]
+## [21.4.2] (unreleased)
 ### Added
 ### Changed
 ### Deprecated
 ### Removed
 ### Fixed
+- Initialize severity value with 0 in powerfilter SeverityValuesGroup [#3031](https://github.com/greenbone/gsa/pull/3031)
 
 [Unreleased]: https://github.com/greenbone/gsa/compare/v21.4.1...gsa-21.04
 

gsa/src/web/components/powerfilter/__tests__/__snapshots__/severityvaluesgroup.js.snap

@@ -470,7 +470,7 @@ exports[`Severity Values Group Tests should render 1`] = `
         <input
           max="10"
           min="0"
-          name="cvss_base"
+          name="severity"
           size="5"
           value="3"
         />

gsa/src/web/components/powerfilter/__tests__/severityvaluesgroup.js

@@ -31,8 +31,8 @@ import Filter from 'gmp/models/filter';
 
 describe('Severity Values Group Tests', () => {
   test('should render', () => {
-    const filter = Filter.fromString('cvss_base>3');
-    const name = 'cvss_base';
+    const filter = Filter.fromString('severity>3');
+    const name = 'severity';
     const onChange = jest.fn();
 
     const {element} = render(
@@ -49,8 +49,8 @@ describe('Severity Values Group Tests', () => {
 
   test('arguments are processed correctly', () => {
     const onChange = jest.fn();
-    const filter = Filter.fromString('cvss_base=3');
-    const name = 'cvss_base';
+    const filter = Filter.fromString('severity=3');
+    const name = 'severity';
 
     const {element} = render(
       <SeverityValuesGroup
@@ -65,14 +65,34 @@ describe('Severity Values Group Tests', () => {
     const numField = element.querySelectorAll('input');
 
     expect(formTitle[0]).toHaveTextContent('foo');
-    expect(numField[0]).toHaveAttribute('name', 'cvss_base');
+    expect(numField[0]).toHaveAttribute('name', 'severity');
     expect(numField[0]).toHaveAttribute('value', '3');
   });
 
+  test('should initialize value with 0 in case no filter value is given', () => {
+    const onChange = jest.fn();
+    const filter = Filter.fromString('rows=10');
+    const name = 'severity';
+
+    const {element} = render(
+      <SeverityValuesGroup
+        filter={filter}
+        name={name}
+        title="foo"
+        onChange={onChange}
+      />,
+    );
+
+    const numField = element.querySelectorAll('input');
+
+    expect(numField[0]).toHaveAttribute('name', 'severity');
+    expect(numField[0]).toHaveAttribute('value', '0');
+  });
+
   test('should change value', () => {
     const onChange = jest.fn();
-    const filter = Filter.fromString('cvss_base=3');
-    const name = 'cvss_base';
+    const filter = Filter.fromString('severity=3');
+    const name = 'severity';
 
     const {element} = render(
       <SeverityValuesGroup
@@ -87,13 +107,13 @@ describe('Severity Values Group Tests', () => {
 
     fireEvent.change(numField[0], {target: {value: '9'}});
 
-    expect(onChange).toHaveBeenCalledWith(9, 'cvss_base', '=');
+    expect(onChange).toHaveBeenCalledWith(9, 'severity', '=');
   });
 
   test('should change relationship', () => {
     const onChange = jest.fn();
-    const filter = Filter.fromString('cvss_base=3');
-    const name = 'cvss_base';
+    const filter = Filter.fromString('severity=3');
+    const name = 'severity';
 
     const {element, baseElement} = render(
       <SeverityValuesGroup
@@ -111,6 +131,6 @@ describe('Severity Values Group Tests', () => {
     fireEvent.click(domItems[2]);
 
     expect(onChange).toBeCalled();
-    expect(onChange).toBeCalledWith(3, 'cvss_base', '<');
+    expect(onChange).toBeCalledWith(3, 'severity', '<');
   });
 });

gsa/src/web/components/powerfilter/severityvaluesgroup.js

@@ -37,7 +37,7 @@ const SeverityValuesGroup = ({filter, name, title, onChange}) => {
    */
 
   const term = filter.getTerm(name);
-  const severity = isDefined(term) ? parseSeverity(term.value) : undefined;
+  const severity = isDefined(term) ? parseSeverity(term.value) : 0;
 
   const [rel, setRel] = useState(isDefined(term) ? term.relation : '='); // here rel is set to '='
   const keyword = name;

gsa/src/web/pages/results/filterdialog.js

@@ -119,7 +119,7 @@ const ResultsFilterDialogComponent = ({
       />
 
       <SeverityValuesGroup
-        name="cvss_base"
+        name="severity"
         filter={filter}
         title={_('Severity')}
         onChange={onFilterValueChange}