Browse Source

chore(onboarding): remove members invite members ff from frontend (#82797)

remove `members-invite-teammates` feature flag from frontend
mia hsu 2 months ago
parent
commit
8f5df00796

+ 1 - 3
static/app/components/modals/inviteMembersModal/useInviteModal.tsx

@@ -29,9 +29,7 @@ function defaultInvite(): InviteRow {
 function canInvite(organization: Organization) {
   return (
     organization.access?.includes('member:write') ||
-    (organization.features.includes('members-invite-teammates') &&
-      organization.allowMemberInvite &&
-      organization.access?.includes('member:invite'))
+    (organization.allowMemberInvite && organization.access?.includes('member:invite'))
   );
 }
 

+ 1 - 3
static/app/components/roleSelectControl.tsx

@@ -25,9 +25,7 @@ type Props = Omit<ControlProps<OptionType>, 'onChange' | 'value'> & {
 function RoleSelectControl({roles, disableUnallowed, ...props}: Props) {
   const organization = useOrganization();
   const isMemberInvite =
-    organization.features.includes('members-invite-teammates') &&
-    organization.allowMemberInvite &&
-    organization.access?.includes('member:invite');
+    organization.allowMemberInvite && organization.access?.includes('member:invite');
 
   return (
     <SelectControl

+ 0 - 1
static/app/data/forms/organizationMembershipSettings.tsx

@@ -32,7 +32,6 @@ const formGroups: JsonFormObject[] = [
         help: t(
           'Allow organization members to invite other members via email without needing org owner or manager approval.'
         ),
-        visible: ({features}) => features.has('members-invite-teammates'),
       },
       {
         name: 'allowMemberProjectCreation',

+ 0 - 4
static/app/views/settings/organizationMembers/organizationMemberRow.spec.tsx

@@ -120,7 +120,6 @@ describe('OrganizationMemberRow', function () {
 
     it('has "Resend Invite" button if invite was sent from curr user and feature is on', function () {
       const org = OrganizationFixture({
-        features: ['members-invite-teammates'],
         access: ['member:invite'],
       });
       render(<OrganizationMemberRow {...props} organization={org} />);
@@ -131,7 +130,6 @@ describe('OrganizationMemberRow', function () {
 
     it('does not have "Resend Invite" button if invite was sent from other user and feature is on', function () {
       const org = OrganizationFixture({
-        features: ['members-invite-teammates'],
         access: ['member:invite'],
       });
       render(
@@ -175,7 +173,6 @@ describe('OrganizationMemberRow', function () {
 
     it('has Remove button if invite was sent from curr user and feature is on', function () {
       const org = OrganizationFixture({
-        features: ['members-invite-teammates'],
         access: ['member:invite'],
       });
       render(<OrganizationMemberRow {...props} organization={org} />);
@@ -185,7 +182,6 @@ describe('OrganizationMemberRow', function () {
 
     it('has disabled Remove button if invite was sent from other user and feature is on', function () {
       const org = OrganizationFixture({
-        features: ['members-invite-teammates'],
         access: ['member:invite'],
       });
       render(

+ 1 - 4
static/app/views/settings/organizationMembers/organizationMemberRow.tsx

@@ -115,10 +115,7 @@ export default class OrganizationMemberRow extends PureComponent<Props, State> {
     const showRemoveButton = !isCurrentUser;
     const showLeaveButton = isCurrentUser;
     const isInviteFromCurrentUser = pending && inviterName === currentUser.name;
-    const canInvite =
-      organization.features?.includes('members-invite-teammates') &&
-      organization.allowMemberInvite &&
-      access.includes('member:invite');
+    const canInvite = organization.allowMemberInvite && access.includes('member:invite');
     // members can remove invites they sent if allowMemberInvite is true
     const canEditInvite = canInvite && isInviteFromCurrentUser;
     const canRemoveMember =