Skip to content

Improve log search with multi-term and exclusion support #3270

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

Closed
limad wants to merge 1 commit into from
+12 −17
Closed

Improve log search with multi-term and exclusion support #3270

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 12 additions & 17 deletions desktop/js/log.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,28 +37,23 @@ if (!jeeFrontEnd.log) {

//searching
document.getElementById('in_searchLogFilter')?.addEventListener('keyup', function(event) {
var search = event.target.value
if (search == '') {
var raw = event.target.value
if (raw == '') {
jeeP.logListButtons.seen()
return
}
var not = search.startsWith(":not(")
if (not) {
search = search.replace(':not(', '')
}
search = jeedomUtils.normTextLower(search)

var terms = raw.split(',').map(t => t.trim()).filter(t => t.length > 0)

jeeP.logListButtons.unseen()
var match, text
jeeP.logListButtons.forEach(_bt => {
match = false
text = jeedomUtils.normTextLower(_bt.textContent)
if (text.includes(search)) {
match = true
}
if (not) match = !match
if (match) {
_bt.seen()
}
var text = jeedomUtils.normTextLower(_bt.textContent)
var match = terms.some(term => {
var not = term.startsWith(':not(')
var search = jeedomUtils.normTextLower(not ? term.slice(5, -1) : term)
return not ? !text.includes(search) : text.includes(search)
})
if (match) _bt.seen()
})
})

Expand Down
Loading