From 402a1c9130921281a21f6ec7243590ef79affc3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= <bjoern.ricks@greenbone.net>
Date: Mon, 15 Apr 2019 10:42:47 +0200
Subject: [PATCH 1/6] Remove openContentComposerDialog binding

The method is already called from a bind function. Therefore it doesn't
need to be bind too.
---
 gsa/src/web/pages/alerts/component.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gsa/src/web/pages/alerts/component.js b/gsa/src/web/pages/alerts/component.js
index 0b77e3e428..6152e10506 100644
--- a/gsa/src/web/pages/alerts/component.js
+++ b/gsa/src/web/pages/alerts/component.js
@@ -140,7 +140,6 @@ class AlertComponent extends React.Component {
     this.handleOpenContentComposerDialog = this.handleOpenContentComposerDialog.bind(
       this,
     );
-    this.openContentComposerDialog = this.openContentComposerDialog.bind(this);
     this.closeContentComposerDialog = this.closeContentComposerDialog.bind(
       this,
     );

From f36fdffc9f9dcba6ba32b7088b77822970928e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= <bjoern.ricks@greenbone.net>
Date: Mon, 15 Apr 2019 10:43:34 +0200
Subject: [PATCH 2/6] Always open content composer in alert dialog

Regardless of whether the displayed filter could be loaded always open
the content composer from the alert dialog.
---
 gsa/src/web/pages/alerts/component.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gsa/src/web/pages/alerts/component.js b/gsa/src/web/pages/alerts/component.js
index 6152e10506..6a4c62493a 100644
--- a/gsa/src/web/pages/alerts/component.js
+++ b/gsa/src/web/pages/alerts/component.js
@@ -243,15 +243,17 @@ class AlertComponent extends React.Component {
   handleOpenContentComposerDialog() {
     const {gmp} = this.props;
     const {composerFilterId = NO_VALUE} = this.state;
+
     gmp.filter.get({id: composerFilterId}).then(response => {
       this.setState({
         composerFilterString: isDefined(response.data)
           ? response.data.toFilterCriteriaString()
           : undefined,
       });
-      this.openContentComposerDialog();
-      this.handleInteraction();
     });
+
+    this.openContentComposerDialog();
+    this.handleInteraction();
   }
 
   closeContentComposerDialog() {

From 141027ec72295f63d4bb193b3aac2dbbcf5ea747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= <bjoern.ricks@greenbone.net>
Date: Mon, 15 Apr 2019 11:30:57 +0200
Subject: [PATCH 3/6] Don't pass filter string to alert content composer

This allows to remove loading of the filter from alerts component
because we get the used filter from the already passed list of filters.
---
 gsa/src/web/pages/alerts/component.js         | 29 +++----------------
 .../web/pages/alerts/contentcomposerdialog.js | 14 ++++-----
 2 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/gsa/src/web/pages/alerts/component.js b/gsa/src/web/pages/alerts/component.js
index 6a4c62493a..f93b464fa2 100644
--- a/gsa/src/web/pages/alerts/component.js
+++ b/gsa/src/web/pages/alerts/component.js
@@ -241,18 +241,8 @@ class AlertComponent extends React.Component {
   }
 
   handleOpenContentComposerDialog() {
-    const {gmp} = this.props;
-    const {composerFilterId = NO_VALUE} = this.state;
-
-    gmp.filter.get({id: composerFilterId}).then(response => {
-      this.setState({
-        composerFilterString: isDefined(response.data)
-          ? response.data.toFilterCriteriaString()
-          : undefined,
-      });
-    });
-
     this.openContentComposerDialog();
+
     this.handleInteraction();
   }
 
@@ -261,13 +251,11 @@ class AlertComponent extends React.Component {
       method_data_composer_include_notes,
       method_data_composer_include_overrides,
       filter_id,
-      filter_string,
     } = this.state;
     this.setState({
       composerIncludeNotes: method_data_composer_include_notes,
       composerIncludeOverrides: method_data_composer_include_overrides,
       composerFilterId: filter_id,
-      composerFilterString: filter_string,
       composerStoreAsDefault: NO_VALUE,
       contentComposerDialogVisible: false,
     });
@@ -292,7 +280,6 @@ class AlertComponent extends React.Component {
     }
     this.setState({
       filter_id: filterId,
-      filter_string: filterString,
       method_data_composer_include_notes: includeNotes,
       method_data_composer_include_overrides: includeOverrides,
       composerStoreAsDefault: NO_VALUE,
@@ -902,16 +889,10 @@ class AlertComponent extends React.Component {
   }
 
   handleFilterIdChange(value) {
-    const {gmp} = this.props;
-    gmp.filter.get({id: value}).then(response => {
-      const composerFilterString = isDefined(response.data)
-        ? response.data.toFilterCriteriaString()
-        : undefined;
-      this.setState({
-        composerFilterId: value,
-        composerFilterString,
-      });
+    this.setState({
+      composerFilterId: value,
     });
+
     this.handleInteraction();
   }
 
@@ -947,7 +928,6 @@ class AlertComponent extends React.Component {
       filters,
       filter_id,
       composerFilterId,
-      composerFilterString,
       composerIncludeNotes,
       composerIncludeOverrides,
       credentials,
@@ -1206,7 +1186,6 @@ class AlertComponent extends React.Component {
                 includeOverrides={parseYesNo(composerIncludeOverrides)}
                 filterId={composerFilterId}
                 filters={result_filters}
-                filterString={composerFilterString}
                 storeAsDefault={parseYesNo(composerStoreAsDefault)}
                 title={_('Compose Content for Scan Report')}
                 onChange={this.handleValueChange}
diff --git a/gsa/src/web/pages/alerts/contentcomposerdialog.js b/gsa/src/web/pages/alerts/contentcomposerdialog.js
index 505ff9efe7..6e469b9c32 100644
--- a/gsa/src/web/pages/alerts/contentcomposerdialog.js
+++ b/gsa/src/web/pages/alerts/contentcomposerdialog.js
@@ -46,9 +46,8 @@ const StyledDiv = styled.div`
 `;
 
 const ContentComposerDialog = ({
-  filterId,
-  filters,
-  filterString = '',
+  filterId = UNSET_VALUE,
+  filters = [],
   includeNotes = COMPOSER_CONTENT_DEFAULTS.includeNotes,
   includeOverrides = COMPOSER_CONTENT_DEFAULTS.includeOverrides,
   storeAsDefault,
@@ -57,12 +56,11 @@ const ContentComposerDialog = ({
   onSave,
   onChange,
 }) => {
-  filterId =
-    filterId === NO_VALUE || !isDefined(filterId) ? UNSET_VALUE : filterId;
+  const filter =
+    filterId === UNSET_VALUE ? undefined : filters.find(f => f.id === filterId);
 
   const controlledValues = {
     filterId,
-    filterString,
     includeNotes,
     includeOverrides,
     storeAsDefault,
@@ -81,7 +79,7 @@ const ContentComposerDialog = ({
           <FormGroup title={_('Report Result Filter')} titleSize="3">
             <Select
               name="filterId"
-              value={values.filterId}
+              value={filterId}
               items={renderSelectItems(filters, UNSET_VALUE)}
               onChange={onFilterIdChange}
             />
@@ -91,7 +89,7 @@ const ContentComposerDialog = ({
               'To change the filter, please select a filter' +
                 ' from the dropdown menu.',
             )}
-            filterString={values.filterString}
+            filterString={isDefined(filter) ? filter.toFilterString() : ''}
             includeNotes={values.includeNotes}
             includeOverrides={values.includeOverrides}
             onValueChange={onChange}

From 3b72a215dd0696161e09225510003cf613002d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= <bjoern.ricks@greenbone.net>
Date: Mon, 15 Apr 2019 11:33:49 +0200
Subject: [PATCH 4/6] Store undefined for unset report result filter

Within GSA we should use undefined for unset values. At both ends
(dialog and api) we should convert undefined to the expected (maybe
different like in this case) value.
---
 gsa/src/web/pages/alerts/component.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gsa/src/web/pages/alerts/component.js b/gsa/src/web/pages/alerts/component.js
index f93b464fa2..534f09a3f0 100644
--- a/gsa/src/web/pages/alerts/component.js
+++ b/gsa/src/web/pages/alerts/component.js
@@ -265,14 +265,13 @@ class AlertComponent extends React.Component {
     includeNotes,
     includeOverrides,
     filterId,
-    filterString,
     storeAsDefault,
   }) {
     if (storeAsDefault) {
       const {reportComposerDefaults} = this.props;
       const defaults = {
         ...reportComposerDefaults,
-        reportResultFilterId: filterId,
+        reportResultFilterId: filterId === UNSET_VALUE ? undefined : filterId,
         includeNotes,
         includeOverrides,
       };
@@ -443,10 +442,10 @@ class AlertComponent extends React.Component {
             name: alert.name,
             comment: alert.comment,
             filters,
-            filter_id: isDefined(alert.filter) ? alert.filter.id : NO_VALUE,
+            filter_id: isDefined(alert.filter) ? alert.filter.id : undefined,
             composerFilterId: isDefined(alert.filter)
               ? alert.filter.id
-              : NO_VALUE,
+              : undefined,
             composerIncludeNotes: getValue(method.data.composer_include_notes),
             composerIncludeOverrides: getValue(
               method.data.composer_include_overrides,
@@ -679,7 +678,7 @@ class AlertComponent extends React.Component {
             reportComposerDefaults.reportResultFilterId,
           )
             ? reportComposerDefaults.reportResultFilterId
-            : UNSET_VALUE;
+            : undefined;
 
           this.setState({
             active: undefined,
@@ -890,7 +889,7 @@ class AlertComponent extends React.Component {
 
   handleFilterIdChange(value) {
     this.setState({
-      composerFilterId: value,
+      composerFilterId: value === UNSET_VALUE ? undefined : value,
     });
 
     this.handleInteraction();

From 906ecc1e38d79749b18451530308857a79a5b675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= <bjoern.ricks@greenbone.net>
Date: Mon, 15 Apr 2019 11:41:47 +0200
Subject: [PATCH 5/6] Add changelog entry for alert report composer fix

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 2d07c1c40c..8b3c064f12 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,7 @@ $ cd gsa && git checkout gsa-8.0 && git log
 
 ## gsa 8.0.1 (unreleased)
 
+ * Fix opening alert report composer #1280 #1276
  * Remove fifth from schedule #1279
  * Fix showing authentication methods in user dialog #1278
  * Fix Result details page #1275

From 1bf7558bc2a124862d27ffeb39164f714c8818ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= <bjoern.ricks@greenbone.net>
Date: Mon, 15 Apr 2019 12:12:57 +0200
Subject: [PATCH 6/6] Don't require filter_id param for create_alert

Don't require a filter_id parameter to be passed to create_alert_gmp
function. The filter_id parameter is optional in GMP.
---
 gsad/src/gsad_gmp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gsad/src/gsad_gmp.c b/gsad/src/gsad_gmp.c
index fe38749df0..c9054d8a6e 100644
--- a/gsad/src/gsad_gmp.c
+++ b/gsad/src/gsad_gmp.c
@@ -5718,7 +5718,6 @@ create_alert_gmp (gvm_connection_t *connection, credentials_t *credentials,
   CHECK_VARIABLE_INVALID (condition, "Create Alert");
   CHECK_VARIABLE_INVALID (event, "Create Alert");
   CHECK_VARIABLE_INVALID (method, "Create Alert");
-  CHECK_VARIABLE_INVALID (filter_id, "Create Alert");
 
   /* Create the alert. */
 
@@ -5752,7 +5751,8 @@ create_alert_gmp (gvm_connection_t *connection, credentials_t *credentials,
                      "<active>%s</active>"
                      "<comment>%s</comment>"
                      "<event>%s",
-                     name, filter_id, active, comment ? comment : "", event);
+                     name, filter_id ? filter_id : "", active,
+                     comment ? comment : "", event);
 
   append_alert_event_data (xml, event_data, event);