Save alert and RFP to report content composer defaults

gsa/src/web/pages/reports/alertactions.js

@@ -99,6 +99,7 @@ class AlertActions extends React.Component {
       filter,
       gmp,
       report,
+      reportComposerDefaults,
       showErrorMessage,
       showSuccessMessage,
     } = this.props;
@@ -112,7 +113,9 @@ class AlertActions extends React.Component {
 
     if (storeAsDefault) {
       this.props.saveReportComposerDefaults({
+        ...reportComposerDefaults,
         applyOverrides,
+        defaultAlertId: alertId,
         includeNotes,
         includeOverrides,
       });
@@ -124,7 +127,10 @@ class AlertActions extends React.Component {
       filter: newFilter.simple(),
     }).then(response => {
       showSuccessMessage(_('Running the alert was successful'));
-      this.setState({showTriggerAlertDialog: false});
+      this.setState({
+        alertId: undefined,
+        showTriggerAlertDialog: false,
+      });
     }, error => {
         log.error('Failed running alert', error);
         showErrorMessage(_('Failed to run alert.'));
@@ -136,7 +142,6 @@ class AlertActions extends React.Component {
   handleOpenTriggerAlertDialog() {
     this.props.loadAlerts();
     this.setState({
-      ...this.props.reportComposerDefaults,
       showTriggerAlertDialog: true,
     });
   }
@@ -157,15 +162,13 @@ class AlertActions extends React.Component {
   render() {
     const {
       alerts,
+      reportComposerDefaults,
       filter,
       showError,
       onInteraction,
     } = this.props;
     const {
       alertId,
-      applyOverrides,
-      includeNotes,
-      includeOverrides,
       showTriggerAlertDialog,
       storeAsDefault,
     } = this.state;
@@ -188,10 +191,11 @@ class AlertActions extends React.Component {
               <TriggerAlertDialog
                 alertId={alertId}
                 alerts={alerts}
-                applyOverrides={applyOverrides}
+                applyOverrides={reportComposerDefaults.applyOverrides}
+                defaultAlertId={reportComposerDefaults.defaultAlertId}
                 filter={filter}
-                includeNotes={includeNotes}
-                includeOverrides={includeOverrides}
+                includeNotes={reportComposerDefaults.includeNotes}
+                includeOverrides={reportComposerDefaults.includeOverrides}
                 storeAsDefault={storeAsDefault}
                 onAlertChange={this.handleAlertChange}
                 onClose={this.handleCloseTriggerAlertDialog}

gsa/src/web/pages/reports/detailspage.js

@@ -361,7 +361,6 @@ class ReportDetails extends React.Component {
 
   handleOpenDownloadReportDialog() {
     this.setState({
-      ...this.props.reportComposerDefaults,
       showDownloadReportDialog: true,
     });
   }
@@ -376,6 +375,7 @@ class ReportDetails extends React.Component {
       entity,
       filter,
       gmp,
+      reportComposerDefaults,
       reportFormats = [],
       onDownload,
     } = this.props;
@@ -394,7 +394,9 @@ class ReportDetails extends React.Component {
 
     if (storeAsDefault) {
       const defaults = {
+        ...reportComposerDefaults,
         applyOverrides,
+        defaultReportFormatId: reportFormatId,
         includeNotes,
         includeOverrides,
       };
@@ -520,16 +522,14 @@ class ReportDetails extends React.Component {
       isLoading,
       reportFormats,
       onInteraction,
+      reportComposerDefaults,
       showError,
       showErrorMessage,
       showSuccessMessage,
     } = this.props;
     const {
       activeTab,
       applyOverrides,
-      includeNotes,
-      includeOverrides,
-      reportFormatId,
       showFilterDialog,
       showDownloadReportDialog,
       sorting,
@@ -550,8 +550,6 @@ class ReportDetails extends React.Component {
               filter={filter}
               filters={filters}
               isLoading={isLoading}
-              reportFormatId={reportFormatId}
-              reportFormats={reportFormats}
               sorting={sorting}
               onActivateTab={this.handleActivateTab}
               onAddToAssetsClick={this.handleAddToAssets}
@@ -589,10 +587,10 @@ class ReportDetails extends React.Component {
         {showDownloadReportDialog &&
           <DownloadReportDialog
             applyOverrides={applyOverrides}
+            defaultReportFormatId={reportComposerDefaults.defaultReportFormatId}
             filter={filter}
-            includeNotes={includeNotes}
-            includeOverrides={includeOverrides}
-            reportFormatId={reportFormatId}
+            includeNotes={reportComposerDefaults.includeNotes}
+            includeOverrides={reportComposerDefaults.includeOverrides}
             reportFormats={reportFormats}
             storeAsDefault={storeAsDefault}
             onClose={this.handleCloseDownloadReportDialog}

gsa/src/web/pages/reports/downloadreportdialog.js

@@ -25,6 +25,7 @@ import _ from 'gmp/locale';
 
 import {NO_VALUE, YES_VALUE} from 'gmp/parser';
 
+import {selectSaveId} from 'gmp/utils/id';
 import {isString} from 'gmp/utils/identity';
 import PropTypes from 'web/utils/proptypes';
 import {renderSelectItems} from 'web/utils/render';
@@ -46,6 +47,7 @@ const StyledDiv = styled.div`
 
 const DownloadReportDialog = ({
   applyOverrides = COMPOSER_CONTENT_DEFAULTS.applyOverrides,
+  defaultReportFormatId,
   filter = {},
   includeNotes = COMPOSER_CONTENT_DEFAULTS.includeNotes,
   includeOverrides = COMPOSER_CONTENT_DEFAULTS.includeOverrides,
@@ -58,6 +60,8 @@ const DownloadReportDialog = ({
   const filterString = isString(filter) ?
     filter : filter.toFilterCriteriaString();
 
+  reportFormatId = selectSaveId(reportFormats, defaultReportFormatId);
+
   const unControlledValues = {
     applyOverrides,
     includeNotes,
@@ -92,6 +96,7 @@ const DownloadReportDialog = ({
                 name="reportFormatId"
                 value={values.reportFormatId}
                 items={renderSelectItems(reportFormats)}
+                width="auto"
                 onChange={onValueChange}
               />
             </Divider>
@@ -114,6 +119,7 @@ const DownloadReportDialog = ({
 
 DownloadReportDialog.propTypes = {
   applyOverrides: PropTypes.numberOrNumberString,
+  defaultReportFormatId: PropTypes.id,
   filter: PropTypes.filter.isRequired,
   includeNotes: PropTypes.number,
   includeOverrides: PropTypes.number,

gsa/src/web/pages/reports/triggeralertdialog.js

@@ -25,7 +25,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 +50,7 @@ const TriggerAlertDialog = ({
   alertId,
   alerts = [],
   applyOverrides = COMPOSER_CONTENT_DEFAULTS.applyOverrides,
+  defaultAlertId,
   filter = {},
   includeNotes = COMPOSER_CONTENT_DEFAULTS.includeNotes,
   includeOverrides = COMPOSER_CONTENT_DEFAULTS.includeOverrides,
@@ -59,11 +60,14 @@ const TriggerAlertDialog = ({
   onNewAlertClick,
   onSave,
 }) => {
-  alertId = isDefined(alertId) ? alertId : first(alerts).id;
 
   const filterString = isString(filter) ?
     filter : filter.toFilterCriteriaString();
 
+  if (!isDefined(alertId)) {
+    alertId = selectSaveId(alerts, defaultAlertId);
+  };
+
   const unControlledValues = {
     applyOverrides,
     includeNotes,
@@ -129,6 +133,7 @@ TriggerAlertDialog.propTypes = {
   alertId: PropTypes.id,
   alerts: PropTypes.array,
   applyOverrides: PropTypes.numberOrNumberString,
+  defaultAlertId: PropTypes.id,
   filter: PropTypes.filter.isRequired,
   includeNotes: PropTypes.number,
   includeOverrides: PropTypes.number,

gsa/src/web/store/usersettings/__tests__/reducers.js

@@ -113,10 +113,17 @@ describe('settings reducers tests', () => {
       expect(reportComposerDefaults(undefined, action)).toEqual({foo: 'bar'});
     });
 
-    test('should override existing defaults', () => {
+    test('should merge existing defaults', () => {
       const action = getReportComposerDefaultsAction({foo: 'bar'});
-      const state = {toBe: 'deleted'};
-      expect(reportComposerDefaults(state, action)).toEqual({foo: 'bar'});
+      const state = {
+        foo: 'ipsum',
+        toBe: 'preserved',
+      };
+      const res = {
+        foo: 'bar',
+        toBe: 'preserved',
+      };
+      expect(reportComposerDefaults(state, action)).toEqual(res);
     });
   });
 });

gsa/src/web/store/usersettings/reducers.js

@@ -32,7 +32,10 @@ import {
 export const reportComposerDefaults = (state = {}, action) => {
   switch (action.type) {
     case USER_SETTINGS_LOAD_REPORT_COMPOSER_DEFAULTS_SUCCESS:
-      return action.data;
+      return {
+        ...state,
+        ...action.data,
+      };
     default:
       return state;
   }