Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhance search by filtering by URL, hostname and dns resolve server #5438

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Enhance search by filtering by URL, hostname and dns resolve server #5438

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
39da894
feat(search): Enhance search by filtering by URLs
Ionys320 Dec 14, 2024
08a4563
feat(search): Enhance search by filtering with `hostname` and `dns_re…
Ionys320 Dec 14, 2024
c486e5b
Merge branch 'master' into feat-search-with-url
Ionys320 Dec 21, 2024
1e03429
feat(monitors search): Use regex instead of `LowerCase`
Ionys320 Dec 22, 2024
d0d03c0
fix(monitors search): Correctly handle null/undefined/empty values. A…
Ionys320 Dec 22, 2024
c0d7171
fix(monitors search): Make sure regex expressions are escaped.
Ionys320 Dec 23, 2024
012256b
Merge branch 'master' into feat-search-with-url
Ionys320 Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions src/components/MonitorList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,11 +324,25 @@ 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.tags.find(tag => tag.name.toLowerCase().includes(loweredSearchText)
|| tag.value?.toLowerCase().includes(loweredSearchText));
try {
// Escape special characters for use in the regular expression
const escapeRegExp = (string) => string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");

const escapedSearchText = escapeRegExp(this.searchText);
const regex = new RegExp(escapedSearchText, "i");

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
Expand Down
Loading