From ab074ba4b02b21e66ce91011cec5f462e92bd4f4 Mon Sep 17 00:00:00 2001 From: Apoorv Tiwari Date: Thu, 2 Sep 2021 22:34:21 +0530 Subject: [PATCH] Hide invite user button when the form is active (#554) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix the invite new user button bug * Remove the sol for scenario 2 Co-authored-by: “Apoorv <“tiwari.apoorv1316@gmail.com”> --- .../src/ManageOrgUsers/ManageOrgUsers.jsx | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx b/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx index 277e311dbf..f822a298f1 100644 --- a/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx +++ b/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx @@ -105,16 +105,14 @@ class ManageOrgUsers extends React.Component { history.push('/login'); }; - generateInvitationURL = user => window.location.origin + '/invitations/' + user.invitation_token + generateInvitationURL = (user) => window.location.origin + '/invitations/' + user.invitation_token; invitationLinkCopyHandler = () => { toast.info('Invitation URL copied', { hideProgressBar: true, position: 'bottom-right' }); - } - + }; render() { const { isLoading, showNewUserForm, creatingUser, users, newUser, idChangingRole, archivingUser } = this.state; - return (
@@ -128,9 +126,11 @@ class ManageOrgUsers extends React.Component {

Users & Permissions

-
this.setState({ showNewUserForm: true })}> - Invite new user -
+ {!showNewUserForm && ( +
this.setState({ showNewUserForm: true })}> + Invite new user +
+ )}
@@ -307,18 +307,21 @@ class ManageOrgUsers extends React.Component { className={`badge bg-${user.status === 'invited' ? 'warning' : 'success'} me-1 m-1`} > {user.status} - { - user.status === 'invited' && ('invitation_token' in user) ? - - - - - : - '' - } + {user.status === 'invited' && 'invitation_token' in user ? ( + + + + ) : ( + '' + )} {archivingUser === null && (