Paths

Table of Contentst

-
lib/shared/
-
shared/
-
thread-utils.js

[lib] Search for users in thread list search
ClosedPublic
Actions

Authored by inka on Apr 26 2024, 5:45 AM.

Details

Reviewers

will
tomek
ashoat

Commits

rCOMM0dedc239c178: [lib] Search for users in thread list search

Summary

issue: ENG-7315
We want the search in thread list to start querying the identity service for users

Screenshot 2024-04-26 at 12.39.18.png (1×3 px, 364 KB)

Screenshot 2024-04-26 at 12.54.52.png (1×3 px, 369 KB)

(okapi7 is a user registered on my keyserver)

Test Plan

Tested that on web and native thread list now also shows users registered with identity that the user does not know of - that are not even on my keyserver
Tested that threads that match the query are still visible as well
Tested that users that are registered with my keyserver are visible

Diff Detail

Repository

rCOMM Comm

Branch

inka/may2

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

inka created this revision.Apr 26 2024, 5:45 AM

Herald added a subscriber: ashoat. · View Herald TranscriptApr 26 2024, 5:45 AM

inka edited the summary of this revision. (Show Details)Apr 26 2024, 5:46 AM

inka attached a referenced file: F1665712: Screenshot 2024-04-26 at 12.54.52.png. (Show Details)

inka attached a referenced file: F1665713: Screenshot 2024-04-26 at 12.39.18.png. (Show Details)

Harbormaster completed remote builds in B28499: Diff 39534.Apr 26 2024, 6:01 AM

inka requested review of this revision.Apr 26 2024, 6:01 AM

Looks good to me

This revision is now accepted and ready to land.Apr 26 2024, 7:51 PM

ashoat added inline comments.Apr 27 2024, 6:12 PM

