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

perf: Implement filtering in Task - Share Somewhere #40290

Merged
merged 7 commits into from
Jul 25, 2024
Merged

perf: Implement filtering in Task - Share Somewhere #40290

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
75872d3
implement filtering in task share somewhere
TMisiukiewicz Apr 16, 2024
55786c3
Merge branch 'main' into perf/share-somewhere-filtering
TMisiukiewicz Jun 26, 2024
b4f9106
use double negation
TMisiukiewicz Jun 26, 2024
bb3ea83
display chatrooms by participants
TMisiukiewicz Jun 26, 2024
32a8dd9
Merge branch 'main' into perf/share-somewhere-filtering
TMisiukiewicz Jul 8, 2024
a174f0b
Merge branch 'main' into perf/share-somewhere-filtering
TMisiukiewicz Jul 22, 2024
ce8a2b2
Merge branch 'main' into perf/share-somewhere-filtering
TMisiukiewicz Jul 25, 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
60 changes: 45 additions & 15 deletions src/pages/tasks/TaskShareDestinationSelectorModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,22 +56,53 @@ function TaskShareDestinationSelectorModal() {

const textInputHint = useMemo(() => (isOffline ? `${translate('common.youAppearToBeOffline')} ${translate('search.resultsAreLimited')}` : ''), [isOffline, translate]);

const options = useMemo(() => {
const defaultOptions = useMemo(() => {
if (!areOptionsInitialized) {
return {
sections: [],
headerMessage: '',
recentReports: [],
personalDetails: [],
userToInvite: null,
currentUserOption: null,
categoryOptions: [],
tagOptions: [],
taxRatesOptions: [],
header: '',
};
}
const filteredReports = reportFilter(optionList.reports);
const {recentReports} = OptionsListUtils.getShareDestinationOptions(filteredReports, optionList.personalDetails, [], debouncedSearchValue.trim(), [], CONST.EXPENSIFY_EMAILS, true);
const headerMessage = OptionsListUtils.getHeaderMessage(recentReports && recentReports.length !== 0, false, debouncedSearchValue);
const {recentReports} = OptionsListUtils.getShareDestinationOptions(filteredReports, optionList.personalDetails, [], '', [], [], true);
const header = OptionsListUtils.getHeaderMessage(recentReports && recentReports.length !== 0, false, '');
return {
recentReports,
personalDetails: [],
userToInvite: null,
currentUserOption: null,
categoryOptions: [],
tagOptions: [],
taxRatesOptions: [],
header,
};
}, [areOptionsInitialized, optionList.personalDetails, optionList.reports]);

const options = useMemo(() => {
if (debouncedSearchValue.trim() === '') {
return defaultOptions;
}
const filteredReports = OptionsListUtils.filterOptions(defaultOptions, debouncedSearchValue.trim(), {
excludeLogins: CONST.EXPENSIFY_EMAILS,
canInviteUser: false,
includeChatRoomsByParticipants: true,
});
const header = OptionsListUtils.getHeaderMessage(filteredReports.recentReports && filteredReports.recentReports.length !== 0, false, debouncedSearchValue);
return {...filteredReports, header};
}, [debouncedSearchValue, defaultOptions]);

const sections =
recentReports && recentReports.length > 0
const sections = useMemo(
() =>
options.recentReports && options.recentReports.length > 0
? [
{
data: recentReports.map((option) => ({
data: options.recentReports.map((option) => ({
...option,
text: option.text ?? '',
alternateText: option.alternateText ?? undefined,
Expand All @@ -83,10 +114,9 @@ function TaskShareDestinationSelectorModal() {
shouldShow: true,
},
]
: [];

return {sections, headerMessage};
}, [areOptionsInitialized, optionList.reports, optionList.personalDetails, debouncedSearchValue]);
: [],
[options.recentReports],
);

useEffect(() => {
ReportActions.searchInServer(debouncedSearchValue);
Expand All @@ -106,14 +136,14 @@ function TaskShareDestinationSelectorModal() {
<View style={[styles.flex1, styles.w100, styles.pRelative]}>
<SelectionList
ListItem={UserListItem}
sections={areOptionsInitialized ? options.sections : []}
sections={areOptionsInitialized ? sections : []}
onSelectRow={selectReportHandler}
shouldDebounceRowSelect
onChangeText={setSearchValue}
textInputValue={searchValue}
headerMessage={options.headerMessage}
headerMessage={options.header}
textInputLabel={translate('selectionList.nameEmailOrPhoneNumber')}
showLoadingPlaceholder={areOptionsInitialized && debouncedSearchValue.trim() === '' ? options.sections.length === 0 : !didScreenTransitionEnd}
showLoadingPlaceholder={areOptionsInitialized && debouncedSearchValue.trim() === '' ? sections.length === 0 : !didScreenTransitionEnd}
isLoadingNewOptions={!!isSearchingForReports}
textInputHint={textInputHint}
/>
Expand Down
Loading