Merge 08a45637c8 into 97cbaac5d9

Fix monitor tags deletion (#5463 )
feat(search): Enhance search by filtering with hostname and dns_resolve_server
2025-03-14 05:14:46 +00:00 · 2024-12-21 11:26:48 +00:00 · 2024-12-21 12:26:36 +01:00 · 2024-12-14 22:51:19 +01:00 · 2024-12-14 22:43:16 +01:00
2 changed files with 4 additions and 1 deletions
--- a/src/components/MonitorList.vue
+++ b/src/components/MonitorList.vue
@ -327,6 +327,9 @@ export default {
                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));
            }
--- a/src/components/TagsManager.vue
+++ b/src/components/TagsManager.vue
@ -197,7 +197,7 @@ export default {
            return tagOptions;
        },
        selectedTags() {
-            return this.preSelectedTags.concat(this.newTags).filter(tag => !this.deleteTags.find(monitorTag => monitorTag.id === tag.id));
+            return this.preSelectedTags.concat(this.newTags).filter(tag => !this.deleteTags.find(monitorTag => monitorTag.tag_id === tag.tag_id));
        },
        colorOptions() {
            return colorOptions(this);
Author	SHA1	Message	Date
Ionys	a9198e5e90	Merge `08a45637c8` into `97cbaac5d9`	2024-12-21 11:26:48 +00:00
Ionys	97cbaac5d9	Fix monitor tags deletion (#5463 ) Some checks failed CodeQL / Analyze (push) Waiting to run Details Merge Conflict Labeler / Labeling (push) Waiting to run Details validate / json-yaml-validate (push) Waiting to run Details validate / validate (push) Waiting to run Details Auto Test / check-linters (push) Has been cancelled Details Auto Test / e2e-test (push) Has been cancelled Details Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled Details Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled Details Auto Test / auto-test (18, ARM64) (push) Has been cancelled Details Auto Test / auto-test (18, macos-latest) (push) Has been cancelled Details Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled Details Auto Test / auto-test (18, windows-latest) (push) Has been cancelled Details Auto Test / auto-test (20, ARM64) (push) Has been cancelled Details Auto Test / auto-test (20, macos-latest) (push) Has been cancelled Details Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled Details Auto Test / auto-test (20, windows-latest) (push) Has been cancelled Details	2024-12-21 12:26:36 +01:00
Ionys	08a45637c8	feat(search): Enhance search by filtering with `hostname` and `dns_resolve_server`	2024-12-14 22:51:19 +01:00
Ionys	39da894598	feat(search): Enhance search by filtering by URLs	2024-12-14 22:43:16 +01:00