From 93ac212aef23f8bdb8a64968ecb6a6ca5f704407 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 15:58:54 -0800
Subject: [PATCH 01/17] Add Heii On-Call

---
 server/notification-providers/heii-oncall.js |  68 +++++++++++
 server/notification.js                       |  40 ++++---
 src/components/NotificationDialog.vue        | 118 +++++++++++++++----
 src/components/notifications/HeiiOnCall.vue  |  35 ++++++
 src/components/notifications/index.js        | 108 ++++++++---------
 src/lang/en.json                             |   3 +-
 6 files changed, 283 insertions(+), 89 deletions(-)
 create mode 100644 server/notification-providers/heii-oncall.js
 create mode 100644 src/components/notifications/HeiiOnCall.vue

diff --git a/server/notification-providers/heii-oncall.js b/server/notification-providers/heii-oncall.js
new file mode 100644
index 000000000..7babd907e
--- /dev/null
+++ b/server/notification-providers/heii-oncall.js
@@ -0,0 +1,68 @@
+const { UP, DOWN, getMonitorRelativeURL } = require("../../src/util");
+const { setting } = require("../util-server");
+
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+
+const heiiOnCallBaseUrl = "http://192.168.2.1:3005";
+
+class HeiiOnCall extends NotificationProvider {
+    name = "HeiiOnCall";
+
+    /**
+     * @inheritdoc
+     */
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        // Payload to Heii On-Call is the entire heartbat JSON
+        const payload = heartbeatJSON ? heartbeatJSON : {};
+
+        if (!heartbeatJSON) {
+            // Test button was clicked on Notification Setup, trigger the alert as a test
+            payload["message"] = "Testing UptimeKuma Trigger";
+            return this.postNotification(notification, "alert", payload);
+        }
+
+        // If we can add url back to mintor to payload
+        const baseURL = await setting("primaryBaseURL");
+        if (baseURL && monitorJSON) {
+            payload["url"] = baseURL + getMonitorRelativeURL(monitorJSON.id);
+        }
+
+        if (heartbeatJSON.status === DOWN) {
+            // Monitor is DOWN, alert on Heii On-Call
+            return this.postNotification(notification, "alert", payload);
+        }
+
+        if (heartbeatJSON.status === UP) {
+            // Monitor is UP, resolve on Heii On-Call
+            return this.postNotification(notification, "resolve", payload);
+        }
+    }
+
+    /**
+     * Post to Heii On-Call
+     * @param {BeanModel} notification Message title
+     * @param {string} action Trigger Action (alert, resovle)
+     * @param {object} payload Data for Heii On-Call
+     * @returns {Promise<string>} Success message
+     */
+    async postNotification(notification, action, payload) {
+        const config = {
+            headers: {
+                Accept: "application/json",
+                "Content-Type": "application/json",
+                Authorization: "Bearer " + notification.heiiOnCallApiKey,
+            },
+        };
+
+        // Post to Heii On-Call Trigger https://heiioncall.com/docs#manual-triggers
+        await axios.post(
+            `${heiiOnCallBaseUrl}/triggers/${notification.heiiOnCallTriggerId}/${action}`,
+            payload,
+            config
+        );
+        return "Sent Successfully.";
+    }
+}
+
+module.exports = HeiiOnCall;
diff --git a/server/notification.js b/server/notification.js
index 5e76d6eb1..722cf90c2 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -16,6 +16,7 @@ const Gorush = require("./notification-providers/gorush");
 const Gotify = require("./notification-providers/gotify");
 const GrafanaOncall = require("./notification-providers/grafana-oncall");
 const HomeAssistant = require("./notification-providers/home-assistant");
+const HeiiOnCall = require("./notification-providers/heii-oncall");
 const Kook = require("./notification-providers/kook");
 const Line = require("./notification-providers/line");
 const LineNotify = require("./notification-providers/linenotify");
@@ -56,7 +57,6 @@ const ServerChan = require("./notification-providers/serverchan");
 const ZohoCliq = require("./notification-providers/zoho-cliq");
 
 class Notification {
-
     providerList = {};
 
     /**
@@ -87,6 +87,7 @@ class Notification {
             new Gotify(),
             new GrafanaOncall(),
             new HomeAssistant(),
+            new HeiiOnCall(),
             new Kook(),
             new Line(),
             new LineNotify(),
@@ -124,10 +125,10 @@ class Notification {
             new Webhook(),
             new WeCom(),
             new GoAlert(),
-            new ZohoCliq()
+            new ZohoCliq(),
         ];
         for (let item of list) {
-            if (! item.name) {
+            if (!item.name) {
                 throw new Error("Notification provider without name");
             }
 
@@ -147,9 +148,19 @@ class Notification {
      * @returns {Promise<string>} Successful msg
      * @throws Error with fail msg
      */
-    static async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+    static async send(
+        notification,
+        msg,
+        monitorJSON = null,
+        heartbeatJSON = null
+    ) {
         if (this.providerList[notification.type]) {
-            return this.providerList[notification.type].send(notification, msg, monitorJSON, heartbeatJSON);
+            return this.providerList[notification.type].send(
+                notification,
+                msg,
+                monitorJSON,
+                heartbeatJSON
+            );
         } else {
             throw new Error("Notification type is not supported");
         }
@@ -171,10 +182,9 @@ class Notification {
                 userID,
             ]);
 
-            if (! bean) {
+            if (!bean) {
                 throw new Error("notification not found");
             }
-
         } else {
             bean = R.dispense("notification");
         }
@@ -204,7 +214,7 @@ class Notification {
             userID,
         ]);
 
