Save selected alert to report content composer defaults

greenbone · Dec 11, 2018 · 8e8a002 · 8e8a002
1 parent 1af48c9
commit 8e8a002
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/gsa/src/web/pages/reports/alertactions.js b/gsa/src/web/pages/reports/alertactions.js
@@ -113,6 +113,7 @@ class AlertActions extends React.Component {
     if (storeAsDefault) {
       this.props.saveReportComposerDefaults({
         applyOverrides,
+        defaultAlertId: alertId,
         includeNotes,
         includeOverrides,
       });
@@ -164,6 +165,7 @@ class AlertActions extends React.Component {
     const {
       alertId,
       applyOverrides,
+      defaultAlertId,
       includeNotes,
       includeOverrides,
       showTriggerAlertDialog,
@@ -189,6 +191,7 @@ class AlertActions extends React.Component {
                 alertId={alertId}
                 alerts={alerts}
                 applyOverrides={applyOverrides}
+                defaultAlertId={defaultAlertId}
                 filter={filter}
                 includeNotes={includeNotes}
                 includeOverrides={includeOverrides}

diff --git a/gsa/src/web/pages/reports/triggeralertdialog.js b/gsa/src/web/pages/reports/triggeralertdialog.js
@@ -26,6 +26,7 @@ import _ from 'gmp/locale';
 import {NO_VALUE, YES_VALUE} from 'gmp/parser';
 
 import {first} from 'gmp/utils/array';
+import {selectSaveId} from 'gmp/utils/id';
 import {isDefined, isString} from 'gmp/utils/identity';
 import PropTypes from 'web/utils/proptypes';
 import {renderSelectItems} from 'web/utils/render';
@@ -50,6 +51,7 @@ const TriggerAlertDialog = ({
   alertId,
   alerts = [],
   applyOverrides = COMPOSER_CONTENT_DEFAULTS.applyOverrides,
+  defaultAlertId,
   filter = {},
   includeNotes = COMPOSER_CONTENT_DEFAULTS.includeNotes,
   includeOverrides = COMPOSER_CONTENT_DEFAULTS.includeOverrides,
@@ -64,6 +66,10 @@ const TriggerAlertDialog = ({
   const filterString = isString(filter) ?
     filter : filter.toFilterCriteriaString();
 
+    if (isDefined(defaultAlertId)) {
+      alertId = selectSaveId(alerts, defaultAlertId);
+    };
+
   const unControlledValues = {
     applyOverrides,
     includeNotes,