Просмотр исходного кода

fix: remove invite link (#53978)

- changes the frontend to no longer display the invite link
- changes "resend invite" functionality to regenerate a new link
Matthew T 1 год назад
Родитель
Сommit
86820110c0

+ 5 - 26
static/app/views/settings/organizationMembers/organizationMemberDetail.tsx

@@ -23,7 +23,6 @@ import Panel from 'sentry/components/panels/panel';
 import PanelBody from 'sentry/components/panels/panelBody';
 import PanelHeader from 'sentry/components/panels/panelHeader';
 import PanelItem from 'sentry/components/panels/panelItem';
-import TextCopyInput from 'sentry/components/textCopyInput';
 import {Tooltip} from 'sentry/components/tooltip';
 import {IconRefresh} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
@@ -288,7 +287,7 @@ class OrganizationMemberDetail extends DeprecatedAsyncView<Props, State> {
     const {access, orgRoleList} = organization;
     const canEdit = access.includes('org:write') && !this.memberDeactivated;
 
-    const {email, expired, pending, invite_link: inviteLink} = member;
+    const {email, expired, pending} = member;
     const canResend = !expired;
     const showAuth = !pending;
 
@@ -330,35 +329,19 @@ class OrganizationMemberDetail extends DeprecatedAsyncView<Props, State> {
               </Details>
             </PanelItem>
             <PanelItem>
-              {inviteLink && (
+              {(member.pending || member.expired) && (
                 <InviteSection>
-                  <InviteField>
-                    <DetailLabel>{t('Invite Link')}</DetailLabel>
-                    <TextCopyInput>{inviteLink}</TextCopyInput>
-                    <p className="help-block">
-                      {t(
-                        'This invite link can be used by anyone who knows it. Keep it secure!'
-                      )}
-                    </p>
-                  </InviteField>
                   <ButtonBar gap={1}>
                     {canResend && (
                       <Button
                         data-test-id="resend-invite"
-                        onClick={() => this.handleInvite(false)}
+                        icon={<IconRefresh size="sm" />}
+                        title={t('Generate a new invite link and send a new email.')}
+                        onClick={() => this.handleInvite(true)}
                       >
                         {t('Resend Invite')}
                       </Button>
                     )}
-                    <Button
-                      onClick={() => this.handleInvite(true)}
-                      title={t(
-                        'Generate New Invite. This will invalidate the previous invite link!'
-                      )}
-                      priority="danger"
-                      aria-label={t('Generate New Invite')}
-                      icon={<IconRefresh size="sm" />}
-                    />
                   </ButtonBar>
                 </InviteSection>
               )}
@@ -466,10 +449,6 @@ const DetailLabel = styled('div')`
   color: ${p => p.theme.textColor};
 `;
 
-const InviteField = styled('div')`
-  flex-grow: 1;
-`;
-
 const InviteSection = styled('div')`
   flex-grow: 1;
   display: flex;