-        if (! bean) {
+        if (!bean) {
             throw new Error("notification not found");
         }
 
@@ -220,7 +230,6 @@ class Notification {
         let exists = commandExistsSync("apprise");
         return exists;
     }
-
 }
 
 /**
@@ -231,16 +240,17 @@ class Notification {
  */
 async function applyNotificationEveryMonitor(notificationID, userID) {
     let monitors = await R.getAll("SELECT id FROM monitor WHERE user_id = ?", [
-        userID
+        userID,
     ]);
 
     for (let i = 0; i < monitors.length; i++) {
-        let checkNotification = await R.findOne("monitor_notification", " monitor_id = ? AND notification_id = ? ", [
-            monitors[i].id,
-            notificationID,
-        ]);
+        let checkNotification = await R.findOne(
+            "monitor_notification",
+            " monitor_id = ? AND notification_id = ? ",
+            [monitors[i].id, notificationID]
+        );
 
-        if (! checkNotification) {
+        if (!checkNotification) {
             let relation = R.dispense("monitor_notification");
             relation.monitor_id = monitors[i].id;
             relation.notification_id = notificationID;
diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 57a2fdf2d..4a16fdf3e 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -1,62 +1,132 @@
 <template>
     <form @submit.prevent="submit">
-        <div ref="modal" class="modal fade" tabindex="-1" data-bs-backdrop="static">
+        <div
+            ref="modal"
+            class="modal fade"
+            tabindex="-1"
+            data-bs-backdrop="static"
+        >
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h5 id="exampleModalLabel" class="modal-title">
                             {{ $t("Setup Notification") }}
                         </h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                        <button
+                            type="button"
+                            class="btn-close"
+                            data-bs-dismiss="modal"
+                            aria-label="Close"
+                        />
                     </div>
                     <div class="modal-body">
                         <div class="mb-3">
-                            <label for="notification-type" class="form-label">{{ $t("Notification Type") }}</label>
-                            <select id="notification-type" v-model="notification.type" class="form-select">
-                                <option v-for="(name, type) in notificationNameList.regularList" :key="type" :value="type">{{ name }}</option>
+                            <label for="notification-type" class="form-label">{{
+                                $t("Notification Type")
+                            }}</label>
+                            <select
+                                id="notification-type"
+                                v-model="notification.type"
+                                class="form-select"
+                            >
+                                <option
+                                    v-for="(
+                                        name, type
+                                    ) in notificationNameList.regularList"
+                                    :key="type"
+                                    :value="type"
+                                >
+                                    {{ name }}
+                                </option>
                                 <optgroup :label="$t('notificationRegional')">
-                                    <option v-for="(name, type) in notificationNameList.regionalList" :key="type" :value="type">{{ name }}</option>
+                                    <option
+                                        v-for="(
+                                            name, type
+                                        ) in notificationNameList.regionalList"
+                                        :key="type"
+                                        :value="type"
+                                    >
+                                        {{ name }}
+                                    </option>
                                 </optgroup>
                             </select>
                         </div>
 
                         <div class="mb-3">
-                            <label for="notification-name" class="form-label">{{ $t("Friendly Name") }}</label>
-                            <input id="notification-name" v-model="notification.name" type="text" class="form-control" required>
+                            <label for="notification-name" class="form-label">{{
+                                $t("Friendly Name")
+                            }}</label>
+                            <input
+                                id="notification-name"
+                                v-model="notification.name"
+                                type="text"
+                                class="form-control"
+                                required
+                            />
                         </div>
 
                         <!-- form body -->
                         <component :is="currentForm" />
 
                         <div class="mb-3 mt-4">
-                            <hr class="dropdown-divider mb-4">
+                            <hr class="dropdown-divider mb-4" />
 
                             <div class="form-check form-switch">
-                                <input v-model="notification.isDefault" class="form-check-input" type="checkbox">
-                                <label class="form-check-label">{{ $t("Default enabled") }}</label>
+                                <input
+                                    v-model="notification.isDefault"
+                                    class="form-check-input"
+                                    type="checkbox"
+                                />
+                                <label class="form-check-label">{{
+                                    $t("Default enabled")
+                                }}</label>
                             </div>
                             <div class="form-text">
                                 {{ $t("enableDefaultNotificationDescription") }}
                             </div>
 
-                            <br>
+                            <br />
 
                             <div class="form-check form-switch">
-                                <input v-model="notification.applyExisting" class="form-check-input" type="checkbox">
-                                <label class="form-check-label">{{ $t("Apply on all existing monitors") }}</label>
+                                <input
+                                    v-model="notification.applyExisting"
+                                    class="form-check-input"
+                                    type="checkbox"
+                                />
+                                <label class="form-check-label">{{
+                                    $t("Apply on all existing monitors")
+                                }}</label>
                             </div>
                         </div>
                     </div>
 
                     <div class="modal-footer">
-                        <button v-if="id" type="button" class="btn btn-danger" :disabled="processing" @click="deleteConfirm">
+                        <button
+                            v-if="id"
+                            type="button"
+                            class="btn btn-danger"
+                            :disabled="processing"
+                            @click="deleteConfirm"
+                        >
                             {{ $t("Delete") }}
                         </button>
-                        <button type="button" class="btn btn-warning" :disabled="processing" @click="test">
+                        <button
+                            type="button"
+                            class="btn btn-warning"
+                            :disabled="processing"
+                            @click="test"
+                        >
                             {{ $t("Test") }}
                         </button>
-                        <button type="submit" class="btn btn-primary" :disabled="processing">
-                            <div v-if="processing" class="spinner-border spinner-border-sm me-1"></div>
+                        <button
+                            type="submit"
+                            class="btn btn-primary"
+                            :disabled="processing"
+                        >
+                            <div
+                                v-if="processing"
+                                class="spinner-border spinner-border-sm me-1"
+                            ></div>
                             {{ $t("Save") }}
                         </button>
                     </div>
@@ -65,7 +135,13 @@
         </div>
     </form>
 
-    <Confirm ref="confirmDelete" btn-style="btn-danger" :yes-text="$t('Yes')" :no-text="$t('No')" @yes="deleteNotification">
+    <Confirm
+        ref="confirmDelete"
+        btn-style="btn-danger"
+        :yes-text="$t('Yes')"
+        :no-text="$t('No')"
+        @yes="deleteNotification"
+    >
         {{ $t("deleteNotificationMsg") }}
     </Confirm>
 </template>
@@ -121,6 +197,7 @@ export default {
                 "gotify": "Gotify",
                 "GrafanaOncall": "Grafana Oncall",
                 "HomeAssistant": "Home Assistant",
+                "HeiiOnCall": "Heii On-Call",
                 "Kook": "Kook",
                 "line": "LINE Messenger",
                 "LineNotify": "LINE Notify",
@@ -330,7 +407,8 @@ export default {
 @import "../assets/vars.scss";
 
 .dark {
-    .modal-dialog .form-text, .modal-dialog p {
+    .modal-dialog .form-text,
+    .modal-dialog p {
         color: $dark-font-color;
     }
 }
diff --git a/src/components/notifications/HeiiOnCall.vue b/src/components/notifications/HeiiOnCall.vue
new file mode 100644
index 000000000..f773dbaef
--- /dev/null
+++ b/src/components/notifications/HeiiOnCall.vue
@@ -0,0 +1,35 @@
+<template>
+    <div class="mb-3">
+        <label for="heiioncall-apikey" class="form-label"
+            >{{ $t("API Key")
+            }}<span style="color: red"><sup>*</sup></span></label
+        >
+        <HiddenInput
+            id="heiioncall-apikey"
+            v-model="$parent.notification.heiiOnCallApiKey"
+            required="true"
+            autocomplete="false"
+        ></HiddenInput>
+    </div>
+    <div class="mb-3">
+        <label for="heiioncall-trigger-id" class="form-label"
+            >{{ $t("Trigger ID")
+            }}<span style="color: red"><sup>*</sup></span></label
+        >
+        <HiddenInput
+            id="heiioncall-trigger-id"
+            v-model="$parent.notification.heiiOnCallTriggerId"
+            required="true"
+            autocomplete="false"
+        ></HiddenInput>
+    </div>
+</template>
+
+<script>
+import HiddenInput from "../HiddenInput.vue";
+export default {
+    components: {
+        HiddenInput,
+    },
+};
+</script>
diff --git a/src/components/notifications/index.js b/src/components/notifications/index.js
index 0606d41af..c71736a79 100644
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@@ -14,6 +14,7 @@ import Gorush from "./Gorush.vue";
 import Gotify from "./Gotify.vue";
 import GrafanaOncall from "./GrafanaOncall.vue";
 import HomeAssistant from "./HomeAssistant.vue";
+import HeiiOnCall from "./HeiiOnCall.vue";
 import Kook from "./Kook.vue";
 import Line from "./Line.vue";
 import LineNotify from "./LineNotify.vue";
@@ -58,60 +59,61 @@ import Splunk from "./Splunk.vue";
  * @type { Record<string, any> }
  */
 const NotificationFormList = {
-    "alerta": Alerta,
-    "AlertNow": AlertNow,
-    "AliyunSMS": AliyunSMS,
-    "apprise": Apprise,
-    "Bark": Bark,
-    "clicksendsms": ClickSendSMS,
-    "smsc": SMSC,
-    "DingDing": DingDing,
-    "discord": Discord,
-    "Feishu": Feishu,
-    "FreeMobile": FreeMobile,
-    "GoogleChat": GoogleChat,
-    "gorush": Gorush,
-    "gotify": Gotify,
-    "GrafanaOncall": GrafanaOncall,
-    "HomeAssistant": HomeAssistant,
-    "Kook": Kook,
-    "line": Line,
-    "LineNotify": LineNotify,
-    "lunasea": LunaSea,
-    "matrix": Matrix,
-    "mattermost": Mattermost,
-    "nostr": Nostr,
-    "ntfy": Ntfy,
-    "octopush": Octopush,
-    "OneBot": OneBot,
-    "Opsgenie": Opsgenie,
-    "PagerDuty": PagerDuty,
-    "FlashDuty": FlashDuty,
-    "PagerTree": PagerTree,
-    "promosms": PromoSMS,
-    "pushbullet": Pushbullet,
-    "PushByTechulus": TechulusPush,
-    "PushDeer": PushDeer,
-    "pushover": Pushover,
-    "pushy": Pushy,
+    alerta: Alerta,
+    AlertNow: AlertNow,
+    AliyunSMS: AliyunSMS,
+    apprise: Apprise,
+    Bark: Bark,
+    clicksendsms: ClickSendSMS,
+    smsc: SMSC,
+    DingDing: DingDing,
+    discord: Discord,
+    Feishu: Feishu,
+    FreeMobile: FreeMobile,
+    GoogleChat: GoogleChat,
+    gorush: Gorush,
+    gotify: Gotify,
+    GrafanaOncall: GrafanaOncall,
+    HomeAssistant: HomeAssistant,
+    HeiiOnCall: HeiiOnCall,
+    Kook: Kook,
+    line: Line,
+    LineNotify: LineNotify,
+    lunasea: LunaSea,
+    matrix: Matrix,
+    mattermost: Mattermost,
+    nostr: Nostr,
+    ntfy: Ntfy,
+    octopush: Octopush,
+    OneBot: OneBot,
+    Opsgenie: Opsgenie,
+    PagerDuty: PagerDuty,
+    FlashDuty: FlashDuty,
+    PagerTree: PagerTree,
+    promosms: PromoSMS,
+    pushbullet: Pushbullet,
+    PushByTechulus: TechulusPush,
+    PushDeer: PushDeer,
+    pushover: Pushover,
+    pushy: Pushy,
     "rocket.chat": RocketChat,
-    "serwersms": SerwerSMS,
-    "signal": Signal,
-    "SMSManager": SMSManager,
-    "slack": Slack,
-    "squadcast": Squadcast,
-    "SMSEagle": SMSEagle,
-    "smtp": STMP,
-    "stackfield": Stackfield,
-    "teams": Teams,
-    "telegram": Telegram,
-    "twilio": Twilio,
-    "Splunk": Splunk,
-    "webhook": Webhook,
-    "WeCom": WeCom,
-    "GoAlert": GoAlert,
-    "ServerChan": ServerChan,
-    "ZohoCliq": ZohoCliq
+    serwersms: SerwerSMS,
+    signal: Signal,
+    SMSManager: SMSManager,
+    slack: Slack,
+    squadcast: Squadcast,
+    SMSEagle: SMSEagle,
+    smtp: STMP,
+    stackfield: Stackfield,
+    teams: Teams,
+    telegram: Telegram,
+    twilio: Twilio,
+    Splunk: Splunk,
+    webhook: Webhook,
+    WeCom: WeCom,
+    GoAlert: GoAlert,
+    ServerChan: ServerChan,
+    ZohoCliq: ZohoCliq,
 };
 
 export default NotificationFormList;
diff --git a/src/lang/en.json b/src/lang/en.json
index 0f59e62ae..c81403d06 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -883,5 +883,6 @@
     "deleteRemoteBrowserMessage": "Are you sure want to delete this Remote Browser for all monitors?",
     "GrafanaOncallUrl": "Grafana Oncall URL",
     "Browser Screenshot": "Browser Screenshot",
-    "What is a Remote Browser?": "What is a Remote Browser?"
+    "What is a Remote Browser?": "What is a Remote Browser?",
+    "Trigger ID": "Trigger ID"
 }

From e8fada938675d5b7655291492d0d22382365737b Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 16:14:41 -0800
Subject: [PATCH 02/17] set url to heii on call prod

---
 server/notification-providers/heii-oncall.js | 23 ++++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/server/notification-providers/heii-oncall.js b/server/notification-providers/heii-oncall.js
index 7babd907e..6332fee85 100644
--- a/server/notification-providers/heii-oncall.js
+++ b/server/notification-providers/heii-oncall.js
@@ -4,7 +4,7 @@ const { setting } = require("../util-server");
 const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
-const heiiOnCallBaseUrl = "http://192.168.2.1:3005";
+const heiiOnCallBaseUrl = "https://heiioncall.com";
 
 class HeiiOnCall extends NotificationProvider {
     name = "HeiiOnCall";
@@ -22,7 +22,7 @@ class HeiiOnCall extends NotificationProvider {
             return this.postNotification(notification, "alert", payload);
         }
 
-        // If we can add url back to mintor to payload
+        // If we can, add url back to mintor to payload
         const baseURL = await setting("primaryBaseURL");
         if (baseURL && monitorJSON) {
             payload["url"] = baseURL + getMonitorRelativeURL(monitorJSON.id);
@@ -42,7 +42,7 @@ class HeiiOnCall extends NotificationProvider {
     /**
      * Post to Heii On-Call
      * @param {BeanModel} notification Message title
-     * @param {string} action Trigger Action (alert, resovle)
+     * @param {string} action Trigger action (alert, resovle)
      * @param {object} payload Data for Heii On-Call
      * @returns {Promise<string>} Success message
      */
@@ -56,12 +56,17 @@ class HeiiOnCall extends NotificationProvider {
         };
 
         // Post to Heii On-Call Trigger https://heiioncall.com/docs#manual-triggers
-        await axios.post(
-            `${heiiOnCallBaseUrl}/triggers/${notification.heiiOnCallTriggerId}/${action}`,
-            payload,
-            config
-        );
-        return "Sent Successfully.";
+        try {
+            await axios.post(
+                `${heiiOnCallBaseUrl}/triggers/${notification.heiiOnCallTriggerId}/${action}`,
+                payload,
+                config
+            );
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+
+        return "Heii On-Call post sent successfully.";
     }
 }
 

From 80bdc455da6cd255ee95d5714ae803dab3bec8a2 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 16:31:58 -0800
Subject: [PATCH 03/17] lint

---
 server/notification.js                      |  2 +-
 src/components/notifications/HeiiOnCall.vue | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/server/notification.js b/server/notification.js
index 722cf90c2..71310b000 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -247,7 +247,7 @@ async function applyNotificationEveryMonitor(notificationID, userID) {
         let checkNotification = await R.findOne(
             "monitor_notification",
             " monitor_id = ? AND notification_id = ? ",
-            [monitors[i].id, notificationID]
+            [ monitors[i].id, notificationID ]
         );
 
         if (!checkNotification) {
diff --git a/src/components/notifications/HeiiOnCall.vue b/src/components/notifications/HeiiOnCall.vue
index f773dbaef..64c0a9e09 100644
--- a/src/components/notifications/HeiiOnCall.vue
+++ b/src/components/notifications/HeiiOnCall.vue
@@ -1,9 +1,7 @@
 <template>
     <div class="mb-3">
-        <label for="heiioncall-apikey" class="form-label"
-            >{{ $t("API Key")
-            }}<span style="color: red"><sup>*</sup></span></label
-        >
+        <label for="heiioncall-apikey" class="form-label">{{ $t("API Key")
+        }}<span style="color: red"><sup>*</sup></span></label>
         <HiddenInput
             id="heiioncall-apikey"
             v-model="$parent.notification.heiiOnCallApiKey"
@@ -12,10 +10,8 @@
         ></HiddenInput>
     </div>
     <div class="mb-3">
-        <label for="heiioncall-trigger-id" class="form-label"
-            >{{ $t("Trigger ID")
-            }}<span style="color: red"><sup>*</sup></span></label
-        >
+        <label for="heiioncall-trigger-id" class="form-label">{{ $t("Trigger ID")
+        }}<span style="color: red"><sup>*</sup></span></label>
         <HiddenInput
             id="heiioncall-trigger-id"
             v-model="$parent.notification.heiiOnCallTriggerId"

From 10659d07b261fc0542c5584d0429b7101fb8266e Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 16:56:41 -0800
Subject: [PATCH 04/17] add link to documentation explaining how to get id and
 token

---
 src/components/notifications/HeiiOnCall.vue |  13 +--
 src/components/notifications/index.js       | 108 ++++++++++----------
 src/lang/en.json                            |   5 +-
 3 files changed, 64 insertions(+), 62 deletions(-)

diff --git a/src/components/notifications/HeiiOnCall.vue b/src/components/notifications/HeiiOnCall.vue
index 64c0a9e09..e09eae2fd 100644
--- a/src/components/notifications/HeiiOnCall.vue
+++ b/src/components/notifications/HeiiOnCall.vue
@@ -3,9 +3,7 @@
         <label for="heiioncall-apikey" class="form-label">{{ $t("API Key")
         }}<span style="color: red"><sup>*</sup></span></label>
         <HiddenInput
-            id="heiioncall-apikey"
-            v-model="$parent.notification.heiiOnCallApiKey"
-            required="true"
+            id="heiioncall-apikey" v-model="$parent.notification.heiiOnCallApiKey" required="true"
             autocomplete="false"
         ></HiddenInput>
     </div>
@@ -13,12 +11,15 @@
         <label for="heiioncall-trigger-id" class="form-label">{{ $t("Trigger ID")
         }}<span style="color: red"><sup>*</sup></span></label>
         <HiddenInput
-            id="heiioncall-trigger-id"
-            v-model="$parent.notification.heiiOnCallTriggerId"
-            required="true"
+            id="heiioncall-trigger-id" v-model="$parent.notification.heiiOnCallTriggerId" required="true"
             autocomplete="false"
         ></HiddenInput>
     </div>
+    <div class="form-text">
+        <i18n-t tag="p" keypath="wayToGetHeiiOnCallDetails" style="margin-top: 8px;">
+            <a href="https://heiioncall.com/docs" target="_blank">Heii On-Call Documentation</a>
+        </i18n-t>
+    </div>
 </template>
 
 <script>
diff --git a/src/components/notifications/index.js b/src/components/notifications/index.js
index c71736a79..6cb0c9fd9 100644
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@@ -59,61 +59,61 @@ import Splunk from "./Splunk.vue";
  * @type { Record<string, any> }
  */
 const NotificationFormList = {
-    alerta: Alerta,
-    AlertNow: AlertNow,
-    AliyunSMS: AliyunSMS,
-    apprise: Apprise,
-    Bark: Bark,
-    clicksendsms: ClickSendSMS,
-    smsc: SMSC,
-    DingDing: DingDing,
-    discord: Discord,
-    Feishu: Feishu,
-    FreeMobile: FreeMobile,
-    GoogleChat: GoogleChat,
-    gorush: Gorush,
-    gotify: Gotify,
-    GrafanaOncall: GrafanaOncall,
-    HomeAssistant: HomeAssistant,
-    HeiiOnCall: HeiiOnCall,
-    Kook: Kook,
-    line: Line,
-    LineNotify: LineNotify,
-    lunasea: LunaSea,
-    matrix: Matrix,
-    mattermost: Mattermost,
-    nostr: Nostr,
-    ntfy: Ntfy,
-    octopush: Octopush,
-    OneBot: OneBot,
-    Opsgenie: Opsgenie,
-    PagerDuty: PagerDuty,
-    FlashDuty: FlashDuty,
-    PagerTree: PagerTree,
-    promosms: PromoSMS,
-    pushbullet: Pushbullet,
-    PushByTechulus: TechulusPush,
-    PushDeer: PushDeer,
-    pushover: Pushover,
-    pushy: Pushy,
+    "alerta": Alerta,
+    "AlertNow": AlertNow,
+    "AliyunSMS": AliyunSMS,
+    "apprise": Apprise,
+    "Bark": Bark,
+    "clicksendsms": ClickSendSMS,
+    "smsc": SMSC,
+    "DingDing": DingDing,
+    "discord": Discord,
+    "Feishu": Feishu,
+    "FreeMobile": FreeMobile,
+    "GoogleChat": GoogleChat,
+    "gorush": Gorush,
+    "gotify": Gotify,
+    "GrafanaOncall": GrafanaOncall,
+    "HomeAssistant": HomeAssistant,
+    "HeiiOnCall": HeiiOnCall,
+    "Kook": Kook,
+    "line": Line,
+    "LineNotify": LineNotify,
+    "lunasea": LunaSea,
+    "matrix": Matrix,
+    "mattermost": Mattermost,
+    "nostr": Nostr,
+    "ntfy": Ntfy,
+    "octopush": Octopush,
+    "OneBot": OneBot,
+    "Opsgenie": Opsgenie,
+    "PagerDuty": PagerDuty,
+    "FlashDuty": FlashDuty,
+    "PagerTree": PagerTree,
+    "promosms": PromoSMS,
+    "pushbullet": Pushbullet,
+    "PushByTechulus": TechulusPush,
+    "PushDeer": PushDeer,
+    "pushover": Pushover,
+    "pushy": Pushy,
     "rocket.chat": RocketChat,
-    serwersms: SerwerSMS,
-    signal: Signal,
-    SMSManager: SMSManager,
-    slack: Slack,
-    squadcast: Squadcast,
-    SMSEagle: SMSEagle,
-    smtp: STMP,
-    stackfield: Stackfield,
-    teams: Teams,
-    telegram: Telegram,
-    twilio: Twilio,
-    Splunk: Splunk,
-    webhook: Webhook,
-    WeCom: WeCom,
-    GoAlert: GoAlert,
-    ServerChan: ServerChan,
-    ZohoCliq: ZohoCliq,
+    "serwersms": SerwerSMS,
+    "signal": Signal,
+    "SMSManager": SMSManager,
+    "slack": Slack,
+    "squadcast": Squadcast,
+    "SMSEagle": SMSEagle,
+    "smtp": STMP,
+    "stackfield": Stackfield,
+    "teams": Teams,
+    "telegram": Telegram,
+    "twilio": Twilio,
+    "Splunk": Splunk,
+    "webhook": Webhook,
+    "WeCom": WeCom,
+    "GoAlert": GoAlert,
+    "ServerChan": ServerChan,
+    "ZohoCliq": ZohoCliq
 };
 
 export default NotificationFormList;
diff --git a/src/lang/en.json b/src/lang/en.json
index c81403d06..4678003a2 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -884,5 +884,6 @@
     "GrafanaOncallUrl": "Grafana Oncall URL",
     "Browser Screenshot": "Browser Screenshot",
     "What is a Remote Browser?": "What is a Remote Browser?",
-    "Trigger ID": "Trigger ID"
-}
+    "Trigger ID": "Trigger ID",
+    "wayToGetHeiiOnCallDetails": "To get a Heii On-Call Tigger ID and Api Token visit: {0}"
+}
\ No newline at end of file

From 246316f55b178449ef99ac6ef8bf1ecb07d87386 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 17:24:42 -0800
Subject: [PATCH 05/17] Undo my overzelous linter

---
 server/notification.js                |  38 ++++-----
 src/components/NotificationDialog.vue | 118 +++++---------------------
 2 files changed, 35 insertions(+), 121 deletions(-)

diff --git a/server/notification.js b/server/notification.js
index 71310b000..5a412c6e6 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -57,6 +57,7 @@ const ServerChan = require("./notification-providers/serverchan");
 const ZohoCliq = require("./notification-providers/zoho-cliq");
 
 class Notification {
+
     providerList = {};
 
     /**
@@ -125,10 +126,10 @@ class Notification {
             new Webhook(),
             new WeCom(),
             new GoAlert(),
-            new ZohoCliq(),
+            new ZohoCliq()
         ];
         for (let item of list) {
-            if (!item.name) {
+            if (! item.name) {
                 throw new Error("Notification provider without name");
             }
 
@@ -148,19 +149,9 @@ class Notification {
      * @returns {Promise<string>} Successful msg
      * @throws Error with fail msg
      */
-    static async send(
-        notification,
-        msg,
-        monitorJSON = null,
-        heartbeatJSON = null
-    ) {
+    static async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         if (this.providerList[notification.type]) {
-            return this.providerList[notification.type].send(
-                notification,
-                msg,
-                monitorJSON,
-                heartbeatJSON
-            );
+            return this.providerList[notification.type].send(notification, msg, monitorJSON, heartbeatJSON);
         } else {
             throw new Error("Notification type is not supported");
         }
@@ -182,9 +173,10 @@ class Notification {
                 userID,
             ]);
 
-            if (!bean) {
+            if (! bean) {
                 throw new Error("notification not found");
             }
+
         } else {
             bean = R.dispense("notification");
         }
@@ -214,7 +206,7 @@ class Notification {
             userID,
         ]);
 
-        if (!bean) {
+        if (! bean) {
             throw new Error("notification not found");
         }
 
@@ -230,6 +222,7 @@ class Notification {
         let exists = commandExistsSync("apprise");
         return exists;
     }
+
 }
 
 /**
@@ -240,17 +233,16 @@ class Notification {
  */
 async function applyNotificationEveryMonitor(notificationID, userID) {
     let monitors = await R.getAll("SELECT id FROM monitor WHERE user_id = ?", [
-        userID,
+        userID
     ]);
 
     for (let i = 0; i < monitors.length; i++) {
-        let checkNotification = await R.findOne(
-            "monitor_notification",
-            " monitor_id = ? AND notification_id = ? ",
-            [ monitors[i].id, notificationID ]
-        );
+        let checkNotification = await R.findOne("monitor_notification", " monitor_id = ? AND notification_id = ? ", [
+            monitors[i].id,
+            notificationID,
+        ]);
 
-        if (!checkNotification) {
+        if (! checkNotification) {
             let relation = R.dispense("monitor_notification");
             relation.monitor_id = monitors[i].id;
             relation.notification_id = notificationID;
diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 4a16fdf3e..57a2fdf2d 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -1,132 +1,62 @@
 <template>
     <form @submit.prevent="submit">
-        <div
-            ref="modal"
-            class="modal fade"
-            tabindex="-1"
-            data-bs-backdrop="static"
-        >
+        <div ref="modal" class="modal fade" tabindex="-1" data-bs-backdrop="static">
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h5 id="exampleModalLabel" class="modal-title">
                             {{ $t("Setup Notification") }}
                         </h5>
-                        <button
-                            type="button"
-                            class="btn-close"
-                            data-bs-dismiss="modal"
-                            aria-label="Close"
-                        />
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
                     </div>
                     <div class="modal-body">
                         <div class="mb-3">
-                            <label for="notification-type" class="form-label">{{
-                                $t("Notification Type")
-                            }}</label>
-                            <select
-                                id="notification-type"
-                                v-model="notification.type"
-                                class="form-select"
-                            >
-                                <option
-                                    v-for="(
-                                        name, type
-                                    ) in notificationNameList.regularList"
-                                    :key="type"
-                                    :value="type"
-                                >
-                                    {{ name }}
-                                </option>
+                            <label for="notification-type" class="form-label">{{ $t("Notification Type") }}</label>
+                            <select id="notification-type" v-model="notification.type" class="form-select">
+                                <option v-for="(name, type) in notificationNameList.regularList" :key="type" :value="type">{{ name }}</option>
                                 <optgroup :label="$t('notificationRegional')">
-                                    <option
-                                        v-for="(
-                                            name, type
-                                        ) in notificationNameList.regionalList"
-                                        :key="type"
-                                        :value="type"
-                                    >
-                                        {{ name }}
-                                    </option>
+                                    <option v-for="(name, type) in notificationNameList.regionalList" :key="type" :value="type">{{ name }}</option>
                                 </optgroup>
                             </select>
                         </div>
 
                         <div class="mb-3">
-                            <label for="notification-name" class="form-label">{{
-                                $t("Friendly Name")
-                            }}</label>
-                            <input
-                                id="notification-name"
-                                v-model="notification.name"
-                                type="text"
-                                class="form-control"
-                                required
-                            />
+                            <label for="notification-name" class="form-label">{{ $t("Friendly Name") }}</label>
+                            <input id="notification-name" v-model="notification.name" type="text" class="form-control" required>
                         </div>
 
                         <!-- form body -->
                         <component :is="currentForm" />
 
                         <div class="mb-3 mt-4">
-                            <hr class="dropdown-divider mb-4" />
+                            <hr class="dropdown-divider mb-4">
 
                             <div class="form-check form-switch">
-                                <input
-                                    v-model="notification.isDefault"
-                                    class="form-check-input"
-                                    type="checkbox"
-                                />
-                                <label class="form-check-label">{{
-                                    $t("Default enabled")
-                                }}</label>
+                                <input v-model="notification.isDefault" class="form-check-input" type="checkbox">
+                                <label class="form-check-label">{{ $t("Default enabled") }}</label>
                             </div>
                             <div class="form-text">
                                 {{ $t("enableDefaultNotificationDescription") }}
                             </div>
 
-                            <br />
+                            <br>
 
                             <div class="form-check form-switch">
-                                <input
-                                    v-model="notification.applyExisting"
-                                    class="form-check-input"
-                                    type="checkbox"
-                                />
-                                <label class="form-check-label">{{
-                                    $t("Apply on all existing monitors")
-                                }}</label>
+                                <input v-model="notification.applyExisting" class="form-check-input" type="checkbox">
+                                <label class="form-check-label">{{ $t("Apply on all existing monitors") }}</label>
                             </div>
                         </div>
                     </div>
 
                     <div class="modal-footer">
-                        <button
-                            v-if="id"
-                            type="button"
-                            class="btn btn-danger"
-                            :disabled="processing"
-                            @click="deleteConfirm"
-                        >
+                        <button v-if="id" type="button" class="btn btn-danger" :disabled="processing" @click="deleteConfirm">
                             {{ $t("Delete") }}
                         </button>
-                        <button
-                            type="button"
-                            class="btn btn-warning"
-                            :disabled="processing"
-                            @click="test"
-                        >
+                        <button type="button" class="btn btn-warning" :disabled="processing" @click="test">
                             {{ $t("Test") }}
                         </button>
-                        <button
-                            type="submit"
-                            class="btn btn-primary"
-                            :disabled="processing"
-                        >
-                            <div
-                                v-if="processing"
-                                class="spinner-border spinner-border-sm me-1"
-                            ></div>
+                        <button type="submit" class="btn btn-primary" :disabled="processing">
+                            <div v-if="processing" class="spinner-border spinner-border-sm me-1"></div>
                             {{ $t("Save") }}
                         </button>
                     </div>
@@ -135,13 +65,7 @@
         </div>
     </form>
 
-    <Confirm
-        ref="confirmDelete"
-        btn-style="btn-danger"
-        :yes-text="$t('Yes')"
-        :no-text="$t('No')"
-        @yes="deleteNotification"
-    >
+    <Confirm ref="confirmDelete" btn-style="btn-danger" :yes-text="$t('Yes')" :no-text="$t('No')" @yes="deleteNotification">
         {{ $t("deleteNotificationMsg") }}
     </Confirm>
 </template>
@@ -197,7 +121,6 @@ export default {
                 "gotify": "Gotify",
                 "GrafanaOncall": "Grafana Oncall",
                 "HomeAssistant": "Home Assistant",
-                "HeiiOnCall": "Heii On-Call",
                 "Kook": "Kook",
                 "line": "LINE Messenger",
                 "LineNotify": "LINE Notify",
@@ -407,8 +330,7 @@ export default {
 @import "../assets/vars.scss";
 
 .dark {
-    .modal-dialog .form-text,
-    .modal-dialog p {
+    .modal-dialog .form-text, .modal-dialog p {
         color: $dark-font-color;
     }
 }

From 92488290fac16309e91ca269401df95f4a0a1200 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 17:38:50 -0800
Subject: [PATCH 06/17] add newline at end of file

---
 src/lang/en.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lang/en.json b/src/lang/en.json
index 4678003a2..b8c1affa4 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -886,4 +886,5 @@
     "What is a Remote Browser?": "What is a Remote Browser?",
     "Trigger ID": "Trigger ID",
     "wayToGetHeiiOnCallDetails": "To get a Heii On-Call Tigger ID and Api Token visit: {0}"
-}
\ No newline at end of file
+}
+

From 5f25a75f656467f387f41c9b5d77afef7415fdc3 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 17:39:41 -0800
Subject: [PATCH 07/17] remove line at end of file

---
 src/lang/en.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/lang/en.json b/src/lang/en.json
index b8c1affa4..9fa64d8da 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -887,4 +887,3 @@
     "Trigger ID": "Trigger ID",
     "wayToGetHeiiOnCallDetails": "To get a Heii On-Call Tigger ID and Api Token visit: {0}"
 }
-

From 09d249ca36077f44f37b8c85a11dc6eff7136fc2 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 17:48:53 -0800
Subject: [PATCH 08/17] add form to NotificationDialog

---
 src/components/NotificationDialog.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 57a2fdf2d..56580fbf0 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -120,6 +120,7 @@ export default {
                 "gorush": "Gorush",
                 "gotify": "Gotify",
                 "GrafanaOncall": "Grafana Oncall",
+                "HeiiOnCall": "Heii On-Call",
                 "HomeAssistant": "Home Assistant",
                 "Kook": "Kook",
                 "line": "LINE Messenger",

From 71dd5e2369911035ebaa38f7b55d525583aa81b8 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 17:54:36 -0800
Subject: [PATCH 09/17] do not assume missing heartbeat is a test

---
 server/notification-providers/heii-oncall.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/notification-providers/heii-oncall.js b/server/notification-providers/heii-oncall.js
index 6332fee85..7e6bec200 100644
--- a/server/notification-providers/heii-oncall.js
+++ b/server/notification-providers/heii-oncall.js
@@ -16,18 +16,18 @@ class HeiiOnCall extends NotificationProvider {
         // Payload to Heii On-Call is the entire heartbat JSON
         const payload = heartbeatJSON ? heartbeatJSON : {};
 
-        if (!heartbeatJSON) {
-            // Test button was clicked on Notification Setup, trigger the alert as a test
-            payload["message"] = "Testing UptimeKuma Trigger";
-            return this.postNotification(notification, "alert", payload);
-        }
-
         // If we can, add url back to mintor to payload
         const baseURL = await setting("primaryBaseURL");
         if (baseURL && monitorJSON) {
             payload["url"] = baseURL + getMonitorRelativeURL(monitorJSON.id);
         }
 
+        if (!heartbeatJSON) {
+            // No heartbeatJSON. Could be test button, but not necessarily. Just pull msg into payload.
+            payload["msg"] = msg;
+            return this.postNotification(notification, "alert", payload);
+        }
+
         if (heartbeatJSON.status === DOWN) {
             // Monitor is DOWN, alert on Heii On-Call
             return this.postNotification(notification, "alert", payload);

From f254940b64430902e5f4c196687056be9eaf7553 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 18:01:06 -0800
Subject: [PATCH 10/17] spell things correctly

---
 server/notification-providers/heii-oncall.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/notification-providers/heii-oncall.js b/server/notification-providers/heii-oncall.js
index 7e6bec200..f31bc4acf 100644
--- a/server/notification-providers/heii-oncall.js
+++ b/server/notification-providers/heii-oncall.js
@@ -16,7 +16,7 @@ class HeiiOnCall extends NotificationProvider {
         // Payload to Heii On-Call is the entire heartbat JSON
         const payload = heartbeatJSON ? heartbeatJSON : {};
 
-        // If we can, add url back to mintor to payload
+        // If we can, add url back to monitor to payload
         const baseURL = await setting("primaryBaseURL");
         if (baseURL && monitorJSON) {
             payload["url"] = baseURL + getMonitorRelativeURL(monitorJSON.id);

From 673f9a7744d1bb7b73edaf065db951beeede7000 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 18:12:07 -0800
Subject: [PATCH 11/17] get the linter to be happy with my vue file

---
 src/components/notifications/HeiiOnCall.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/notifications/HeiiOnCall.vue b/src/components/notifications/HeiiOnCall.vue
index e09eae2fd..85fb91b67 100644
--- a/src/components/notifications/HeiiOnCall.vue
+++ b/src/components/notifications/HeiiOnCall.vue
@@ -1,15 +1,17 @@
 <template>
     <div class="mb-3">
-        <label for="heiioncall-apikey" class="form-label">{{ $t("API Key")
-        }}<span style="color: red"><sup>*</sup></span></label>
+        <label for="heiioncall-apikey" class="form-label">{{ $t("API Key") }}<span
+            style="color: red;"
+        ><sup>*</sup></span></label>
         <HiddenInput
             id="heiioncall-apikey" v-model="$parent.notification.heiiOnCallApiKey" required="true"
             autocomplete="false"
         ></HiddenInput>
     </div>
     <div class="mb-3">
-        <label for="heiioncall-trigger-id" class="form-label">{{ $t("Trigger ID")
-        }}<span style="color: red"><sup>*</sup></span></label>
+        <label for="heiioncall-trigger-id" class="form-label">{{ $t("Trigger ID") }}<span
+            style="color: red;"
+        ><sup>*</sup></span></label>
         <HiddenInput
             id="heiioncall-trigger-id" v-model="$parent.notification.heiiOnCallTriggerId" required="true"
             autocomplete="false"

From 4cdc8f344bf83be9c1f206b91f6d9a58faa1f8a3 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Tue, 13 Feb 2024 16:54:52 -0800
Subject: [PATCH 12/17] Apply suggestions from code review

Co-authored-by: Frank Elsinga <frank@elsinga.de>
---
 server/notification-providers/heii-oncall.js | 15 ++++-----------
 src/components/notifications/HeiiOnCall.vue  |  2 +-
 src/lang/en.json                             |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/server/notification-providers/heii-oncall.js b/server/notification-providers/heii-oncall.js
index f31bc4acf..75ebf6140 100644
--- a/server/notification-providers/heii-oncall.js
+++ b/server/notification-providers/heii-oncall.js
@@ -3,9 +3,6 @@ const { setting } = require("../util-server");
 
 const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
-
-const heiiOnCallBaseUrl = "https://heiioncall.com";
-
 class HeiiOnCall extends NotificationProvider {
     name = "HeiiOnCall";
 
@@ -13,28 +10,24 @@ class HeiiOnCall extends NotificationProvider {
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        // Payload to Heii On-Call is the entire heartbat JSON
-        const payload = heartbeatJSON ? heartbeatJSON : {};
+        const payload = heartbeatJSON || {};
 
-        // If we can, add url back to monitor to payload
         const baseURL = await setting("primaryBaseURL");
         if (baseURL && monitorJSON) {
             payload["url"] = baseURL + getMonitorRelativeURL(monitorJSON.id);
         }
 
         if (!heartbeatJSON) {
-            // No heartbeatJSON. Could be test button, but not necessarily. Just pull msg into payload.
+            // Testing or general notification like certificate expiry
             payload["msg"] = msg;
             return this.postNotification(notification, "alert", payload);
         }
 
         if (heartbeatJSON.status === DOWN) {
-            // Monitor is DOWN, alert on Heii On-Call
             return this.postNotification(notification, "alert", payload);
         }
 
         if (heartbeatJSON.status === UP) {
-            // Monitor is UP, resolve on Heii On-Call
             return this.postNotification(notification, "resolve", payload);
         }
     }
@@ -58,7 +51,7 @@ class HeiiOnCall extends NotificationProvider {
         // Post to Heii On-Call Trigger https://heiioncall.com/docs#manual-triggers
         try {
             await axios.post(
-                `${heiiOnCallBaseUrl}/triggers/${notification.heiiOnCallTriggerId}/${action}`,
+                `https://heiioncall.com/triggers/${notification.heiiOnCallTriggerId}/${action}`,
                 payload,
                 config
             );
@@ -66,7 +59,7 @@ class HeiiOnCall extends NotificationProvider {
             this.throwGeneralAxiosError(error);
         }
 
-        return "Heii On-Call post sent successfully.";
+        return "Sent Successfully";
     }
 }
 
diff --git a/src/components/notifications/HeiiOnCall.vue b/src/components/notifications/HeiiOnCall.vue
index 85fb91b67..54c991344 100644
--- a/src/components/notifications/HeiiOnCall.vue
+++ b/src/components/notifications/HeiiOnCall.vue
@@ -19,7 +19,7 @@
     </div>
     <div class="form-text">
         <i18n-t tag="p" keypath="wayToGetHeiiOnCallDetails" style="margin-top: 8px;">
-            <a href="https://heiioncall.com/docs" target="_blank">Heii On-Call Documentation</a>
+            <a href="https://heiioncall.com/docs" target="_blank">{{ $t("documentationOf", ["Heii On-Call"]) }}</a>
         </i18n-t>
     </div>
 </template>
diff --git a/src/lang/en.json b/src/lang/en.json
index 9fa64d8da..e95dc56c2 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -885,5 +885,5 @@
     "Browser Screenshot": "Browser Screenshot",
     "What is a Remote Browser?": "What is a Remote Browser?",
     "Trigger ID": "Trigger ID",
-    "wayToGetHeiiOnCallDetails": "To get a Heii On-Call Tigger ID and Api Token visit: {0}"
+    "wayToGetHeiiOnCallDetails": "How to get the Tigger ID and API Keys is explained in the {documentation}"
 }

From 5a9c3ad353c57e098c1a683b673f840ecd31081b Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Tue, 13 Feb 2024 17:27:59 -0800
Subject: [PATCH 13/17] move try/catch into main control flow and more from
 code review comments

---
 server/notification-providers/heii-oncall.js | 41 ++++++++++----------
 src/components/notifications/HeiiOnCall.vue  | 10 ++---
 src/lang/en.json                             |  4 +-
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/server/notification-providers/heii-oncall.js b/server/notification-providers/heii-oncall.js
index 75ebf6140..585fa1381 100644
--- a/server/notification-providers/heii-oncall.js
+++ b/server/notification-providers/heii-oncall.js
@@ -17,19 +17,24 @@ class HeiiOnCall extends NotificationProvider {
             payload["url"] = baseURL + getMonitorRelativeURL(monitorJSON.id);
         }
 
-        if (!heartbeatJSON) {
-            // Testing or general notification like certificate expiry
-            payload["msg"] = msg;
-            return this.postNotification(notification, "alert", payload);
+        try {
+            if (!heartbeatJSON) {
+                // Testing or general notification like certificate expiry
+                payload["msg"] = msg;
+                return this.postNotification(notification, "alert", payload);
+            }
+
+            if (heartbeatJSON.status === DOWN) {
+                return this.postNotification(notification, "alert", payload);
+            }
+
+            if (heartbeatJSON.status === UP) {
+                return this.postNotification(notification, "resolve", payload);
+            }
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
         }
 
-        if (heartbeatJSON.status === DOWN) {
-            return this.postNotification(notification, "alert", payload);
-        }
-
-        if (heartbeatJSON.status === UP) {
-            return this.postNotification(notification, "resolve", payload);
-        }
     }
 
     /**
@@ -49,15 +54,11 @@ class HeiiOnCall extends NotificationProvider {
         };
 
         // Post to Heii On-Call Trigger https://heiioncall.com/docs#manual-triggers
-        try {
-            await axios.post(
-                `https://heiioncall.com/triggers/${notification.heiiOnCallTriggerId}/${action}`,
-                payload,
-                config
-            );
-        } catch (error) {
-            this.throwGeneralAxiosError(error);
-        }
+        await axios.post(
+            `https://heiioncall.com/triggers/${notification.heiiOnCallTriggerId}/${action}`,
+            payload,
+            config
+        );
 
         return "Sent Successfully";
     }
diff --git a/src/components/notifications/HeiiOnCall.vue b/src/components/notifications/HeiiOnCall.vue
index 54c991344..7ae516c73 100644
--- a/src/components/notifications/HeiiOnCall.vue
+++ b/src/components/notifications/HeiiOnCall.vue
@@ -9,7 +9,7 @@
         ></HiddenInput>
     </div>
     <div class="mb-3">
-        <label for="heiioncall-trigger-id" class="form-label">{{ $t("Trigger ID") }}<span
+        <label for="heiioncall-trigger-id" class="form-label">Trigger ID<span
             style="color: red;"
         ><sup>*</sup></span></label>
         <HiddenInput
@@ -17,11 +17,9 @@
             autocomplete="false"
         ></HiddenInput>
     </div>
-    <div class="form-text">
-        <i18n-t tag="p" keypath="wayToGetHeiiOnCallDetails" style="margin-top: 8px;">
-            <a href="https://heiioncall.com/docs" target="_blank">{{ $t("documentationOf", ["Heii On-Call"]) }}</a>
-        </i18n-t>
-    </div>
+    <i18n-t tag="p" keypath="wayToGetHeiiOnCallDetails" class="form-text mt-3">
+        <a href="https://heiioncall.com/docs" target="_blank">{{ $t("documentationOf", ["Heii On-Call"]) }}</a>
+    </i18n-t>
 </template>
 
 <script>
diff --git a/src/lang/en.json b/src/lang/en.json
index e95dc56c2..c0fd304af 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -884,6 +884,6 @@
     "GrafanaOncallUrl": "Grafana Oncall URL",
     "Browser Screenshot": "Browser Screenshot",
     "What is a Remote Browser?": "What is a Remote Browser?",
-    "Trigger ID": "Trigger ID",
-    "wayToGetHeiiOnCallDetails": "How to get the Tigger ID and API Keys is explained in the {documentation}"
+    "wayToGetHeiiOnCallDetails": "How to get the Tigger ID and API Keys is explained in the {0}",
+    "documentationOf": "{0} Documentation"
 }

From cc000117ca9b8f888c69a31b9c8f2841b79bab7f Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Wed, 14 Feb 2024 23:41:35 +0100
Subject: [PATCH 14/17] Updated the code to look more like the other
 notification providers

---
 server/notification-providers/heii-oncall.js | 59 ++++++++------------
 1 file changed, 23 insertions(+), 36 deletions(-)

diff --git a/server/notification-providers/heii-oncall.js b/server/notification-providers/heii-oncall.js
index 585fa1381..87b9e3b3f 100644
--- a/server/notification-providers/heii-oncall.js
+++ b/server/notification-providers/heii-oncall.js
@@ -10,6 +10,7 @@ class HeiiOnCall extends NotificationProvider {
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        const okMsg = "Sent Successfully.";
         const payload = heartbeatJSON || {};
 
         const baseURL = await setting("primaryBaseURL");
@@ -17,34 +18,6 @@ class HeiiOnCall extends NotificationProvider {
             payload["url"] = baseURL + getMonitorRelativeURL(monitorJSON.id);
         }
 
-        try {
-            if (!heartbeatJSON) {
-                // Testing or general notification like certificate expiry
-                payload["msg"] = msg;
-                return this.postNotification(notification, "alert", payload);
-            }
-
-            if (heartbeatJSON.status === DOWN) {
-                return this.postNotification(notification, "alert", payload);
-            }
-
-            if (heartbeatJSON.status === UP) {
-                return this.postNotification(notification, "resolve", payload);
-            }
-        } catch (error) {
-            this.throwGeneralAxiosError(error);
-        }
-
-    }
-
-    /**
-     * Post to Heii On-Call
-     * @param {BeanModel} notification Message title
-     * @param {string} action Trigger action (alert, resovle)
-     * @param {object} payload Data for Heii On-Call
-     * @returns {Promise<string>} Success message
-     */
-    async postNotification(notification, action, payload) {
         const config = {
             headers: {
                 Accept: "application/json",
@@ -52,15 +25,29 @@ class HeiiOnCall extends NotificationProvider {
                 Authorization: "Bearer " + notification.heiiOnCallApiKey,
             },
         };
+        
+        const heiiUrl = `https://heiioncall.com/triggers/${notification.heiiOnCallTriggerId}/`;
+        
+        // docs https://heiioncall.com/docs#manual-triggers
+        try {
+            if (!heartbeatJSON) {
+                // Testing or general notification like certificate expiry
+                payload["msg"] = msg;
+                await axios.post(heiiUrl + "alert", payload, config);
+                return okMsg;
+            }
 
-        // Post to Heii On-Call Trigger https://heiioncall.com/docs#manual-triggers
-        await axios.post(
-            `https://heiioncall.com/triggers/${notification.heiiOnCallTriggerId}/${action}`,
-            payload,
-            config
-        );
-
-        return "Sent Successfully";
+            if (heartbeatJSON.status === DOWN) {
+                await axios.post(heiiUrl + "alert", payload, config);
+                return okMsg;
+            }
+            if (heartbeatJSON.status === UP) {
+                await axios.post(heiiUrl + "resolve",payload, config);
+                return okMsg;
+            }
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
     }
 }
 

From 1fdb7e48ed7881f2e64d43a964f70ee2795dca06 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Wed, 14 Feb 2024 23:45:23 +0100
Subject: [PATCH 15/17] Formatting fixes

---
 server/notification-providers/heii-oncall.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/server/notification-providers/heii-oncall.js b/server/notification-providers/heii-oncall.js
index 87b9e3b3f..20b53e6af 100644
--- a/server/notification-providers/heii-oncall.js
+++ b/server/notification-providers/heii-oncall.js
@@ -25,9 +25,7 @@ class HeiiOnCall extends NotificationProvider {
                 Authorization: "Bearer " + notification.heiiOnCallApiKey,
             },
         };
-        
         const heiiUrl = `https://heiioncall.com/triggers/${notification.heiiOnCallTriggerId}/`;
-        
         // docs https://heiioncall.com/docs#manual-triggers
         try {
             if (!heartbeatJSON) {
@@ -42,7 +40,7 @@ class HeiiOnCall extends NotificationProvider {
                 return okMsg;
             }
             if (heartbeatJSON.status === UP) {
-                await axios.post(heiiUrl + "resolve",payload, config);
+                await axios.post(heiiUrl + "resolve", payload, config);
                 return okMsg;
             }
         } catch (error) {

From 9a52a8761cb017cced66ab3025be3d5cf2c26a42 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Fri, 16 Feb 2024 15:08:59 -0700
Subject: [PATCH 16/17] Apply suggestions from code review

Co-authored-by: Frank Elsinga <frank@elsinga.de>
---
 src/components/notifications/HeiiOnCall.vue | 4 +++-
 src/lang/en.json                            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/notifications/HeiiOnCall.vue b/src/components/notifications/HeiiOnCall.vue
index 7ae516c73..a61c1c323 100644
--- a/src/components/notifications/HeiiOnCall.vue
+++ b/src/components/notifications/HeiiOnCall.vue
@@ -18,7 +18,9 @@
         ></HiddenInput>
     </div>
     <i18n-t tag="p" keypath="wayToGetHeiiOnCallDetails" class="form-text mt-3">
-        <a href="https://heiioncall.com/docs" target="_blank">{{ $t("documentationOf", ["Heii On-Call"]) }}</a>
+        <template #documentation>
+            <a href="https://heiioncall.com/docs" target="_blank">{{ $t("documentationOf", ["Heii On-Call"]) }}</a>
+        </template>
     </i18n-t>
 </template>
 
diff --git a/src/lang/en.json b/src/lang/en.json
index c0fd304af..9e495a686 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -884,6 +884,6 @@
     "GrafanaOncallUrl": "Grafana Oncall URL",
     "Browser Screenshot": "Browser Screenshot",
     "What is a Remote Browser?": "What is a Remote Browser?",
-    "wayToGetHeiiOnCallDetails": "How to get the Tigger ID and API Keys is explained in the {0}",
+    "wayToGetHeiiOnCallDetails": "How to get the Tigger ID and API Keys is explained in the {documentation}",
     "documentationOf": "{0} Documentation"
 }

From daa59b812c0aaf334462481043bc8bdd7b6ae3d7 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 4 Mar 2024 14:54:17 -0800
Subject: [PATCH 17/17] Update en.json

Fix misspelled "Trigger"
---
 src/lang/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lang/en.json b/src/lang/en.json
index 9e495a686..6b77b65f4 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -884,6 +884,6 @@
     "GrafanaOncallUrl": "Grafana Oncall URL",
     "Browser Screenshot": "Browser Screenshot",
     "What is a Remote Browser?": "What is a Remote Browser?",
-    "wayToGetHeiiOnCallDetails": "How to get the Tigger ID and API Keys is explained in the {documentation}",
+    "wayToGetHeiiOnCallDetails": "How to get the Trigger ID and API Keys is explained in the {documentation}",
     "documentationOf": "{0} Documentation"
 }