Merge pull request #3929 from novuhq/disable-role-toggle

feat: disable role toggle

apps/api/src/app/organization/e2e/members/change-member-role.e2e.ts

@@ -26,7 +26,8 @@ describe('Change member role - /organizations/members/:memberId/role (PUT)', asy
     });
   });
 
-  it('should update admin to member', async () => {
+  // Currently skipped until we implement role management
+  it.skip('should update admin to member', async () => {
     await memberRepository.addMember(session.organization._id, {
       _userId: user2.user._id,
       invite: null,

apps/api/src/app/organization/usecases/membership/change-member-role/change-member-role.usecase.ts

@@ -10,15 +10,19 @@ export class ChangeMemberRole {
   constructor(private organizationRepository: OrganizationRepository, private memberRepository: MemberRepository) {}
 
   async execute(command: ChangeMemberRoleCommand) {
+    if (![MemberRoleEnum.MEMBER, MemberRoleEnum.ADMIN].includes(command.role)) {
+      throw new ApiException('Not supported role type');
+    }
+
+    if (command.role !== MemberRoleEnum.ADMIN) {
+      throw new ApiException(`The change of role to an ${command.role} type is not supported`);
+    }
+
     const organization = await this.organizationRepository.findById(command.organizationId);
     if (!organization) throw new NotFoundException('No organization was found');
 
     const member = await this.memberRepository.findMemberById(organization._id, command.memberId);
-    if (!member) throw new ApiException('No member was found');
-
-    if (![MemberRoleEnum.MEMBER, MemberRoleEnum.ADMIN].includes(command.role)) {
-      throw new ApiException('Not supported role type');
-    }
+    if (!member) throw new NotFoundException('No member was found');
 
     const roles = [command.role];
 

apps/web/src/pages/invites/components/MemberRole.tsx

@@ -3,7 +3,7 @@ import styled from '@emotion/styled';
 
 import { Dropdown, Tag } from '../../../design-system';
 
-export function MemberRole({ member, onChangeMemberRole, isEnableMemberActions }) {
+export function MemberRole({ member, onChangeMemberRole, isEnableMemberActions, allowChangeRole = false }) {
   const TagElement = () => {
     return <>{member.roles.find((role: string) => role === 'admin') ? <Tag>Admin</Tag> : <Tag>Member</Tag>}</>;
   };
@@ -25,9 +25,13 @@ export function MemberRole({ member, onChangeMemberRole, isEnableMemberActions }
     <>
       <Dropdown
         control={
-          <ClickableTag data-test-id="change-member-role-btn">
+          allowChangeRole ? (
+            <ClickableTag data-test-id="change-member-role-btn">
+              <TagElement />
+            </ClickableTag>
+          ) : (
             <TagElement />
-          </ClickableTag>
+          )
         }
       >
         {availableRoles().map((role, index: number) => (

apps/web/src/pages/invites/components/MembersTable.cy.tsx

@@ -196,6 +196,7 @@ describe('MembersTable Component', function () {
           currentUser={{ _id: 1 }}
           onRemoveMember={onRemoveMember}
           onChangeMemberRole={onChangeMemberRole}
+          allowChangeRole={true}
         />
       </TestWrapper>
     );

apps/web/src/pages/invites/components/MembersTable.tsx

@@ -19,6 +19,7 @@ export function MembersTable({
   loading = false,
   onResendInviteMember,
   onChangeMemberRole,
+  allowChangeRole = false,
 }) {
   const { classes, theme } = useStyles();
   const clipboardInviteLink = useClipboard({ timeout: 1000 });
@@ -77,6 +78,7 @@ export function MembersTable({
                   onChangeMemberRole={onChangeMemberRole}
                   member={member}
                   isEnableMemberActions={isEnableMemberActions}
+                  allowChangeRole={allowChangeRole}
                 />
               </div>
             </ActionsSider>