Merge pull request #34028 from BhuvaneshPatil/32839-select-members-fr…

…om-onyx Select members from ONYX on page open, remove them on unmounting
Expensify · Jan 15, 2024 · bea694d · bea694d
2 parents 60de4ac + 92f51e2
commit bea694d
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/src/pages/workspace/WorkspaceInvitePage.js b/src/pages/workspace/WorkspaceInvitePage.js
@@ -57,13 +57,15 @@ const propTypes = {
     }).isRequired,
 
     isLoadingReportData: PropTypes.bool,
+    invitedEmailsToAccountIDsDraft: PropTypes.objectOf(PropTypes.number),
     ...policyPropTypes,
 };
 
 const defaultProps = {
     personalDetails: {},
     betas: [],
     isLoadingReportData: true,
+    invitedEmailsToAccountIDsDraft: {},
     ...policyDefaultProps,
 };
 
@@ -81,7 +83,10 @@ function WorkspaceInvitePage(props) {
 
     useEffect(() => {
         setSearchTerm(SearchInputManager.searchInput);
-    }, []);
+        return () => {
+            Policy.setWorkspaceInviteMembersDraft(props.route.params.policyID, {});
+        };
+    }, [props.route.params.policyID]);
 
     useEffect(() => {
         Policy.clearErrors(props.route.params.policyID);
@@ -105,6 +110,12 @@ function WorkspaceInvitePage(props) {
         _.each(inviteOptions.personalDetails, (detail) => (detailsMap[detail.login] = OptionsListUtils.formatMemberForList(detail)));
 
         const newSelectedOptions = [];
+        _.each(_.keys(props.invitedEmailsToAccountIDsDraft), (login) => {
+            if (!_.has(detailsMap, login)) {
+                return;
+            }
+            newSelectedOptions.push({...detailsMap[login], isSelected: true});
+        });
         _.each(selectedOptions, (option) => {
             newSelectedOptions.push(_.has(detailsMap, option.login) ? {...detailsMap[option.login], isSelected: true} : option);
         });
@@ -323,5 +334,8 @@ export default compose(
         isLoadingReportData: {
             key: ONYXKEYS.IS_LOADING_REPORT_DATA,
         },
+        invitedEmailsToAccountIDsDraft: {
+            key: ({route}) => `${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${route.params.policyID.toString()}`,
+        },
     }),
 )(WorkspaceInvitePage);