From c80f0ea2a9d5ae0738f0c6c9d55d9f662762ddbb Mon Sep 17 00:00:00 2001
From: RBickert <rbt@mm-software.com>
Date: Wed, 5 Oct 2022 10:53:17 +0200
Subject: [PATCH 1/2] Add new info in alerts view

Change "Limit to projects" to "Limit to projects (including all of their
active children)" to indicate that every child of a subscribed project
will also be included in the notification rule.

Signed-off-by: RBickert <rbt@mm-software.com>
---
 src/i18n/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index e7e34551f..72931f3fe 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -487,7 +487,7 @@
     "destination": "Destination",
     "delete_alert": "Delete Alert",
     "limit_to": "Limit To",
-    "limit_to_projects": "Limit to projects",
+    "limit_to_projects": "Limit to projects (including all of their active children)",
     "limit_to_tags": "Limit to Tags",
     "alert_created": "Alert created",
     "alert_deleted": "Alert deleted",

From b03b122760184fa2f981eb6ae3e0563c144dcb3e Mon Sep 17 00:00:00 2001
From: RBickert <rbt@mm-software.com>
Date: Tue, 18 Oct 2022 13:11:23 +0200
Subject: [PATCH 2/2] Make inclusion of children optional

Added a switch in the alerts view which optionally includes every active
child of the subscribed projects in the notification rule.

Signed-off-by: RBickert <rbt@mm-software.com>
---
 src/i18n/locales/en.json                          | 3 ++-
 src/views/administration/notifications/Alerts.vue | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index dc739bdc5..c2b034a9f 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -497,7 +497,8 @@
     "destination": "Destination",
     "delete_alert": "Delete Alert",
     "limit_to": "Limit To",
-    "limit_to_projects": "Limit to projects (including all of their active children)",
+    "limit_to_projects": "Limit to projects",
+    "include_children": "Include active children of projects",
     "limit_to_tags": "Limit to Tags",
     "alert_created": "Alert created",
     "alert_deleted": "Alert deleted",
diff --git a/src/views/administration/notifications/Alerts.vue b/src/views/administration/notifications/Alerts.vue
index 4efe1ec62..f2fe2af6d 100644
--- a/src/views/administration/notifications/Alerts.vue
+++ b/src/views/administration/notifications/Alerts.vue
@@ -155,6 +155,10 @@
                         <actionable-list-group-item :add-icon="true" v-on:actionClicked="$root.$emit('bv::show::modal', 'selectProjectModal')"/>
                       </div>
                     </b-form-group>
+                  <div v-if="limitToVisible === true">
+                      <c-switch id="isNotifyChildrenEnabled" color="primary" v-model="notifyChildren" label v-bind="labelIcon"/>
+                      {{ $t('admin.include_children') }}
+                  </div>
                   </b-col>
                   <b-col sm="6">
                     <b-form-group id="fieldset-5" :label="this.$t('admin.scope')" label-for="input-5">
@@ -209,6 +213,7 @@
                   uuid: row.uuid,
                   name: row.name,
                   enabled: row.enabled,
+                  notifyChildren: row.notifyChildren,
                   publisherClass: row.publisher.publisherClass,
                   notificationLevel: row.notificationLevel,
                   destination: this.parseDestination(row),
@@ -230,6 +235,9 @@
                 enabled() {
                   this.updateNotificationRule();
                 },
+                notifyChildren() {
+                  this.updateNotificationRule();
+                },
                 notifyOn() {
                   this.updateNotificationRule();
                 },
@@ -260,6 +268,7 @@
                     uuid: this.uuid,
                     name: this.name,
                     enabled: this.enabled,
+                    notifyChildren: this.notifyChildren,
                     notificationLevel: this.notificationLevel,
                     publisherConfig: JSON.stringify({ destination: this.destination }),
                     notifyOn: this.notifyOn