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

fix for safari and accents insensitive on scenarios filter #2754

Merged
merged 1 commit into from
Aug 5, 2024
Merged

fix for safari and accents insensitive on scenarios filter #2754

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
37 changes: 18 additions & 19 deletions core/template/scenario/scenario.default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="input-group input-group-sm" style="width: 100%">
<span class="input-group-addon roundedLeft">{{Scénario}}</span>
<select class="expressionAttr form-control input-sm" data-l1key="options" data-l2key="scenario_id" data-cmd_id="#id#" data-uid="#uid#"></select>
<input class="expressionAttr form-control rounded-left" data-l1key="options" data-l2key="filter" placeholder="{{Filtre de scénario}}" data-cmd_id="#id#" data-uid="#uid#">
<input class="expressionAttr form-control rounded-left" data-l1key="options" data-l2key="filter" placeholder="{{Filtre des scénarios}}" data-cmd_id="#id#" data-uid="#uid#">
<span class="input-group-addon">{{Action}}</span>
<select class="expressionAttr form-control input-sm roundedRight" data-l1key="options" data-l2key="action" data-cmd_id="#id#" data-uid="#uid#">
<option value="start">{{Démarrer}}</option>
Expand Down Expand Up @@ -55,26 +55,25 @@
select.appendChild(optgroup)
}

const filter = document.querySelector('.expressionAttr[data-uid="#uid#"][data-l1key="options"][data-l2key="filter"]')
filter.addEventListener('keyup', function(event) {
const text = event.target.value
const options = Array.from(select.options)
const regex = new RegExp("^" + text, "i")
const lowerText = text.toLowerCase()
const input = document.querySelector('.expressionAttr[data-uid="#uid#"][data-l1key="options"][data-l2key="filter"]')
const allOptions = Array.from(select.options)

options.forEach(option => {
const optionText = option.text
const lowerOptionText = optionText.toLowerCase()
const match = optionText.match(regex)
const contains = lowerOptionText.indexOf(lowerText) !== -1
option.hidden = !(match || contains)
});
function filterOptions() {
const text = input.value.trim().toLowerCase().stripAccents()

Array.from(select.getElementsByTagName('optgroup')).forEach(optgroup => {
const visibleOptions = Array.from(optgroup.children).some(option => !option.hidden)
optgroup.hidden = !visibleOptions
})
})
select.innerHTML = ''

allOptions
.filter(option => {
const optionText = option.textContent.toLowerCase().stripAccents()
return text === '' || optionText.includes(text)
})
.forEach(option => {
select.add(option.cloneNode(true))
})
}

input.addEventListener('input', filterOptions)

if ('#scenario_id#' != '' && document.querySelector('.expressionAttr[data-uid="#uid#"][data-l1key="options"][data-l2key="scenario_id"] option[value="#scenario_id#"]')?.innerHTML != '') {
document.querySelector('.expressionAttr[data-uid="#uid#"][data-l1key="options"][data-l2key="scenario_id"]').value = '#scenario_id#'
Expand Down
Loading