Merge d0d03c05d6 into be2faf64ce

fix(monitors search): Correctly handle null/undefined/empty values. Also optimize a bit search tags by replacing .find with .some.
Thanks @homelab-alpha
2025-03-13 04:44:46 +00:00 · 2024-12-22 11:24:43 +01:00 · 2024-12-22 11:24:36 +01:00 · 2024-12-22 10:40:33 +01:00 · 2024-12-22 13:46:13 +08:00 · 2024-12-22 13:45:19 +08:00
2 changed files with 16 additions and 8 deletions
--- a/README.md
+++ b/README.md
@ -62,6 +62,7 @@ Requirements:
 - Platform
  - ✅ Major Linux distros such as Debian, Ubuntu, CentOS, Fedora and ArchLinux etc.
  - ✅ Windows 10 (x64), Windows Server 2012 R2 (x64) or higher
+  - ❌ FreeBSD / OpenBSD / NetBSD
  - ❌ Replit / Heroku
 - [Node.js](https://nodejs.org/en/download/) 18 / 20.4
 - [npm](https://docs.npmjs.com/cli/) 9
--- a/src/components/MonitorList.vue
+++ b/src/components/MonitorList.vue
@ -324,14 +324,21 @@ export default {
            // finds monitor name, tag name or tag value
            let searchTextMatch = true;
            if (this.searchText !== "") {
-                const loweredSearchText = this.searchText.toLowerCase();
-                searchTextMatch =
-                    monitor.name.toLowerCase().includes(loweredSearchText)
-                    || monitor.url?.toLowerCase().includes(loweredSearchText)
-                    || monitor.hostname?.toLowerCase().includes(loweredSearchText)
-                    || monitor.dns_resolve_server?.toLowerCase().includes(loweredSearchText)
-                    || monitor.tags.find(tag => tag.name.toLowerCase().includes(loweredSearchText)
-                        || tag.value?.toLowerCase().includes(loweredSearchText));
+                try {
+                    const regex = new RegExp(this.searchText, "i"); // "i" for case-insensitive matching
+
+                    const safeRegexTest = (str) => str && regex.test(str);
+
+                    searchTextMatch =
+                        regex.test(monitor.name) ||
+                        safeRegexTest(monitor.url) ||
+                        safeRegexTest(monitor.hostname) ||
+                        safeRegexTest(monitor.dns_resolve_server) ||
+                        monitor.tags.some(tag => regex.test(tag.name) || safeRegexTest(tag.value));
+                } catch (e) {
+                    console.error("Invalid regex pattern:", e);
+                    searchTextMatch = false;
+                }
            }

            // filter by status
Author	SHA1	Message	Date
Ionys	510bb9e551	Merge `d0d03c05d6` into `be2faf64ce`	2024-12-22 11:24:43 +01:00
Ionys	d0d03c05d6	fix(monitors search): Correctly handle null/undefined/empty values. Also optimize a bit search tags by replacing `.find` with `.some`. Thanks @homelab-alpha	2024-12-22 11:24:36 +01:00
Ionys	1e0342949f	feat(monitors search): Use regex instead of `LowerCase` Except with less than 20 monitors, regex seems faster.	2024-12-22 10:40:33 +01:00
Louis Lam	be2faf64ce	Clarify that BSD OSs are not supported (#5465 ) Some checks failed validate / json-yaml-validate (push) Has been cancelled Details validate / validate (push) Has been cancelled Details CodeQL / Analyze (push) Has been cancelled Details Merge Conflict Labeler / Labeling (push) Has been cancelled Details	2024-12-22 13:46:13 +08:00
Louis Lam	0b76e19401	Clarify that BSD OSs are not supported	2024-12-22 13:45:19 +08:00