From 32f7a0084acbf7c5f0984d55082b320e32a63fb0 Mon Sep 17 00:00:00 2001
From: Matthew Nickson <mnickson@sidingsmedia.com>
Date: Sun, 8 Jan 2023 19:09:06 +0000
Subject: [PATCH] Fixed negative retention time values

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
---
 server/jobs/clear-old-data.js              | 21 ++++++++-----
 src/components/settings/MonitorHistory.vue |  6 +++-
 src/languages/en.js                        |  2 ++
 src/pages/Settings.vue                     | 36 +++++++++++++++++-----
 4 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/server/jobs/clear-old-data.js b/server/jobs/clear-old-data.js
index 0ec5ffa5..ed80b0f7 100644
--- a/server/jobs/clear-old-data.js
+++ b/server/jobs/clear-old-data.js
@@ -25,15 +25,20 @@ const DEFAULT_KEEP_PERIOD = 180;
         parsedPeriod = DEFAULT_KEEP_PERIOD;
     }
 
-    log(`Clearing Data older than ${parsedPeriod} days...`);
+    if (parsedPeriod < 1) {
+        log(`Data deletion has been disabled as period is less than 1. Period is ${parsedPeriod} days.`);
+    } else {
 
-    try {
-        await R.exec(
-            "DELETE FROM heartbeat WHERE time < DATETIME('now', '-' || ? || ' days') ",
-            [ parsedPeriod ]
-        );
-    } catch (e) {
-        log(`Failed to clear old data: ${e.message}`);
+        log(`Clearing Data older than ${parsedPeriod} days...`);
+
+        try {
+            await R.exec(
+                "DELETE FROM heartbeat WHERE time < DATETIME('now', '-' || ? || ' days') ",
+                [ parsedPeriod ]
+            );
+        } catch (e) {
+            log(`Failed to clear old data: ${e.message}`);
+        }
     }
 
     exit();
diff --git a/src/components/settings/MonitorHistory.vue b/src/components/settings/MonitorHistory.vue
index c78c6aaf..afcb7bc9 100644
--- a/src/components/settings/MonitorHistory.vue
+++ b/src/components/settings/MonitorHistory.vue
@@ -7,6 +7,7 @@
                         settings.keepDataPeriodDays,
                     ])
                 }}
+                {{ $t("infiniteRetention") }}
             </label>
             <input
                 id="keepDataPeriodDays"
@@ -14,9 +15,12 @@
                 type="number"
                 class="form-control"
                 required
-                min="1"
+                min="0"
                 step="1"
             />
+            <div v-if="settings.keepDataPeriodDays < 0" class="form-text">
+                {{ $t("dataRetentionTimeError") }}
+            </div>
         </div>
         <div class="my-4">
             <button class="btn btn-primary" type="button" @click="saveSettings()">
diff --git a/src/languages/en.js b/src/languages/en.js
index 8d07db6d..7a48d0d0 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -675,4 +675,6 @@ export default {
     "General Monitor Type": "General Monitor Type",
     "Passive Monitor Type": "Passive Monitor Type",
     "Specific Monitor Type": "Specific Monitor Type",
+    dataRetentionTimeError: "Retention period must be 0 or greater",
+    infiniteRetention: "Set to 0 for infinite retention.",
 };
diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index 87404968..f2dd3475 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -189,14 +189,36 @@ export default {
          * @param {string} [currentPassword] Only need for disableAuth to true
          */
         saveSettings(callback, currentPassword) {
-            this.$root.getSocket().emit("setSettings", this.settings, currentPassword, (res) => {
-                this.$root.toastRes(res);
-                this.loadSettings();
+            let valid = this.validateSettings();
+            if (valid.success) {
+                this.$root.getSocket().emit("setSettings", this.settings, currentPassword, (res) => {
+                    this.$root.toastRes(res);
+                    this.loadSettings();
 
-                if (callback) {
-                    callback();
-                }
-            });
+                    if (callback) {
+                        callback();
+                    }
+                });
+            } else {
+                this.$root.toastError(valid.msg);
+            }
+        },
+
+        /**
+         * Ensure settings are valid
+         * @returns {Object} Contains success state and error msg
+         */
+        validateSettings() {
+            if (this.settings.keepDataPeriodDays < 0) {
+                return {
+                    success: false,
+                    msg: this.$t("dataRetentionTimeError"),
+                };
+            }
+            return {
+                success: true,
+                msg: "",
+            };
         },
     }
 };