Merge pull request #340 from Ponkhy/default-notification

Added the option for default notifications
2024-11-24 18:36:48 +03:00 · 2021-09-08 12:49:14 +08:00 · 2021-09-08 12:49:14 +08:00 · d761d54d0e
commit d761d54d0e
parent e37621853e 678e248966
20 changed files with 122 additions and 15 deletions
--- a/db/patch9.sql
+++ b/db/patch9.sql
@ -0,0 +1,7 @@
+-- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
+BEGIN TRANSACTION;
+
+ALTER TABLE notification
+    ADD is_default BOOLEAN default 0 NOT NULL;
+
+COMMIT;
--- a/server/database.js
+++ b/server/database.js
@ -7,7 +7,7 @@ class Database {
    static templatePath = "./db/kuma.db"
    static dataDir;
    static path;
-    static latestVersion = 8;
+    static latestVersion = 9;
    static noReject = true;
    static sqliteInstance = null;

--- a/server/notification.js
+++ b/server/notification.js
@ -92,8 +92,13 @@ class Notification {

        bean.name = notification.name;
        bean.user_id = userID;
-        bean.config = JSON.stringify(notification)
+        bean.config = JSON.stringify(notification);
+        bean.is_default = notification.isDefault;
        await R.store(bean)
+
+        if (notification.applyExisting) {
+            await applyNotificationEveryMonitor(bean.id, userID);
+        }
    }

    static async delete(notificationID, userID) {
@ -117,6 +122,26 @@ class Notification {

 }

+async function applyNotificationEveryMonitor(notificationID, userID) {
+    let monitors = await R.getAll("SELECT id FROM monitor WHERE user_id = ?", [
+        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,
+        ])
+
+        if (! checkNotification) {
+            let relation = R.dispense("monitor_notification");
+            relation.monitor_id = monitors[i].id;
+            relation.notification_id = notificationID;
+            await R.store(relation)
+        }
+    }
+}
+
 module.exports = {
    Notification,
 }
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@ -436,6 +436,25 @@
                        </template>

                        <!-- DEPRECATED! Please create vue component in "./src/components/notifications/{notification name}.vue" -->
+
+                        <div class="mb-3">
+                            <hr class="dropdown-divider">
+
+                            <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>
+                            </div>
+                            <div class="form-text">
+                                {{ $t("enableDefaultNotificationDescription") }}
+                            </div>
+
+                            <br>
+
+                            <div class="form-check form-switch">
+                                <input v-model="notification.applyExisting" class="form-check-input" type="checkbox">
+                                <label class="form-check-label">{{ $t("Also apply to existing monitors") }}</label>
+                            </div>
+                        </div>
                    </div>
                    <div class="modal-footer">
                        <button v-if="id" type="button" class="btn btn-danger" :disabled="processing" @click="deleteConfirm">
@ -445,6 +464,7 @@
                            {{ $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>
                            {{ $t("Save") }}
                        </button>
                    </div>
@ -485,6 +505,7 @@ export default {
                name: "",
                type: null,
                gotifyPriority: 8,
+                isDefault: false,
            },
            appriseInstalled: false,
        }
@ -534,6 +555,7 @@ export default {
                this.notification = {
                    name: "",
                    type: null,
+                    isDefault: false,
                }

                // Default set to Telegram
--- a/src/languages/da-DK.js
+++ b/src/languages/da-DK.js
@ -116,5 +116,8 @@ export default {
    "Clear Data": "Clear Data",
    Events: "Events",
    Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
--- a/src/languages/de-DE.js
+++ b/src/languages/de-DE.js
@ -115,6 +115,9 @@ export default {
    "Resource Record Type": "Resource Record Type",
    respTime: "Antw. Zeit (ms)",
    notAvailableShort: "N/A",
+    "Default enabled": "Standardmäßig aktiviert",
+    "Also apply to existing monitors": "Auch für alle existierenden Monitore aktivieren",
+    enableDefaultNotificationDescription: "Für jeden neuen Monitor wird diese Benachrichtigung standardmäßig aktiviert. Die Benachrichtigung kann weiterhin für jeden Monitor separat deaktiviert werden.",
    Create: "Erstellen",
    "Auto Get": "Auto Get"
 }
--- a/src/languages/en.js
+++ b/src/languages/en.js
@ -16,6 +16,7 @@ export default {
    resoverserverDescription: "Cloudflare is the default server, you can change the resolver server anytime.",
    rrtypeDescription: "Select the RR-Type you want to monitor",
    pauseMonitorMsg: "Are you sure want to pause?",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
    clearEventsMsg: "Are you sure want to delete all events for this monitor?",
    clearHeartbeatsMsg: "Are you sure want to delete all heartbeats for this monitor?",
    confirmClearStatisticsMsg: "Are you sure want to delete ALL statistics?",
@ -112,6 +113,8 @@ export default {
    "Repeat Password": "Repeat Password",
    respTime: "Resp. Time (ms)",
    notAvailableShort: "N/A",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors",
    Create: "Create",
    "Clear Data": "Clear Data",
    Events: "Events",
--- a/src/languages/es-ES.js
+++ b/src/languages/es-ES.js
@ -116,5 +116,8 @@ export default {
    "Clear Data": "Clear Data",
    Events: "Events",
    Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
--- a/src/languages/fr-FR.js
+++ b/src/languages/fr-FR.js
@ -116,5 +116,8 @@ export default {
    "Clear Data": "Clear Data",
    Events: "Events",
    Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
--- a/src/languages/ja.js
+++ b/src/languages/ja.js
@ -116,5 +116,8 @@ export default {
    "Clear Data": "Clear Data",
    Events: "Events",
    Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
--- a/src/languages/ko-KR.js
+++ b/src/languages/ko-KR.js
@ -116,5 +116,8 @@ export default {
    "Clear Data": "Clear Data",
    Events: "Events",
    Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
--- a/src/languages/nl-NL.js
+++ b/src/languages/nl-NL.js
@ -116,5 +116,8 @@ export default {
    "Clear Data": "Clear Data",
    Events: "Events",
    Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
--- a/src/languages/pl.js
+++ b/src/languages/pl.js
@ -116,5 +116,8 @@ export default {
    "Clear Data": "Clear Data",
    Events: "Events",
    Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
--- a/src/languages/ru-RU.js
+++ b/src/languages/ru-RU.js
@ -116,5 +116,8 @@ export default {
    "Clear Data": "Clear Data",
    Events: "Events",
    Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
--- a/src/languages/sr-latn.js
+++ b/src/languages/sr-latn.js
@ -116,5 +116,8 @@ export default {
    "Clear Data": "Clear Data",
    Events: "Events",
    Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
--- a/src/languages/sr.js
+++ b/src/languages/sr.js
@ -116,5 +116,8 @@ export default {
    "Clear Data": "Clear Data",
    Events: "Events",
    Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
--- a/src/languages/sv-SE.js
+++ b/src/languages/sv-SE.js
@ -116,5 +116,8 @@ export default {
    "Clear Data": "Clear Data",
    Events: "Events",
    Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
--- a/src/languages/zh-CN.js
+++ b/src/languages/zh-CN.js
@ -116,5 +116,8 @@ export default {
    "Clear Data": "Clear Data",
    Events: "Events",
    Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
--- a/src/languages/zh-HK.js
+++ b/src/languages/zh-HK.js
@ -116,5 +116,8 @@ export default {
    "Clear Data": "清除資料",
    Events: "事件",
    Heartbeats: "脈搏",
-    "Auto Get": "自動獲取"
+    "Auto Get": "自動獲取",
+    enableDefaultNotificationDescription: "新增監測器時這個通知會預設啟用，當然每個監測器亦可分別控制開關。",
+    "Default enabled": "預設通知",
+    "Also apply to existing monitors": "同時取用至目前所有監測器"
 }
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@ -178,6 +178,8 @@
                                    {{ notification.name }}
                                    <a href="#" @click="$refs.notificationDialog.show(notification.id)">{{ $t("Edit") }}</a>
                                </label>
+
+                                <span v-if="notification.isDefault == true" class="badge bg-primary ms-2">Default</span>
                            </div>

                            <button class="btn btn-primary me-2" type="button" @click="$refs.notificationDialog.show()">
@ -296,6 +298,12 @@ export default {
                    dns_resolve_type: "A",
                    dns_resolve_server: "1.1.1.1",
                }
+
+                for (let i = 0; i < this.$root.notificationList.length; i++) {
+                    if (this.$root.notificationList[i].isDefault == true) {
+                        this.monitor.notificationIDList[this.$root.notificationList[i].id] = true;
+                    }
+                }
            } else if (this.isEdit) {
                this.$root.getSocket().emit("getMonitor", this.$route.params.id, (res) => {
                    if (res.ok) {