Page MenuHomePhorge
Files F32306117

D4308.1765290859.diff
No OneTemporary
Actions

Size
1 KB
Referenced Files
None
Subscribers
None

D4308.1765290859.diff
View Options

diff --git a/web/settings/relationship/add-users-list.react.js b/web/settings/relationship/add-users-list.react.js
--- a/web/settings/relationship/add-users-list.react.js
+++ b/web/settings/relationship/add-users-list.react.js
@@ -82,16 +82,54 @@
.sort((user1, user2) => user1.username.localeCompare(user2.username));
}, [excludedStatuses, mergedUserInfos]);
+ const [pendingUsersToAdd, setPendingUsersToAdd] = React.useState<
+ $ReadOnlyArray<GlobalAccountUserInfo>,
+ >([]);
+ const selectUser = React.useCallback(
+ (userID: string) => {
+ setPendingUsersToAdd(pendingUsers => {
+ const username = mergedUserInfos[userID]?.username;
+ if (!username) {
+ return pendingUsers;
+ }
+
+ for (const pendingUser of pendingUsers) {
+ if (pendingUser.id === userID) {
+ return pendingUsers;
+ }
+ }
+
+ return [
+ ...pendingUsers,
+ {
+ id: userID,
+ username,
+ },
+ ].sort((user1, user2) => user1.username.localeCompare(user2.username));
+ });
+ },
+ [mergedUserInfos],
+ );
+ const pendingUserIDs = React.useMemo(
+ () => new Set(pendingUsersToAdd.map(userInfo => userInfo.id)),
+ [pendingUsersToAdd],
+ );
+
+ const filteredUsers = React.useMemo(
+ () => sortedUsers.filter(userInfo => !pendingUserIDs.has(userInfo.id)),
+ [pendingUserIDs, sortedUsers],
+ );
+
const userRows = React.useMemo(
() =>
- sortedUsers.map(userInfo => (
+ filteredUsers.map(userInfo => (
<AddUsersListItem
userInfo={userInfo}
key={userInfo.id}
- selectUser={() => {}}
+ selectUser={selectUser}
/>
)),
- [sortedUsers],
+ [filteredUsers, selectUser],
);
return <div className={css.container}>{userRows}</div>;
}

File Metadata

Mime Type
text/plain
Expires
Tue, Dec 9, 2:34 PM (12 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5854801
Default Alt Text
D4308.1765290859.diff (1 KB)

Event Timeline