Skip to content

30803 Ensure Look-Up drop down is in alphabetical order. #2289

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
eve-git wants to merge 1 commit into from
Closed

30803 Ensure Look-Up drop down is in alphabetical order. #2289

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ppr-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ppr-ui",
"version": "6.0.5",
"version": "6.0.6",
"private": true,
"appName": "Assets UI",
"connectLayerName": "Core UI",
Expand Down
46 changes: 35 additions & 11 deletions ppr-ui/src/components/search/SearchBarList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ export default defineComponent({
filterLabel: {
type: String,
default: ''
},
searchInput: {
type: String,
default: ''
}
},
emits: ['selected'],
Expand Down Expand Up @@ -146,26 +150,46 @@ export default defineComponent({
// Staff Only Options
if (isRoleStaff.value || isRoleStaffReg.value) {
allSearchTypes.push(...SearchTypes, ...MHRSearchTypes)
return allSearchTypes
} else {
// Client Only Blocks
if (hasPprEnabled.value && hasMhrEnabled.value) {
allSearchTypes.push(...SearchTypes, ...MHRSearchTypes)
return allSearchTypes
}

if (hasPprEnabled.value) {
} else if (hasPprEnabled.value) {
allSearchTypes.push(...SearchTypes)
return allSearchTypes.slice(1)
}

if (hasMhrEnabled.value) {
allSearchTypes.splice(0, 1)
} else if (hasMhrEnabled.value) {
allSearchTypes.push(...MHRSearchTypes)
return allSearchTypes.slice(1)
allSearchTypes.splice(0, 1)
}
}

return allSearchTypes
// If searchInput is provided, sort by relevance first, then alphabetically
const input = (typeof props.searchInput === 'string' ? props.searchInput.trim().toLowerCase() : '')
return allSearchTypes.sort((a, b) => {
// Keep headers at the top of their group
if (a.class === 'search-list-header' && b.class !== 'search-list-header') return -1;
if (a.class !== 'search-list-header' && b.class === 'search-list-header') return 1;
if (a.class === 'search-list-header' && b.class === 'search-list-header') return 0;

if (input) {
const aText = (a.searchTypeUI || '').toLowerCase();
const bText = (b.searchTypeUI || '').toLowerCase();
// Items that start with the input are most relevant
const aStarts = aText.startsWith(input);
const bStarts = bText.startsWith(input);
if (aStarts && !bStarts) return -1;
if (!aStarts && bStarts) return 1;
// Items that contain the input are next most relevant
const aContains = aText.includes(input);
const bContains = bText.includes(input);
if (aContains && !bContains) return -1;
if (!aContains && bContains) return 1;
// Otherwise, sort alphabetically
return aText.localeCompare(bText);
}
// No input: sort alphabetically
return (a.searchTypeUI || '').localeCompare(b.searchTypeUI || '');
});
}),
isSingleSearchOption: computed((): boolean => {
return ((hasPprEnabled.value && !hasMhrEnabled.value) || (!hasPprEnabled.value && hasMhrEnabled.value)) &&
Expand Down