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

Jump to bottom

AP-5315: Fix SCA proceeding search bug #7215

Merged
merged 2 commits into from
Sep 24, 2024
Merged

AP-5315: Fix SCA proceeding search bug #7215

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8e8e65
AP-5315: Fix SCA proceeding search bug
colinbruce Sep 23, 2024
03a4053
AP-5315: extract repeated code to method
colinbruce Sep 24, 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
30 changes: 19 additions & 11 deletions app/javascript/src/modules/proceedings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ function showResults (results, inputText) {
if (results.length > 0) {
deselectPreviousProceedingItem()
const codes = results.map(obj => obj.ccms_code)
let shown = 0
let proceedingsContainer = document.querySelector('.govuk-radios') // with MP flag on
if (proceedingsContainer == null) { proceedingsContainer = document.querySelector('#proceeding-list') } // with MP flag off
codes.forEach((code, idx) => {
Expand All @@ -119,12 +120,9 @@ function showResults (results, inputText) {
// proceedings is turned off, then codes will only contain those proceeding types
// that are not filtered out by the LegalFramework::ProceedingTypes::All service,
// so we just ignore them here if they aren't in the list
if (element == null) {
show(document.querySelector('.no-proceeding-items'))
ariaText = `No results found matching ${inputText}`
return
}
if (element == null) { return }

shown++ // increment the count if this code is actually shown to the user
// We want to highlight anything in the label or hint text that
// matches the user's search criteria
const label = element.querySelector('label')
Expand Down Expand Up @@ -153,17 +151,27 @@ function showResults (results, inputText) {
proceedingsContainer.insertBefore(element, proceedingsContainer.children[idx])
// show hidden proceedings item
show(element)
hide(document.querySelector('.no-proceeding-items'))
})
// the below alerts screen reader users that results appeared on the page
const pluralizedMatches = pluralize(codes.length, 'match', 'matches')
ariaText = `${codes.length} ${pluralizedMatches} found for ${inputText}, use tab to move to options`
// once we have looped over all returned codes, check if any were shown to the user
// and set the appropriate ariaText and show/hide the no-proceedings found element
if (shown > 0) {
// the below alerts screen reader users that results appeared on the page
const pluralizedMatches = pluralize(codes.length, 'match', 'matches')
ariaText = `${codes.length} ${pluralizedMatches} found for ${inputText}, use tab to move to options`
hide(document.querySelector('.no-proceeding-items'))
} else {
showNoResults(inputText)
}
} else {
show(document.querySelector('.no-proceeding-items'))
ariaText = `No results found matching ${inputText}`
showNoResults(inputText)
}
}

function showNoResults (inputText) {
show(document.querySelector('.no-proceeding-items'))
ariaText = `No results found matching ${inputText}`
}

// Hide any search results and the 'no results found' text
function hideProceeedingsItems () {
document
Expand Down