Page MenuHomePhabricator
Differential D14498

[identity] Split OTK deletion into smaller functions
ClosedPublic
Actions

Authored by bartek on Mar 25 2025, 6:48 AM.
Tags
None
Referenced Files
F6290698: D14498.id47537.diff
Sat, Apr 26, 1:57 AM
F6290585: D14498.id47537.diff
Sat, Apr 26, 1:49 AM
F6290544: D14498.id47537.diff
Sat, Apr 26, 1:46 AM
F6290318: D14498.id47537.diff
Sat, Apr 26, 1:33 AM
F6290191: D14498.id47537.diff
Sat, Apr 26, 1:24 AM
F6288655: D14498.id.diff
Fri, Apr 25, 11:40 PM
Unknown Object (File)
Fri, Apr 25, 1:32 AM
Unknown Object (File)
Wed, Apr 23, 8:02 PM
View All 29 Files
Subscribers
ashoat
tomek

Details

Reviewers
kamil
Commits
rCOMMcdc293df59ec: [identity] Split OTK deletion into smaller functions
Summary

Part of ENG-10413.
Split OTK removal into smaller functions and gave comments about their purpose, to avoid mistakes in the future

Depends on D14497

Test Plan

Tested on staging along with the rest of the stack.

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
services/
identity/
src/
database/
41 lines

Diff 47537

View Options

services/identity/src/database/one_time_keys.rs

