From 8aac7bccbe47c1815af1d094a2a3562d4052249c Mon Sep 17 00:00:00 2001
From: dgtlmoon <dgtlmoon@gmail.com>
Date: Wed, 3 Apr 2024 16:52:42 +0200
Subject: [PATCH] "Send Test Notification" - Now provides better feedback and
 works with the actual values in system settings form

---
 changedetectionio/flask_app.py               | 16 +++++++++-------
 changedetectionio/static/js/notifications.js |  2 +-
 changedetectionio/templates/settings.html    |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/changedetectionio/flask_app.py b/changedetectionio/flask_app.py
index e2302db5..25aea8a7 100644
--- a/changedetectionio/flask_app.py
+++ b/changedetectionio/flask_app.py
@@ -519,26 +519,28 @@ def changedetection_app(config=None, datastore_o=None):
         notification_urls = request.form['notification_urls'].strip().splitlines()
 
         if not notification_urls:
-            logger.debug("Test notification - Trying by group/tag")
-            if request.form['tags'].strip():
+            logger.debug("Test notification - Trying by group/tag in the edit form if available")
+            # On an edit page, we should also fire off to the tags if they have notifications
+            if request.form.get('tags') and request.form['tags'].strip():
                 for k in request.form['tags'].split(','):
                     tag = datastore.tag_exists_by_name(k.strip())
                     notification_urls = tag.get('notifications_urls') if tag and tag.get('notifications_urls') else None
 
-        if not notification_urls:
+        is_global_settings_form = request.args.get('mode', '') == 'global-settings'
+        if not notification_urls and not is_global_settings_form:
+            # In the global settings, use only what is typed currently in the text box
             logger.debug("Test notification - Trying by global system settings notifications")
             if datastore.data['settings']['application'].get('notification_urls'):
                 notification_urls = datastore.data['settings']['application']['notification_urls']
 
 
         if not notification_urls:
-            return make_response({'error': 'No Notification URLs set'}, 400)
+            return 'No Notification URLs set/found'
 
         for n_url in notification_urls:
             if len(n_url.strip()):
                 if not apobj.add(n_url):
-                    message = '{} is not a valid AppRise URL.'.format(n_url)
-                    return make_response({'error': message}, 400)
+                    return f'Error - {n_url} is not a valid AppRise URL.'
 
         try:
             # use the same as when it is triggered, but then override it with the form test values
@@ -563,7 +565,7 @@ def changedetection_app(config=None, datastore_o=None):
         except Exception as e:
             return make_response({'error': str(e)}, 400)
 
-        return 'OK'
+        return 'OK - Sent test notifications'
 
 
     @app.route("/clear_history/<string:uuid>", methods=['GET'])
diff --git a/changedetectionio/static/js/notifications.js b/changedetectionio/static/js/notifications.js
index 2c2e9c61..d3a0b81a 100644
--- a/changedetectionio/static/js/notifications.js
+++ b/changedetectionio/static/js/notifications.js
@@ -45,7 +45,7 @@ $(document).ready(function() {
       }
     }).done(function(data){
       console.log(data);
-      alert('Sent');
+      alert(data);
     }).fail(function(data){
       console.log(data);
       alert('There was an error communicating with the server.');
diff --git a/changedetectionio/templates/settings.html b/changedetectionio/templates/settings.html
index d72a9265..16030a2f 100644
--- a/changedetectionio/templates/settings.html
+++ b/changedetectionio/templates/settings.html
@@ -4,7 +4,7 @@
 {% from '_helpers.jinja' import render_field, render_checkbox_field, render_button %}
 {% from '_common_fields.jinja' import render_common_settings_form %}
 <script>
-    const notification_base_url="{{url_for('ajax_callback_send_notification_test', watch_uuid=uuid)}}";
+    const notification_base_url="{{url_for('ajax_callback_send_notification_test', mode="global-settings")}}";
 {% if emailprefix %}
     const email_notification_prefix=JSON.parse('{{emailprefix|tojson}}');
 {% endif %}