Page MenuHomePhabricator
Differential D3764

[web] Remove usage of `setTab` and replace with `setCurrentTabType`
ClosedPublic
Actions

Authored by atul on Apr 18 2022, 2:16 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 21, 8:47 PM
Unknown Object (File)
Fri, Mar 21, 8:08 PM
Unknown Object (File)
Thu, Mar 20, 10:00 PM
Unknown Object (File)
Mon, Mar 17, 10:04 PM
Unknown Object (File)
Sun, Mar 16, 4:47 AM
Unknown Object (File)
Sun, Mar 16, 4:47 AM
Unknown Object (File)
Sun, Mar 16, 4:46 AM
Unknown Object (File)
Sun, Mar 16, 4:46 AM
View All Files
Subscribers
• abosh
• adrian
ashoat
• benschac
• karol

Details

Reviewers
tomek
• jacek
Commits
rCOMM137af291c57d: [web] Remove usage of `setTab` and replace with `setCurrentTabType`
Summary

Remove setTab since it's no longer necessary and replace usages with setCurrentTabType which does the exact same thing.

As part of the work to refactor ThreadSettingsModal... specifically to turn it into a functional component.

Depends on D3763

Test Plan
  1. Open ThreadSettingsModal
  2. Switch between tabs as before

Diff Detail

Repository
rCOMM Comm
Branch
landapril21 (branched from master)
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

atul created this revision.Apr 18 2022, 2:16 PM
Herald added subscribers: • abosh, • benschac, • karol and 2 others. · View Herald TranscriptApr 18 2022, 2:16 PM
Harbormaster completed remote builds in B8277: Diff 11573.Apr 18 2022, 2:22 PM
atul requested review of this revision.Apr 18 2022, 2:22 PM
atul added a child revision: D3765: [web] Move `onChangeName` up from `ThreadSettingsModal` to `ConnectedThreadSettingsModal`.Apr 18 2022, 2:34 PM
atul updated this revision to Diff 11645.Apr 19 2022, 3:02 PM

rebase

