Fix: Make report configs optional in alerts and reports

If the report configs are not available, the report export and alert dialogs will hide the report config fields. This will make the dialogs work as expected if the report config commands are disabled.
greenbone · Jul 22, 2024 · 158aaf7 · 158aaf7
1 parent a11f731
commit 158aaf7
Show file tree

Hide file tree

Showing 8 changed files with 125 additions and 74 deletions.
diff --git a/src/gmp/commands/alerts.js b/src/gmp/commands/alerts.js
@@ -9,6 +9,7 @@ import {map} from 'gmp/utils/array';
 
 import registerCommand from 'gmp/command';
 import {parseModelFromElement} from 'gmp/model';
+import {isDefined} from 'gmp/utils/identity';
 
 import Alert from 'gmp/models/alert';
 import Credential from 'gmp/models/credential';
@@ -190,10 +191,12 @@ class AlertCommand extends EntityCommand {
         new_alert.get_report_formats_response.report_format,
         format => parseModelFromElement(format, 'reportformat'),
       );
-      new_alert.report_configs = map(
-        new_alert.get_report_configs_response.report_config,
-        config => parseModelFromElement(config, 'reportconfig'),
-      );
+      if (isDefined(new_alert.get_report_configs_response)) {
+        new_alert.report_configs = map(
+          new_alert.get_report_configs_response.report_config,
+          config => parseModelFromElement(config, 'reportconfig'),
+        );
+      }
       new_alert.credentials = map(
         new_alert.get_credentials_response.credential,
         credential => Credential.fromElement(credential),
@@ -226,11 +229,13 @@ class AlertCommand extends EntityCommand {
       );
       delete edit_alert.get_report_formats_response;
 
-      edit_alert.report_configs = map(
-        edit_alert.get_report_configs_response.report_config,
-        config => parseModelFromElement(config, 'reportconfig'),
-      );
-      delete edit_alert.get_report_configs_response;
+      if (isDefined(edit_alert.get_report_configs_response)) {
+        edit_alert.report_configs = map(
+          edit_alert.get_report_configs_response.report_config,
+          config => parseModelFromElement(config, 'reportconfig'),
+        );
+        delete edit_alert.get_report_configs_response;
+      }
 
       edit_alert.credentials = map(
         edit_alert.get_credentials_response.credential,

diff --git a/src/web/pages/alerts/dialog.jsx b/src/web/pages/alerts/dialog.jsx
@@ -717,6 +717,7 @@ class AlertDialog extends React.Component {
               {values.method === METHOD_TYPE_SCP && (
                 <ScpMethodPart
                   prefix="method_data"
+                  capabilities={capabilities}
                   credentials={credentials}
                   reportConfigs={report_configs}
                   reportFormats={report_formats}
@@ -736,6 +737,7 @@ class AlertDialog extends React.Component {
               {values.method === METHOD_TYPE_SEND && (
                 <SendMethodPart
                   prefix="method_data"
+                  capabilities={capabilities}
                   sendHost={values.method_data_send_host}
                   sendPort={values.method_data_send_port}
                   sendReportConfig={values.method_data_send_report_config}
@@ -758,6 +760,7 @@ class AlertDialog extends React.Component {
               {values.method === METHOD_TYPE_SMB && (
                 <SmbMethodPart
                   prefix="method_data"
+                  capabilities={capabilities}
                   credentials={credentials}
                   reportConfigs={report_configs}
                   reportFormats={report_formats}
@@ -801,6 +804,7 @@ class AlertDialog extends React.Component {
               {values.method === METHOD_TYPE_VERINICE && (
                 <VeriniceMethodPart
                   prefix="method_data"
+                  capabilities={capabilities}
                   credentials={credentials}
                   reportConfigs={report_configs}
                   reportFormats={report_formats}

diff --git a/src/web/pages/alerts/emailmethodpart.jsx b/src/web/pages/alerts/emailmethodpart.jsx
@@ -199,16 +199,20 @@ const EmailMethodPart = ({
                       onChange={handleReportFormatIdChange}
                     />
                   )}
-
-                  <label htmlFor="report-config-select">Report Config</label>
-                  <Select
-                    disabled={notice !== EMAIL_NOTICE_INCLUDE}
-                    name={prefix + 'notice_report_config'}
-                    id="report-config-select"
-                    value={reportConfigIdInState}
-                    items={reportConfigItems}
-                    onChange={handleReportConfigIdChange}
-                  />
+                  {
+                    capabilities.mayOp("get_report_configs") &&
+                    <>
+                      <label htmlFor="report-config-select">Report Config</label>
+                      <Select
+                        disabled={notice !== EMAIL_NOTICE_INCLUDE}
+                        name={prefix + 'notice_report_config'}
+                        id="report-config-select"
+                        value={reportConfigIdInState}
+                        items={reportConfigItems}
+                        onChange={handleReportConfigIdChange}
+                      />
+                    </>
+                  }
                 </Divider>
 
                 <TextArea
@@ -251,15 +255,20 @@ const EmailMethodPart = ({
                         onChange={handleAttachFormatIdChange}
                       />
                     )}
-                    <label htmlFor="attach-config-select">Report Config</label>
-                    <Select
-                      disabled={notice !== EMAIL_NOTICE_ATTACH}
-                      name={prefix + 'notice_attach_config'}
-                      id="attach-config-select"
-                      value={attachConfigIdInState}
-                      items={attachConfigItems}
-                      onChange={handleAttachConfigIdChange}
-                    />
+                    {
+                      capabilities.mayOp('get_report_configs') &&
+                      <>
+                        <label htmlFor="attach-config-select">Report Config</label>
+                        <Select
+                          disabled={notice !== EMAIL_NOTICE_ATTACH}
+                          name={prefix + 'notice_attach_config'}
+                          id="attach-config-select"
+                          value={attachConfigIdInState}
+                          items={attachConfigItems}
+                          onChange={handleAttachConfigIdChange}
+                        />
+                      </>
+                    }
                   </Divider>
                 </Layout>
                 <TextArea

diff --git a/src/web/pages/alerts/scpmethodpart.jsx b/src/web/pages/alerts/scpmethodpart.jsx
@@ -31,6 +31,7 @@ import NewIcon from 'web/components/icon/newicon';
 
 const ScpMethodPart = ({
   prefix,
+  capabilities,
   credentials = [],
   reportFormats,
   reportConfigs,
@@ -136,20 +137,26 @@ const ScpMethodPart = ({
           items={renderSelectItems(reportFormats)}
           onChange={handleReportFormatIdChange}
         />
-        <label htmlFor="report-config-select">&nbsp; Report Config &nbsp; </label>
-        <Select
-          name={prefix + 'scp_report_config'}
-          id="report-config-select"
-          value={scpConfigIdInState}
-          items={reportConfigItems}
-          onChange={handleReportConfigIdChange}
-        />
+        {
+          capabilities.mayOp('get_report_configs') &&
+          <>
+            <label htmlFor="report-config-select">&nbsp; Report Config &nbsp; </label>
+            <Select
+              name={prefix + 'scp_report_config'}
+              id="report-config-select"
+              value={scpConfigIdInState}
+              items={reportConfigItems}
+              onChange={handleReportConfigIdChange}
+            />
+          </>
+        }
       </FormGroup>
     </Layout>
   );
 };
 
 ScpMethodPart.propTypes = {
+  capabilities: PropTypes.capabilities.isRequired,
   credentials: PropTypes.array,
   prefix: PropTypes.string,
   reportConfigs: PropTypes.array,

diff --git a/src/web/pages/alerts/sendmethodpart.jsx b/src/web/pages/alerts/sendmethodpart.jsx
@@ -21,6 +21,7 @@ import TextField from 'web/components/form/textfield';
 
 const SendMethodPart = ({
   prefix,
+  capabilities,
   reportConfigs,
   reportFormats,
   sendHost,
@@ -79,20 +80,26 @@ const SendMethodPart = ({
           items={renderSelectItems(reportFormats)}
           onChange={handleReportFormatIdChange}
         />
-        <label htmlFor="report-config-select">&nbsp; Report Config &nbsp; </label>
-        <Select
-          name={prefix + 'send_report_config'}
-          id="report-config-select"
-          value={sendConfigIdInState}
-          items={reportConfigItems}
-          onChange={handleReportConfigIdChange}
-        />
+        {
+          capabilities.mayOp('get_report_configs') &&
+          <>
+            <label htmlFor="report-config-select">&nbsp; Report Config &nbsp; </label>
+            <Select
+              name={prefix + 'send_report_config'}
+              id="report-config-select"
+              value={sendConfigIdInState}
+              items={reportConfigItems}
+              onChange={handleReportConfigIdChange}
+            />
+          </>
+        }
       </FormGroup>
     </Layout>
   );
 };
 
 SendMethodPart.propTypes = {
+  capabilities: PropTypes.capabilities.isRequired,
   prefix: PropTypes.string,
   reportConfigs: PropTypes.array,
   reportFormats: PropTypes.array,

diff --git a/src/web/pages/alerts/smbmethodpart.jsx b/src/web/pages/alerts/smbmethodpart.jsx
@@ -37,6 +37,7 @@ const smbMaxProtocolItems = [
 
 const SmbMethodPart = ({
   prefix,
+  capabilities,
   credentials = [],
   reportConfigs,
   reportFormats,
@@ -129,14 +130,19 @@ const SmbMethodPart = ({
           value={reportFormatIdInState}
           onChange={handleReportFormatIdChange}
         />
-        <label htmlFor="report-config-select">&nbsp; Report Config &nbsp; </label>
-        <Select
-          name={prefix + 'smb_report_config'}
-          id="report-config-select"
-          value={smbConfigIdInState}
-          items={reportConfigItems}
-          onChange={handleReportConfigIdChange}
-        />
+        {
+          capabilities.mayOp('get_report_configs') &&
+          <>
+            <label htmlFor="report-config-select">&nbsp; Report Config &nbsp; </label>
+            <Select
+              name={prefix + 'smb_report_config'}
+              id="report-config-select"
+              value={smbConfigIdInState}
+              items={reportConfigItems}
+              onChange={handleReportConfigIdChange}
+            />
+          </>
+        }
       </FormGroup>
 
       <FormGroup title={_('Max Protocol')}>
@@ -152,6 +158,7 @@ const SmbMethodPart = ({
 };
 
 SmbMethodPart.propTypes = {
+  capabilities: PropTypes.capabilities.isRequired,
   credentials: PropTypes.array,
   prefix: PropTypes.string,
   reportConfigs: PropTypes.array,

diff --git a/src/web/pages/alerts/verinicemethodpart.jsx b/src/web/pages/alerts/verinicemethodpart.jsx
@@ -27,6 +27,7 @@ const VERINICE_CREDENTIAL_TYPES = [USERNAME_PASSWORD_CREDENTIAL_TYPE];
 
 const VeriniceMethodPart = ({
   prefix,
+  capabilities,
   veriniceServerUrl,
   veriniceServerCredential,
   veriniceServerReportConfig,
@@ -102,20 +103,26 @@ const VeriniceMethodPart = ({
           value={reportFormatIdInState}
           onChange={handleReportFormatIdChange}
         />
-        <label htmlFor="report-config-select">&nbsp; Report Config &nbsp; </label>
-        <Select
-          name={prefix + 'verinice_server_report_config'}
-          id="report-config-select"
-          value={veriniceServerConfigIdInState}
-          items={reportConfigItems}
-          onChange={handleReportConfigIdChange}
-        />
+        {
+          capabilities.mayOp('get_report_configs') &&
+          <>
+            <label htmlFor="report-config-select">&nbsp; Report Config &nbsp; </label>
+            <Select
+              name={prefix + 'verinice_server_report_config'}
+              id="report-config-select"
+              value={veriniceServerConfigIdInState}
+              items={reportConfigItems}
+              onChange={handleReportConfigIdChange}
+            />
+          </>
+        }
       </FormGroup>
     </Layout>
   );
 };
 
 VeriniceMethodPart.propTypes = {
+  capabilities: PropTypes.capabilities,
   credentials: PropTypes.array,
   prefix: PropTypes.string,
   reportConfigs: PropTypes.array,

diff --git a/src/web/pages/reports/downloadreportdialog.jsx b/src/web/pages/reports/downloadreportdialog.jsx
@@ -95,9 +95,11 @@ const DownloadReportDialog = ({
       onSave={handleSave}
     >
       {({values, onValueChange}) => {
-        const filteredReportConfigs = reportConfigs.filter(
-          config => config.report_format.id === reportFormatIdInState,
-        );
+        const filteredReportConfigs = isDefined(reportConfigs)
+          ? reportConfigs.filter(
+              config => config.report_format.id === reportFormatIdInState,
+            )
+          : [];
 
         return (
           <Layout flex="column">
@@ -118,17 +120,20 @@ const DownloadReportDialog = ({
                 />
               </Divider>
             </FormGroup>
-            <FormGroup title={_('Report Config')} titleSize="3">
-              <Divider flex="column">
-                <Select
-                  name="reportConfigId"
-                  value={reportConfigIdInState}
-                  items={renderSelectItems(filteredReportConfigs, '')}
-                  width="auto"
-                  onChange={handleReportConfigIdChange}
-                />
-              </Divider>
-            </FormGroup>
+            {
+              isDefined(reportConfigs) &&
+              <FormGroup title={_('Report Config')} titleSize="3">
+                <Divider flex="column">
+                  <Select
+                    name="reportConfigId"
+                    value={reportConfigIdInState}
+                    items={renderSelectItems(filteredReportConfigs, '')}
+                    width="auto"
+                    onChange={handleReportConfigIdChange}
+                  />
+                </Divider>
+              </FormGroup>
+            }
             <StyledDiv>
               <CheckBox
                 name="storeAsDefault"