Show All 11 Lines
import SWMansionIcon from 'lib/components/SWMansionIcon.react.js'; import SWMansionIcon from 'lib/components/SWMansionIcon.react.js';
import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js'; import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js';
import { threadInfoSelector } from 'lib/selectors/thread-selectors.js'; import { threadInfoSelector } from 'lib/selectors/thread-selectors.js';
import { userStoreMentionSearchIndex } from 'lib/selectors/user-selectors.js'; import { userStoreMentionSearchIndex } from 'lib/selectors/user-selectors.js';
import { import {
getMentionTypeaheadUserSuggestions, getMentionTypeaheadUserSuggestions,
getTypeaheadRegexMatches, getTypeaheadRegexMatches,
getUserMentionsCandidates, getUserMentionsCandidates,
getMentionTypeaheadChatSuggestions,
type MentionTypeaheadSuggestionItem, type MentionTypeaheadSuggestionItem,
type TypeaheadMatchedStrings, type TypeaheadMatchedStrings,
} from 'lib/shared/mention-utils.js'; } from 'lib/shared/mention-utils.js';
import { localIDPrefix, trimMessage } from 'lib/shared/message-utils.js'; import { localIDPrefix, trimMessage } from 'lib/shared/message-utils.js';
import { import {
threadHasPermission, threadHasPermission,
viewerIsMember, viewerIsMember,
threadFrozenDueToViewerBlock, threadFrozenDueToViewerBlock,
threadActualMembers, threadActualMembers,
checkIfDefaultMembersAreVoiced, checkIfDefaultMembersAreVoiced,
useThreadChatMentionCandidates,
useThreadChatMentionSearchIndex,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import type { CalendarQuery } from 'lib/types/entry-types.js'; import type { CalendarQuery } from 'lib/types/entry-types.js';
import type { LoadingStatus } from 'lib/types/loading-types.js'; import type { LoadingStatus } from 'lib/types/loading-types.js';
import { messageTypes } from 'lib/types/message-types-enum.js'; import { messageTypes } from 'lib/types/message-types-enum.js';
import { threadPermissions } from 'lib/types/thread-permission-types.js'; import { threadPermissions } from 'lib/types/thread-permission-types.js';
import { import {
type ThreadInfo, type ThreadInfo,
type ClientThreadJoinRequest, type ClientThreadJoinRequest,
▲ Show 20 Lines • Show All 535 Lines • ▼ Show 20 Lines React.memo<BaseProps>(function ConnectedChatInputBar(props) {
const createThreadLoadingStatus = useSelector( const createThreadLoadingStatus = useSelector(
createThreadLoadingStatusSelector, createThreadLoadingStatusSelector,
); );
const threadCreationInProgress = createThreadLoadingStatus === 'loading'; const threadCreationInProgress = createThreadLoadingStatus === 'loading';
const calendarQuery = useSelector(nonThreadCalendarQuery); const calendarQuery = useSelector(nonThreadCalendarQuery);
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const callJoinThread = useServerCall(joinThread); const callJoinThread = useServerCall(joinThread);
const userSearchIndex = useSelector(userStoreMentionSearchIndex); const userSearchIndex = useSelector(userStoreMentionSearchIndex);
const chatMentionSearchIndex = useThreadChatMentionSearchIndex(
props.threadInfo,
);
const { parentThreadID } = props.threadInfo; const { parentThreadID } = props.threadInfo;
const parentThreadInfo = useSelector(state => const parentThreadInfo = useSelector(state =>
parentThreadID ? threadInfoSelector(state)[parentThreadID] : null, parentThreadID ? threadInfoSelector(state)[parentThreadID] : null,
); );
const userMentionsCandidates = getUserMentionsCandidates( const userMentionsCandidates = getUserMentionsCandidates(
props.threadInfo, props.threadInfo,
parentThreadInfo, parentThreadInfo,
); );
const chatMentionCandidates = useThreadChatMentionCandidates(
props.threadInfo,
);
const typeaheadRegexMatches = React.useMemo( const typeaheadRegexMatches = React.useMemo(
() => () =>
getTypeaheadRegexMatches( getTypeaheadRegexMatches(
props.inputState.draft, props.inputState.draft,
{ {
start: props.inputState.textCursorPosition, start: props.inputState.textCursorPosition,
end: props.inputState.textCursorPosition, end: props.inputState.textCursorPosition,
}, },
Show All 14 Lines const typeaheadMatchedStrings: ?TypeaheadMatchedStrings = React.useMemo(
[typeaheadRegexMatches], [typeaheadRegexMatches],
); );
React.useEffect(() => { React.useEffect(() => {
if (props.inputState.typeaheadState.keepUpdatingThreadMembers) { if (props.inputState.typeaheadState.keepUpdatingThreadMembers) {
const setter = props.inputState.setTypeaheadState; const setter = props.inputState.setTypeaheadState;
setter({ setter({
frozenUserMentionsCandidates: userMentionsCandidates, frozenUserMentionsCandidates: userMentionsCandidates,
frozenChatMentionsCandidates: chatMentionCandidates,
}); });
} }
}, [ }, [
userMentionsCandidates, userMentionsCandidates,
props.inputState.setTypeaheadState, props.inputState.setTypeaheadState,
props.inputState.typeaheadState.keepUpdatingThreadMembers, props.inputState.typeaheadState.keepUpdatingThreadMembers,
chatMentionCandidates,
]); ]);
const suggestedUsers = React.useMemo(() => { const suggestedUsers = React.useMemo(() => {
if (!typeaheadMatchedStrings) { if (!typeaheadMatchedStrings) {
return []; return [];
} }
return getMentionTypeaheadUserSuggestions( return getMentionTypeaheadUserSuggestions(
userSearchIndex, userSearchIndex,
props.inputState.typeaheadState.frozenUserMentionsCandidates, props.inputState.typeaheadState.frozenUserMentionsCandidates,
viewerID, viewerID,
typeaheadMatchedStrings.textPrefix, typeaheadMatchedStrings.textPrefix,
); );
}, [ }, [
userSearchIndex, userSearchIndex,
props.inputState.typeaheadState.frozenUserMentionsCandidates, props.inputState.typeaheadState.frozenUserMentionsCandidates,
viewerID, viewerID,
typeaheadMatchedStrings, typeaheadMatchedStrings,
]); ]);
const suggestedChats = React.useMemo(() => {
if (!typeaheadMatchedStrings) {
return [];
}
return getMentionTypeaheadChatSuggestions(
chatMentionSearchIndex,
props.inputState.typeaheadState.frozenChatMentionsCandidates,
typeaheadMatchedStrings.textPrefix,
);
}, [
chatMentionSearchIndex,
props.inputState.typeaheadState.frozenChatMentionsCandidates,
typeaheadMatchedStrings,
]);
const suggestions = React.useMemo(() => {
if (!typeaheadMatchedStrings) {
return [];
}
return [...suggestedUsers, ...suggestedChats];
}, [suggestedUsers, suggestedChats, typeaheadMatchedStrings]);
rohanUnsubmitted
Not Done
Inline Actions

Does it make sense to merge these two together? Something like

const suggestions = React.useMemo(() => {
  if (!typeaheadMatchedStrings) {
    return [];
  }
  const suggestedUsers = getMentionTypeaheadUserSuggestions(
    userSearchIndex,
    props.inputState.typeaheadState.frozenUserMentionsCandidates,
    viewerID,
    typeaheadMatchedStrings.textPrefix,
  );

  const suggestedChats = getMentionTypeaheadChatSuggestions(
    chatMentionSearchIndex,
    props.inputState.typeaheadState.frozenChatMentionsCandidates,
    typeaheadMatchedStrings.textPrefix,
  );

  return [...suggestedUsers, ...suggestedChats];
}, [
  typeaheadMatchedStrings,
  userSearchIndex,
  props.inputState.typeaheadState.frozenUserMentionsCandidates,
  viewerID,
  chatMentionSearchIndex,
]);
rohan: Does it make sense to merge these two together? Something like ``` const suggestions =…
patrykAuthorUnsubmitted
Done
Inline Actions

Yes, my motivation to split this code into three useMemos was that if userSearchIndex changes and chatMentionSearchIndex not, then we would recalculate userSuggestions only, but the only time userSearchIndex and chatMentionSearchIndex would change is when user switches the focused chat, so my intuition was def wrong.

patryk: Yes, my motivation to split this code into three `useMemos` was that if `userSearchIndex`…
return ( return (
<ChatInputBar <ChatInputBar
{...props} {...props}
viewerID={viewerID} viewerID={viewerID}
joinThreadLoadingStatus={joinThreadLoadingStatus} joinThreadLoadingStatus={joinThreadLoadingStatus}
threadCreationInProgress={threadCreationInProgress} threadCreationInProgress={threadCreationInProgress}
calendarQuery={calendarQuery} calendarQuery={calendarQuery}
nextLocalID={nextLocalID} nextLocalID={nextLocalID}
isThreadActive={isThreadActive} isThreadActive={isThreadActive}
userInfos={userInfos} userInfos={userInfos}
dispatchActionPromise={dispatchActionPromise} dispatchActionPromise={dispatchActionPromise}
joinThread={callJoinThread} joinThread={callJoinThread}
typeaheadMatchedStrings={typeaheadMatchedStrings} typeaheadMatchedStrings={typeaheadMatchedStrings}
suggestions={suggestedUsers} suggestions={suggestions}
parentThreadInfo={parentThreadInfo} parentThreadInfo={parentThreadInfo}
/> />
); );
}); });
export default ConnectedChatInputBar; export default ConnectedChatInputBar;