Skip to content

Fix: search page order #6544

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

Merged
Jag96 merged 3 commits into from
Dec 1, 2021
Merged

Fix: search page order #6544

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4addab
Fix: search page order
parasharrajat Nov 30, 2021
62d8e63
Set ordering parameter for Search page.
parasharrajat Dec 1, 2021
c3e6870
review-1
parasharrajat Dec 1, 2021
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
17 changes: 16 additions & 1 deletion src/libs/OptionsListUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ function getOptions(reports, personalDetails, activeReportID, {
includeRecentReports = false,
prioritizePinnedReports = false,
prioritizeDefaultRoomsInSearch = false,
sortByReportTypeInSearch = false,
sortByLastMessageTimestamp = false,
searchValue = '',
showChatPreviewLine = false,
Expand Down Expand Up @@ -508,6 +509,19 @@ function getOptions(reports, personalDetails, activeReportID, {
recentReportOptions = reportsSplitByDefaultChatRoom[0].concat(reportsSplitByDefaultChatRoom[1]);
}

// If we are prioritizing 1:1 chats in search, do it only once we started searching
if (sortByReportTypeInSearch && searchValue !== '') {
recentReportOptions = lodashOrderBy(recentReportOptions, [(option) => {
if (option.isDefaultChatRoom || option.isArchivedRoom) {
return 3;
}
if (!option.login) {
return 2;
}
return 1;
}], ['asc']);
}

if (includePersonalDetails) {
// Next loop over all personal details removing any that are selectedUsers or recentChats
_.each(allPersonalDetailsOptions, (personalDetailOption) => {
Expand Down Expand Up @@ -576,7 +590,8 @@ function getSearchOptions(
includeMultipleParticipantReports: true,
maxRecentReportsToShow: 0, // Unlimited
prioritizePinnedReports: false,
prioritizeDefaultRoomsInSearch: true,
prioritizeDefaultRoomsInSearch: false,
sortByReportTypeInSearch: true,
showChatPreviewLine: true,
showReportsWithNoComments: true,
includePersonalDetails: true,
Expand Down