lib/shared/thread-utils.js
1567–1568 ↗	(On Diff #39534)	Should we rename these to indicate that they are the "legacy" approach?
1603–1605 ↗	(On Diff #39534)	I feel like we should be able to avoid copy-pasting the filter logic here. What if we define a callback eg. `setSearchResults` (feel free to rethink the naming) that does the filter and then calls `setUsersSearchResults`? Then we could use that in `searchUsers`, as well as using it here.

Address review

Harbormaster completed remote builds in B28597: Diff 39685.Apr 30 2024, 2:58 AM

ashoat accepted this revision.Apr 30 2024, 4:59 AM

Closed by commit rCOMM0dedc239c178: [lib] Search for users in thread list search (authored by inka). · Explain WhyApr 30 2024, 8:26 AM

This revision was automatically updated to reflect the committed changes.

inka added a commit: rCOMM0dedc239c178: [lib] Search for users in thread list search.

ashoat mentioned this in D12681: [lib] Don't query keyserver for empty string from useThreadListSearch.Jul 6 2024, 2:45 PM

ashoat mentioned this in rCOMMbd12ab53cebf: [lib] Don't query keyserver for empty string from useThreadListSearch.Jul 8 2024, 8:11 AM

Revision Contents
Changeset List

Path

Size

lib/

shared/

thread-utils.js

47 lines

Diff 39685

View Options

lib/shared/thread-utils.js

Show All 19 Lines	import {
View,		View,
} from 'react-native';		} from 'react-native';

import type { UpdateCalendarQueryInput } from 'lib/actions/entry-actions.js';		import type { UpdateCalendarQueryInput } from 'lib/actions/entry-actions.js';
import {		import {
updateCalendarQueryActionTypes,		updateCalendarQueryActionTypes,
useUpdateCalendarQuery,		useUpdateCalendarQuery,
} from 'lib/actions/entry-actions.js';		} from 'lib/actions/entry-actions.js';
import { connectionSelector } from 'lib/selectors/keyserver-selectors.js';
import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js';		import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js';
import { entryKey } from 'lib/shared/entry-utils.js';		import { entryKey } from 'lib/shared/entry-utils.js';
import type {		import type {
CalendarQuery,		CalendarQuery,
CalendarQueryUpdateResult,		CalendarQueryUpdateResult,
EntryInfo,		EntryInfo,
} from 'lib/types/entry-types.js';		} from 'lib/types/entry-types.js';
import type { CalendarFilter } from 'lib/types/filter-types.js';		import type { CalendarFilter } from 'lib/types/filter-types.js';
import type { LoadingStatus } from 'lib/types/loading-types.js';		import type { LoadingStatus } from 'lib/types/loading-types.js';
import type { ThreadInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js';		import type { ThreadInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js';
import type { ConnectionStatus } from 'lib/types/socket-types.js';
import {		import {
dateFromString,		dateFromString,
dateString,		dateString,
prettyDate,		prettyDate,
} from 'lib/utils/date-utils.js';		} from 'lib/utils/date-utils.js';
import {		import {
type DispatchActionPromise,		type DispatchActionPromise,
useDispatchActionPromise,		useDispatchActionPromise,
} from 'lib/utils/redux-promise-utils.js';		} from 'lib/utils/redux-promise-utils.js';
import sleep from 'lib/utils/sleep.js';		import sleep from 'lib/utils/sleep.js';

import CalendarInputBar from './calendar-input-bar.react.js';		import CalendarInputBar from './calendar-input-bar.react.js';
import {		import {
dummyNodeForEntryHeightMeasurement,		dummyNodeForEntryHeightMeasurement,
Entry,		Entry,
InternalEntry,		InternalEntry,
} from './entry.react.js';		} from './entry.react.js';
import SectionFooter from './section-footer.react.js';		import SectionFooter from './section-footer.react.js';
import { authoritativeKeyserverID } from '../authoritative-keyserver.js';
import ContentLoading from '../components/content-loading.react.js';		import ContentLoading from '../components/content-loading.react.js';
import KeyboardAvoidingView from '../components/keyboard-avoiding-view.react.js';		import KeyboardAvoidingView from '../components/keyboard-avoiding-view.react.js';
import ListLoadingIndicator from '../components/list-loading-indicator.react.js';		import ListLoadingIndicator from '../components/list-loading-indicator.react.js';
import NodeHeightMeasurer from '../components/node-height-measurer.react.js';		import NodeHeightMeasurer from '../components/node-height-measurer.react.js';
import {		import {
addKeyboardDismissListener,		addKeyboardDismissListener,
addKeyboardShowListener,		addKeyboardShowListener,
removeKeyboardListener,		removeKeyboardListener,
▲ Show 20 Lines • Show All 100 Lines • ▼ Show 20 Lines	type Props = {
+calendarActive: boolean,		+calendarActive: boolean,
// Redux state		// Redux state
+listData: ?$ReadOnlyArray<CalendarItem>,		+listData: ?$ReadOnlyArray<CalendarItem>,
+startDate: string,		+startDate: string,
+endDate: string,		+endDate: string,
+calendarFilters: $ReadOnlyArray<CalendarFilter>,		+calendarFilters: $ReadOnlyArray<CalendarFilter>,
+dimensions: DerivedDimensionsInfo,		+dimensions: DerivedDimensionsInfo,
+loadingStatus: LoadingStatus,		+loadingStatus: LoadingStatus,
+connectionStatus: ConnectionStatus,		+connected: boolean,
+colors: Colors,		+colors: Colors,
+styles: $ReadOnly<typeof unboundStyles>,		+styles: $ReadOnly<typeof unboundStyles>,
+indicatorStyle: IndicatorStyle,		+indicatorStyle: IndicatorStyle,
// Redux dispatch functions		// Redux dispatch functions
+dispatchActionPromise: DispatchActionPromise,		+dispatchActionPromise: DispatchActionPromise,
// async functions that hit server APIs		// async functions that hit server APIs
+updateCalendarQuery: (		+updateCalendarQuery: (
input: UpdateCalendarQueryInput,		input: UpdateCalendarQueryInput,
▲ Show 20 Lines • Show All 115 Lines • ▼ Show 20 Lines	if (!this.props.listData && this.props.listData !== prevProps.listData) {
readyToShowList: false,		readyToShowList: false,
extraData: this.latestExtraData,		extraData: this.latestExtraData,
});		});
this.firstScrollComplete = false;		this.firstScrollComplete = false;
this.topLoaderWaitingToLeaveView = true;		this.topLoaderWaitingToLeaveView = true;
this.bottomLoaderWaitingToLeaveView = true;		this.bottomLoaderWaitingToLeaveView = true;
}		}

const { loadingStatus, connectionStatus } = this.props;		const { loadingStatus, connected } = this.props;
const {		const { loadingStatus: prevLoadingStatus, connected: prevConnected } =
loadingStatus: prevLoadingStatus,		prevProps;
connectionStatus: prevConnectionStatus,
} = prevProps;
if (		if (
(loadingStatus === 'error' && prevLoadingStatus === 'loading') \|\|		(loadingStatus === 'error' && prevLoadingStatus === 'loading') \|\|
(connectionStatus === 'connected' && prevConnectionStatus !== 'connected')		(connected && !prevConnected)
) {		) {
this.loadMoreAbove();		this.loadMoreAbove();
this.loadMoreBelow();		this.loadMoreBelow();
}		}

const lastLDWH = prevState.listDataWithHeights;		const lastLDWH = prevState.listDataWithHeights;
const newLDWH = this.state.listDataWithHeights;		const newLDWH = this.state.listDataWithHeights;
if (!newLDWH) {		if (!newLDWH) {
▲ Show 20 Lines • Show All 682 Lines • ▼ Show 20 Lines	void this.props.dispatchActionPromise(
this.props.updateCalendarQuery({ calendarQuery }),		this.props.updateCalendarQuery({ calendarQuery }),
);		);
}		}

loadMoreAbove: () => void = _throttle(() => {		loadMoreAbove: () => void = _throttle(() => {
if (		if (
this.topLoadingFromScroll &&		this.topLoadingFromScroll &&
this.topLoaderWaitingToLeaveView &&		this.topLoaderWaitingToLeaveView &&
this.props.connectionStatus === 'connected'		this.props.connected
) {		) {
this.dispatchCalendarQueryUpdate(this.topLoadingFromScroll);		this.dispatchCalendarQueryUpdate(this.topLoadingFromScroll);
}		}
}, 1000);		}, 1000);

loadMoreBelow: () => void = _throttle(() => {		loadMoreBelow: () => void = _throttle(() => {
if (		if (
this.bottomLoadingFromScroll &&		this.bottomLoadingFromScroll &&
this.bottomLoaderWaitingToLeaveView &&		this.bottomLoaderWaitingToLeaveView &&
this.props.connectionStatus === 'connected'		this.props.connected
) {		) {
this.dispatchCalendarQueryUpdate(this.bottomLoadingFromScroll);		this.dispatchCalendarQueryUpdate(this.bottomLoadingFromScroll);
}		}
}, 1000);		}, 1000);

onScroll = (event: ScrollEvent) => {		onScroll = (event: ScrollEvent) => {
this.currentScrollPosition = event.nativeEvent.contentOffset.y;		this.currentScrollPosition = event.nativeEvent.contentOffset.y;
};		};
▲ Show 20 Lines • Show All 44 Lines • ▼ Show 20 Lines	const calendarActive =
activeTabSelector(navContext) \|\| activeThreadPickerSelector(navContext);		activeTabSelector(navContext) \|\| activeThreadPickerSelector(navContext);

const listData = useSelector(calendarListData);		const listData = useSelector(calendarListData);
const startDate = useSelector(state => state.navInfo.startDate);		const startDate = useSelector(state => state.navInfo.startDate);
const endDate = useSelector(state => state.navInfo.endDate);		const endDate = useSelector(state => state.navInfo.endDate);
const calendarFilters = useSelector(state => state.calendarFilters);		const calendarFilters = useSelector(state => state.calendarFilters);
const dimensions = useSelector(derivedDimensionsInfoSelector);		const dimensions = useSelector(derivedDimensionsInfoSelector);
const loadingStatus = useSelector(loadingStatusSelector);		const loadingStatus = useSelector(loadingStatusSelector);
const connection = useSelector(		const connected = useSelector(state => state.connectivity.connected);
connectionSelector(authoritativeKeyserverID),
);
invariant(connection, 'keyserver missing from keyserverStore');
const connectionStatus = connection.status;
const colors = useColors();		const colors = useColors();
const styles = useStyles(unboundStyles);		const styles = useStyles(unboundStyles);
const indicatorStyle = useIndicatorStyle();		const indicatorStyle = useIndicatorStyle();

const dispatchActionPromise = useDispatchActionPromise();		const dispatchActionPromise = useDispatchActionPromise();
const callUpdateCalendarQuery = useUpdateCalendarQuery();		const callUpdateCalendarQuery = useUpdateCalendarQuery();

return (		return (
<Calendar		<Calendar
{...props}		{...props}
calendarActive={calendarActive}		calendarActive={calendarActive}
listData={listData}		listData={listData}
startDate={startDate}		startDate={startDate}
endDate={endDate}		endDate={endDate}
calendarFilters={calendarFilters}		calendarFilters={calendarFilters}
dimensions={dimensions}		dimensions={dimensions}
loadingStatus={loadingStatus}		loadingStatus={loadingStatus}
connectionStatus={connectionStatus}		connected={connected}
colors={colors}		colors={colors}
styles={styles}		styles={styles}
indicatorStyle={indicatorStyle}		indicatorStyle={indicatorStyle}
dispatchActionPromise={dispatchActionPromise}		dispatchActionPromise={dispatchActionPromise}
updateCalendarQuery={callUpdateCalendarQuery}		updateCalendarQuery={callUpdateCalendarQuery}
/>		/>
);		);
},		},
);		);

export default ConnectedCalendar;		export default ConnectedCalendar;

[lib] Search for users in thread list searchClosedPublicActions