Load vFire method_data fields when opening EditAlertDialog

greenbone · Dec 20, 2018 · acf94cd · acf94cd
1 parent 88bafbb
commit acf94cd
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/gsa/src/web/pages/alerts/alembavfiremethodpart.js b/gsa/src/web/pages/alerts/alembavfiremethodpart.js
@@ -60,6 +60,7 @@ const AlembaVfireMethodPart = ({
   onChange,
   onCredentialChange,
   onNewVfireCredentialClick,
+  onReportFormatsChange,
 }) => {
   credentials = credentials.filter(
     cred => cred.credential_type === USERNAME_PASSWORD_CREDENTIAL_TYPE);
@@ -73,7 +74,7 @@ const AlembaVfireMethodPart = ({
           name={'report_format_ids'}
           items={renderSelectItems(reportFormats)}
           value={reportFormatIds}
-          onChange={onChange}
+          onChange={onReportFormatsChange}
         />
       </FormGroup>
 
@@ -215,6 +216,7 @@ AlembaVfireMethodPart.propTypes = {
   onChange: PropTypes.func.isRequired,
   onCredentialChange: PropTypes.func.isRequired,
   onNewVfireCredentialClick: PropTypes.func.isRequired,
+  onReportFormatsChange: PropTypes.func.isRequired,
 };
 
 export default withPrefix(AlembaVfireMethodPart);

diff --git a/gsa/src/web/pages/alerts/component.js b/gsa/src/web/pages/alerts/component.js
@@ -122,6 +122,7 @@ class AlertComponent extends React.Component {
       this.handleTippingPointCredentialChange.bind(this);
     this.handleVfireCredentialChange =
       this.handleVfireCredentialChange.bind(this);
+    this.handleReportFormatsChange = this.handleReportFormatsChange.bind(this);
 
     this.openAlertDialog = this.openAlertDialog.bind(this);
     this.handleCloseAlertDialog = this.handleCloseAlertDialog.bind(this);
@@ -344,7 +345,7 @@ class AlertComponent extends React.Component {
           result_filters,
           secinfo_filters,
           report_formats,
-          report_format_ids: alert.reportFormatIds,
+          report_format_ids: method.data.report_formats,
 
           condition: condition.type,
           condition_data_count: parseInt(value(condition.data.count, 1)),
@@ -599,6 +600,10 @@ class AlertComponent extends React.Component {
     this.setState({method_data_vfire_credential: credential});
   }
 
+  handleReportFormatsChange(report_format_ids) {
+    this.setState({report_format_ids});
+  }
+
   handleInteraction() {
     const {onInteraction} = this.props;
     if (isDefined(onInteraction)) {
@@ -833,6 +838,7 @@ class AlertComponent extends React.Component {
                   this.handleInteraction();
                   return save(d).then(() => this.closeAlertDialog());
                 }}
+                onReportFormatsChange={this.handleReportFormatsChange}
                 onEmailCredentialChange={this.handleEmailCredentialChange}
                 onScpCredentialChange={this.handleScpCredentialChange}
                 onSmbCredentialChange={this.handleSmbCredentialChange}

diff --git a/gsa/src/web/pages/alerts/dialog.js b/gsa/src/web/pages/alerts/dialog.js
@@ -335,6 +335,7 @@ class AlertDialog extends React.Component {
       onNewVeriniceCredentialClick,
       onNewVfireCredentialClick,
       onNewTippingPointCredentialClick,
+      onReportFormatsChange,
       onSave,
       onScpCredentialChange,
       onSmbCredentialChange,
@@ -403,7 +404,15 @@ class AlertDialog extends React.Component {
     const data = {
       ...DEFAULTS,
       ...alert,
-      report_format_ids,
+      method_data_vfire_base_url,
+      method_data_vfire_client_id,
+      method_data_vfire_call_partition_name,
+      method_data_vfire_call_description,
+      method_data_vfire_call_template_name,
+      method_data_vfire_call_type_name,
+      method_data_vfire_call_impact_name,
+      method_data_vfire_call_urgency_name,
+      method_data_vfire_session_type,
     };
 
     for (const [key, value] of Object.entries(props)) {
@@ -419,6 +428,7 @@ class AlertDialog extends React.Component {
       method_data_tp_sms_credential,
       method_data_verinice_server_credential,
       method_data_vfire_credential,
+      report_format_ids,
     };
 
     return (
@@ -756,6 +766,7 @@ class AlertDialog extends React.Component {
                   vFireSessionType={values.method_data_vfire_session_type}
                   onChange={onValueChange}
                   onCredentialChange={onVfireCredentialChange}
+                  onReportFormatsChange={onReportFormatsChange}
                   onNewVfireCredentialClick={onNewVfireCredentialClick}
                 />
               }
@@ -857,6 +868,7 @@ AlertDialog.propTypes = {
   onNewTippingPointCredentialClick: PropTypes.func.isRequired,
   onNewVeriniceCredentialClick: PropTypes.func.isRequired,
   onNewVfireCredentialClick: PropTypes.func.isRequired,
+  onReportFormatsChange: PropTypes.func.isRequired,
   onSave: PropTypes.func.isRequired,
   onScpCredentialChange: PropTypes.func.isRequired,
   onSmbCredentialChange: PropTypes.func.isRequired,