Harbormaster completed remote builds in B8335: Diff 11645.Apr 19 2022, 3:11 PM
tomek requested changes to this revision.Apr 21 2022, 3:01 AM
tomek added inline comments.
web/modals/threads/thread-settings-modal.react.js
449–451 ↗(On Diff #11645)

Why do we need this method? Can't we just use setCurrentTabType?

This revision now requires changes to proceed.Apr 21 2022, 3:01 AM
atul requested review of this revision.Apr 21 2022, 9:07 AM
atul added inline comments.
web/modals/threads/thread-settings-modal.react.js
449–451 ↗(On Diff #11645)

Ah yeah it's no longer necessary. It used to be a helper function that set the tab when the state was an object (bc class component), but now it's unnecessary. Will update this diff to just be about removing setTab and using setCurrentTabType in its place.

atul updated this revision to Diff 11733.Apr 21 2022, 9:53 AM

address feedback

atul retitled this revision from [web] Move `setTab` up from `ThreadSettingsModal` to `ConnectedThreadSettingsModal` to [web] Remove usage of `setTab` and replace with `setCurrentTabType`.Apr 21 2022, 9:54 AM
atul edited the summary of this revision. (Show Details)
Harbormaster failed remote builds in B8408: Diff 11733!Apr 21 2022, 9:58 AM
Harbormaster completed remote builds in B8408: Diff 11733.Apr 21 2022, 10:02 AM
atul updated this revision to Diff 11823.Apr 24 2022, 11:12 AM

rebase (sequence after the already landed diffs)

Harbormaster completed remote builds in B8478: Diff 11823.Apr 24 2022, 11:16 AM
atul added a child revision: D3821: [web] Temporarily remove refs in `ThreadSettingsModal` altogether.Apr 24 2022, 11:24 AM
atul removed a parent revision: D3763: [web] Move `changeQueued` up from `ThreadSettingsModal` to `ConnectedThreadSettingsModal`.Apr 24 2022, 1:58 PM
atul removed a child revision: D3765: [web] Move `onChangeName` up from `ThreadSettingsModal` to `ConnectedThreadSettingsModal`.
tomek accepted this revision.Apr 25 2022, 6:39 AM
This revision is now accepted and ready to land.Apr 25 2022, 6:39 AM
atul updated this revision to Diff 11862.Apr 25 2022, 6:44 AM
atul added a parent revision: D3763: [web] Move `changeQueued` up from `ThreadSettingsModal` to `ConnectedThreadSettingsModal`.

rebase before landing

This revision was landed with ongoing or failed builds.Apr 25 2022, 6:45 AM
Closed by commit rCOMM137af291c57d: [web] Remove usage of `setTab` and replace with `setCurrentTabType` (authored by atul). · Explain Why
This revision was automatically updated to reflect the committed changes.
atul added a commit: rCOMM137af291c57d: [web] Remove usage of `setTab` and replace with `setCurrentTabType`.
Harbormaster completed remote builds in B8504: Diff 11862.Apr 25 2022, 6:49 AM

Revision Contents
Changeset List

PathSize
web/
modals/
threads/
12 lines

Diff 11733

View Options

web/modals/threads/thread-settings-modal.react.js

Show First 20 Lines • Show All 212 Lines • ▼ Show 20 Lines
function reassignMessagesToRealizedThreads( function reassignMessagesToRealizedThreads(
messageStore: MessageStore, messageStore: MessageStore,
threadInfos: RawThreadInfos, threadInfos: RawThreadInfos,
): ReassignmentResult { ): ReassignmentResult {
const pendingToRealizedThreadIDs = const pendingToRealizedThreadIDs =
pendingToRealizedThreadIDsSelector(threadInfos); pendingToRealizedThreadIDsSelector(threadInfos);
const messageStoreOperations: MessageStoreOperation[] = []; const messageStoreOperations: MessageStoreOperation[] = [];
const messages = {}; const messages: { [string]: RawMessageInfo } = {};
for (const storeMessageID in messageStore.messages) { for (const storeMessageID in messageStore.messages) {
const message = messageStore.messages[storeMessageID]; const message = messageStore.messages[storeMessageID];
const newThreadID = pendingToRealizedThreadIDs.get(message.threadID); const newThreadID = pendingToRealizedThreadIDs.get(message.threadID);
messages[storeMessageID] = newThreadID messages[storeMessageID] = newThreadID
? { ? {
...message, ...message,
threadID: newThreadID, threadID: newThreadID,
time: threadInfos[newThreadID]?.creationTime ?? message.time, time: threadInfos[newThreadID]?.creationTime ?? message.time,
} }
: message; : message;
if (!newThreadID) { if (!newThreadID) {
continue; continue;
} }
const updateMsgOperation: ReplaceMessageOperation = { const updateMsgOperation: ReplaceMessageOperation = {
type: 'replace', type: 'replace',
payload: { id: storeMessageID, messageInfo: messages[storeMessageID] }, payload: { id: storeMessageID, messageInfo: messages[storeMessageID] },
}; };
messageStoreOperations.push(updateMsgOperation); messageStoreOperations.push(updateMsgOperation);
} }
const threads = {}; const threads: { [string]: ThreadMessageInfo } = {};
const reassignedThreadIDs = []; const reassignedThreadIDs = [];
const updatedThreads = {}; const updatedThreads: { [string]: ThreadMessageInfo } = {};
const threadsToRemove = []; const threadsToRemove = [];
for (const threadID in messageStore.threads) { for (const threadID in messageStore.threads) {
const threadMessageInfo = messageStore.threads[threadID]; const threadMessageInfo = messageStore.threads[threadID];
const newThreadID = pendingToRealizedThreadIDs.get(threadID); const newThreadID = pendingToRealizedThreadIDs.get(threadID);
if (!newThreadID) { if (!newThreadID) {
threads[threadID] = threadMessageInfo; threads[threadID] = threadMessageInfo;
continue; continue;
} }
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Linestype MergeNewMessagesResult = {
+messageStoreOperations: $ReadOnlyArray<MessageStoreOperation>, +messageStoreOperations: $ReadOnlyArray<MessageStoreOperation>,
+messageStore: MessageStore, +messageStore: MessageStore,
}; };
// oldMessageStore is from the old state // oldMessageStore is from the old state
// newMessageInfos, truncationStatus come from server // newMessageInfos, truncationStatus come from server
function mergeNewMessages( function mergeNewMessages(
oldMessageStore: MessageStore, oldMessageStore: MessageStore,
newMessageInfos: $ReadOnlyArray<RawMessageInfo>, newMessageInfos: $ReadOnlyArray<RawMessageInfo>,
truncationStatus: { [threadID: string]: MessageTruncationStatus }, truncationStatus: { +[threadID: string]: MessageTruncationStatus },
threadInfos: RawThreadInfos, threadInfos: RawThreadInfos,
): MergeNewMessagesResult { ): MergeNewMessagesResult {
const { const {
messageStoreOperations: updateWithLatestThreadInfosOps, messageStoreOperations: updateWithLatestThreadInfosOps,
messageStore: messageStoreUpdatedWithLatestThreadInfos, messageStore: messageStoreUpdatedWithLatestThreadInfos,
reassignedThreadIDs, reassignedThreadIDs,
} = updateMessageStoreWithLatestThreadInfos(oldMessageStore, threadInfos); } = updateMessageStoreWithLatestThreadInfos(oldMessageStore, threadInfos);
▲ Show 20 Lines • Show All 134 Lines • ▼ Show 20 Lines): MergeNewMessagesResult {
)(unshimmedNewMessagesOfWatchedThreads); )(unshimmedNewMessagesOfWatchedThreads);
const newMessageOps: MessageStoreOperation[] = []; const newMessageOps: MessageStoreOperation[] = [];
const threadsToMessageIDs = mapThreadsToMessageIDsFromOrderedMessageInfos( const threadsToMessageIDs = mapThreadsToMessageIDsFromOrderedMessageInfos(
orderedNewMessageInfos, orderedNewMessageInfos,
); );
const oldMessageInfosToCombine = []; const oldMessageInfosToCombine = [];
const threadsThatNeedMessageIDsResorted = []; const threadsThatNeedMessageIDsResorted = [];
const local = {}; const local: { [string]: LocalMessageInfo } = {};
const updatedThreads = {}; const updatedThreads: { [string]: ThreadMessageInfo } = {};
const threads = _flow( const threads = _flow(
_mapValuesWithKeys((messageIDs: string[], threadID: string) => { _mapValuesWithKeys((messageIDs: string[], threadID: string) => {
const oldThread = updatedMessageStore.threads[threadID]; const oldThread = updatedMessageStore.threads[threadID];
const truncate = truncationStatus[threadID]; const truncate = truncationStatus[threadID];
if (!oldThread) { if (!oldThread) {
updatedThreads[threadID] = { updatedThreads[threadID] = {
...newThread(), ...newThread(),
messageIDs, messageIDs,
▲ Show 20 Lines • Show All 167 Lines • ▼ Show 20 Lines): UpdateMessageStoreWithLatestThreadInfosResult {
const { const {
messageStore: reassignedMessageStore, messageStore: reassignedMessageStore,
messageStoreOperations: reassignMessagesOps, messageStoreOperations: reassignMessagesOps,
reassignedThreadIDs, reassignedThreadIDs,
} = reassignMessagesToRealizedThreads(messageStore, threadInfos); } = reassignMessagesToRealizedThreads(messageStore, threadInfos);
messageStoreOperations.push(...reassignMessagesOps); messageStoreOperations.push(...reassignMessagesOps);
const watchedIDs = [...threadWatcher.getWatchedIDs(), ...reassignedThreadIDs]; const watchedIDs = [...threadWatcher.getWatchedIDs(), ...reassignedThreadIDs];
const filteredThreads = {}; const filteredThreads: { [string]: ThreadMessageInfo } = {};
const threadsToRemoveMessagesFrom = []; const threadsToRemoveMessagesFrom = [];
const messageIDsToRemove = []; const messageIDsToRemove = [];
for (const threadID in reassignedMessageStore.threads) { for (const threadID in reassignedMessageStore.threads) {
const threadMessageInfo = reassignedMessageStore.threads[threadID]; const threadMessageInfo = reassignedMessageStore.threads[threadID];
const threadInfo = threadInfos[threadID]; const threadInfo = threadInfos[threadID];
if (isThreadWatched(threadID, threadInfo, watchedIDs)) { if (isThreadWatched(threadID, threadInfo, watchedIDs)) {
filteredThreads[threadID] = threadMessageInfo; filteredThreads[threadID] = threadMessageInfo;
} else { } else {
threadsToRemoveMessagesFrom.push(threadID); threadsToRemoveMessagesFrom.push(threadID);
messageIDsToRemove.push(...threadMessageInfo.messageIDs); messageIDsToRemove.push(...threadMessageInfo.messageIDs);
} }
} }
const updatedThreads = {}; const updatedThreads: { [string]: ThreadMessageInfo } = {};
for (const threadID in threadInfos) { for (const threadID in threadInfos) {
const threadInfo = threadInfos[threadID]; const threadInfo = threadInfos[threadID];
if ( if (
isThreadWatched(threadID, threadInfo, watchedIDs) && isThreadWatched(threadID, threadInfo, watchedIDs) &&
!filteredThreads[threadID] !filteredThreads[threadID]
) { ) {
filteredThreads[threadID] = newThread(); filteredThreads[threadID] = newThread();
updatedThreads[threadID] = filteredThreads[threadID]; updatedThreads[threadID] = filteredThreads[threadID];
▲ Show 20 Lines • Show All 195 Lines • ▼ Show 20 Lines return mergeNewMessages(
[action.payload.messageInfo], [action.payload.messageInfo],
{ {
[action.payload.messageInfo.threadID]: [action.payload.messageInfo.threadID]:
messageTruncationStatus.UNCHANGED, messageTruncationStatus.UNCHANGED,
}, },
newThreadInfos, newThreadInfos,
); );
} else if (action.type === registerActionTypes.success) { } else if (action.type === registerActionTypes.success) {
const truncationStatuses = {}; const truncationStatuses: { [string]: MessageTruncationStatus } = {};
for (const messageInfo of action.payload.rawMessageInfos) { for (const messageInfo of action.payload.rawMessageInfos) {
truncationStatuses[messageInfo.threadID] = truncationStatuses[messageInfo.threadID] =
messageTruncationStatus.EXHAUSTIVE; messageTruncationStatus.EXHAUSTIVE;
} }
return mergeNewMessages( return mergeNewMessages(
messageStore, messageStore,
action.payload.rawMessageInfos, action.payload.rawMessageInfos,
truncationStatuses, truncationStatuses,
Show All 32 Lines ) {
return mergeNewMessages( return mergeNewMessages(
messageStore, messageStore,
messagesResult.rawMessageInfos, messagesResult.rawMessageInfos,
messagesResult.truncationStatuses, messagesResult.truncationStatuses,
newThreadInfos, newThreadInfos,
); );
} else if (action.type === sendEditMessageActionTypes.success) { } else if (action.type === sendEditMessageActionTypes.success) {
const { newMessageInfos } = action.payload; const { newMessageInfos } = action.payload;
const truncationStatuses = {}; const truncationStatuses: { [string]: MessageTruncationStatus } = {};
for (const messageInfo of newMessageInfos) { for (const messageInfo of newMessageInfos) {
truncationStatuses[messageInfo.threadID] = truncationStatuses[messageInfo.threadID] =
messageTruncationStatus.UNCHANGED; messageTruncationStatus.UNCHANGED;
} }
return mergeNewMessages( return mergeNewMessages(
messageStore, messageStore,
newMessageInfos, newMessageInfos,
truncationStatuses, truncationStatuses,
▲ Show 20 Lines • Show All 210 Lines • ▼ Show 20 Lines return {
messageStore: { messageStore: {
...messageStore, ...messageStore,
messages: processedMessageStore.messages, messages: processedMessageStore.messages,
threads: processedMessageStore.threads, threads: processedMessageStore.threads,
local, local,
}, },
}; };
} else if (action.type === saveMessagesActionType) { } else if (action.type === saveMessagesActionType) {
const truncationStatuses = {}; const truncationStatuses: { [string]: MessageTruncationStatus } = {};
for (const messageInfo of action.payload.rawMessageInfos) { for (const messageInfo of action.payload.rawMessageInfos) {
truncationStatuses[messageInfo.threadID] = truncationStatuses[messageInfo.threadID] =
messageTruncationStatus.UNCHANGED; messageTruncationStatus.UNCHANGED;
} }
const { messageStoreOperations, messageStore: newMessageStore } = const { messageStoreOperations, messageStore: newMessageStore } =
mergeNewMessages( mergeNewMessages(
messageStore, messageStore,
action.payload.rawMessageInfos, action.payload.rawMessageInfos,
Show All 10 Lines return {
// RawMessageInfo, so we want to make sure we still fetch it // RawMessageInfo, so we want to make sure we still fetch it
currentAsOf: messageStore.currentAsOf, currentAsOf: messageStore.currentAsOf,
}, },
}; };
} else if (action.type === messageStorePruneActionType) { } else if (action.type === messageStorePruneActionType) {
const now = Date.now(); const now = Date.now();
const messageIDsToPrune = []; const messageIDsToPrune = [];
const updatedThreads = {}; const updatedThreads: { [string]: ThreadMessageInfo } = {};
for (const threadID of action.payload.threadIDs) { for (const threadID of action.payload.threadIDs) {
let thread = messageStore.threads[threadID]; let thread = messageStore.threads[threadID];
if (!thread) { if (!thread) {
continue; continue;
} }
thread = { ...thread, lastPruned: now }; thread = { ...thread, lastPruned: now };
const newMessageIDs = [...thread.messageIDs]; const newMessageIDs = [...thread.messageIDs];
▲ Show 20 Lines • Show All 355 Lines • ▼ Show 20 Lines ) {
} }
const threadsNeedMsgIDsResorting = new Set(); const threadsNeedMsgIDsResorting = new Set();
const actionPayloadMessages = const actionPayloadMessages =
messageStoreOpsHandlers.translateClientDBData(payloadMessages); messageStoreOpsHandlers.translateClientDBData(payloadMessages);
// When starting the app on native, we filter out any local-only multimedia // When starting the app on native, we filter out any local-only multimedia
// messages because the relevant context is no longer available // messages because the relevant context is no longer available
const messageIDsToBeRemoved = []; const messageIDsToBeRemoved = [];
const threadsToAdd = {}; const threadsToAdd: { [string]: ThreadMessageInfo } = {};
for (const id in actionPayloadMessages) { for (const id in actionPayloadMessages) {
const message = actionPayloadMessages[id]; const message = actionPayloadMessages[id];
const { threadID } = message; const { threadID } = message;
let existingThread = threads[threadID]; let existingThread = threads[threadID];
if (!existingThread) { if (!existingThread) {
existingThread = newThread(); existingThread = newThread();
threadsToAdd[threadID] = existingThread; threadsToAdd[threadID] = existingThread;
} }
▲ Show 20 Lines • Show All 104 Lines • Show Last 20 Lines