Skip to content

fix: select all workspace invite comparison #20826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Beamanator merged 8 commits into from
Jun 15, 2023
Merged

fix: select all workspace invite comparison #20826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9e60ade
fix: comparison for accountID
BeeMargarida Jun 15, 2023
949fa34
fix: convert to string
BeeMargarida Jun 15, 2023
e0955a0
fix: cast to number instead
BeeMargarida Jun 15, 2023
8c60148
fix: cast to number instead in missing places
BeeMargarida Jun 15, 2023
8096d88
Merge branch 'main' into fix/20804-select_all_accountID
BeeMargarida Jun 15, 2023
94fe1b6
fix: switch to empty object
BeeMargarida Jun 15, 2023
db62b91
fix: use values for accountIDs
BeeMargarida Jun 15, 2023
50e80f6
fix: rename and remove cast
BeeMargarida Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/pages/workspace/WorkspaceInviteMessagePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class WorkspaceInviteMessagePage extends React.Component {

sendInvitation() {
Policy.addMembersToWorkspace(this.props.invitedEmailsToAccountIDsDraft, this.state.welcomeNote, this.props.route.params.policyID, this.props.betas);
Policy.setWorkspaceInviteMembersDraft(this.props.route.params.policyID, []);
Policy.setWorkspaceInviteMembersDraft(this.props.route.params.policyID, {});
Navigation.navigate(ROUTES.getWorkspaceMembersRoute(this.props.route.params.policyID));
}

Expand Down
22 changes: 12 additions & 10 deletions src/pages/workspace/WorkspaceMembersPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class WorkspaceMembersPage extends React.Component {
this.setState((prevState) => ({
selectedEmployees: _.intersection(
prevState.selectedEmployees,
_.keys(PolicyUtils.getClientPolicyMemberEmailsToAccountIDs(this.props.policyMembers, this.props.personalDetails)),
_.map(_.values(PolicyUtils.getClientPolicyMemberEmailsToAccountIDs(this.props.policyMembers, this.props.personalDetails)), (accountID) => Number(accountID)),
),
}));
}
Expand Down Expand Up @@ -214,10 +214,10 @@ class WorkspaceMembersPage extends React.Component {
* @param {Object} memberList
*/
toggleAllUsers(memberList) {
const emailList = _.keys(memberList);
const accountIDList = _.map(_.keys(memberList), (memberAccountID) => Number(memberAccountID));
this.setState(
(prevState) => ({
selectedEmployees: !_.every(emailList, (memberEmail) => _.contains(prevState.selectedEmployees, memberEmail)) ? emailList : [],
selectedEmployees: !_.every(accountIDList, (memberAccountID) => _.contains(prevState.selectedEmployees, memberAccountID)) ? accountIDList : [],
}),
() => this.validate(),
);
Expand All @@ -236,17 +236,17 @@ class WorkspaceMembersPage extends React.Component {
}

// Add or remove the user if the checkbox is enabled
if (_.contains(this.state.selectedEmployees, accountID)) {
this.removeUser(accountID);
if (_.contains(this.state.selectedEmployees, Number(accountID))) {
this.removeUser(Number(accountID));
} else {
this.addUser(accountID);
this.addUser(Number(accountID));
}
}

/**
* Add user from the selectedEmployees list
*
* @param {String} accountID
* @param {Number} accountID
*/
addUser(accountID) {
this.setState(
Expand All @@ -260,7 +260,7 @@ class WorkspaceMembersPage extends React.Component {
/**
* Remove user from the selectedEmployees list
*
* @param {String} accountID
* @param {Number} accountID
*/
removeUser(accountID) {
this.setState(
Expand Down Expand Up @@ -320,7 +320,7 @@ class WorkspaceMembersPage extends React.Component {
*/
renderItem({item}) {
const hasError = !_.isEmpty(item.errors) || this.state.errors[item.login];
const isChecked = _.contains(this.state.selectedEmployees, item.accountID);
const isChecked = _.contains(this.state.selectedEmployees, Number(item.accountID));
return (
<OfflineWithFeedback
onClose={() => this.dismissError(item)}
Expand Down Expand Up @@ -474,7 +474,9 @@ class WorkspaceMembersPage extends React.Component {
<View style={[styles.w100, styles.mt4, styles.flex1]}>
<View style={[styles.peopleRow, styles.ph5, styles.pb3]}>
<Checkbox
isChecked={!_.isEmpty(removableMembers) && _.every(_.keys(removableMembers), (accountID) => _.contains(this.state.selectedEmployees, accountID))}
isChecked={
!_.isEmpty(removableMembers) && _.every(_.keys(removableMembers), (accountID) => _.contains(this.state.selectedEmployees, Number(accountID)))
}
onPress={() => this.toggleAllUsers(removableMembers)}
/>
<View style={[styles.flex1]}>
Expand Down