From 64c3de0450d0567987c88027cc968db0695db34e Mon Sep 17 00:00:00 2001
From: Jokob-sk <jokob.sk@gmail.com>
Date: Wed, 23 Aug 2023 17:01:34 +1000
Subject: [PATCH] test button settings fixes

---
 front/settings.php    |  1 +
 pialert/initialise.py | 13 +++++++------
 pialert/reporting.py  | 13 ++++++++-----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/front/settings.php b/front/settings.php
index fe521768..b0ebb282 100755
--- a/front/settings.php
+++ b/front/settings.php
@@ -353,6 +353,7 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
           const eventsList = createArray(set['Events']);          
 
           if (eventsList.length > 0) {
+            console.log(eventsList)
             eventsList.forEach(event => {
               eventsHtml += `<span class="input-group-addon pointer"
                 data-myparam="${codeName}"
diff --git a/pialert/initialise.py b/pialert/initialise.py
index d375bf13..f8f6a3a3 100755
--- a/pialert/initialise.py
+++ b/pialert/initialise.py
@@ -39,14 +39,15 @@ def ccd(key, default, config_dir, name, inputtype, options, group, events=[], de
         result = result.replace('\'', "{s-quote}")
 
     conf.mySettingsSQLsafe.append((key, name, desc, inputtype, options, regex, str(result), group, str(events)))
+    conf.mySettings.append((key, name, desc, inputtype, options, regex, result, group, str(events)))
+
     # save metadata in dummy setting
     if '__metadata' not in key:
-        conf.mySettingsSQLsafe.append((f'{key}__metadata', "metadata name", "metadata desc", 'json', "", "", json.dumps(setJsonMetadata), group, ''))
-
-    conf.mySettings.append((key, name, desc, inputtype, options, regex, result, group, str(events)))
-    #  save metadata in dummy setting
-    if '__metadata' not in key:
-        conf.mySettings.append((f'{key}__metadata', "metadata name", "metadata desc", 'json', "", "", json.dumps(setJsonMetadata), group, ''))
+        tuple = (f'{key}__metadata', "metadata name", "metadata desc", 'json', "", "", json.dumps(setJsonMetadata), group, '[]')
+        conf.mySettingsSQLsafe.append(tuple)
+        conf.mySettings.append(tuple)
+    
+        
 
     return result
 #-------------------------------------------------------------------------------
diff --git a/pialert/reporting.py b/pialert/reporting.py
index c4848235..21e6e84c 100755
--- a/pialert/reporting.py
+++ b/pialert/reporting.py
@@ -543,16 +543,19 @@ def handle_test(testType):
     sample_json_payload = json.loads(get_file_content(pialertPath + '/back/webhook_json_sample.json'))[0]["body"]["attachments"][0]["text"]
 
     sample_msg = noti_struc(sample_json_payload, sample_txt, sample_html )
+   
 
-    if testType == 'REPORT_MAIL':
+    if testType == 'Email':
         send_email(sample_msg)
-    if testType == 'REPORT_WEBHOOK':
+    elif testType == 'Webhooks':
         send_webhook (sample_msg)
-    if testType == 'REPORT_APPRISE':
+    elif testType == 'Apprise':
         send_apprise (sample_msg)
-    if testType == 'REPORT_NTFY':
+    elif testType == 'NTFY':
         send_ntfy (sample_msg)
-    if testType == 'REPORT_PUSHSAFER':
+    elif testType == 'PUSHSAFER':
         send_pushsafer (sample_msg)
+    else:
+        mylog('none', ['[Test Publishers] No test matches: ', testType])    
 
     mylog('minimal', ['[Test Publishers] END Test: ', testType])