From 0c37887bb2c38142b929b55f66674a35b32ddd93 Mon Sep 17 00:00:00 2001 From: Alaister Young Date: Mon, 3 Jul 2023 19:06:27 +1000 Subject: [PATCH] fix: invite button permissions error --- .../TeamSettings/InviteMemberButton.tsx | 14 +++++++++++--- .../Organization/TeamSettings/TeamSettings.tsx | 3 ++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.tsx b/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.tsx index d9bf01381cc..137f9f6c81d 100644 --- a/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.tsx +++ b/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.tsx @@ -11,6 +11,7 @@ import { Member, Role } from 'types' import { Button, Form, IconMail, Input, Listbox, Modal } from 'ui' export interface InviteMemberButtonProps { + orgId: number userId: number members: Member[] roles: Role[] @@ -18,6 +19,7 @@ export interface InviteMemberButtonProps { } const InviteMemberButton = ({ + orgId, userId, members = [], roles = [], @@ -31,9 +33,15 @@ const InviteMemberButton = ({ const { permissions: allPermissions } = useGetPermissions() const canInviteMembers = roles.some(({ id: role_id }) => - doPermissionsCheck(allPermissions, PermissionAction.CREATE, 'user_invites', { - resource: { role_id }, - }) + doPermissionsCheck( + allPermissions, + PermissionAction.CREATE, + 'user_invites', + { + resource: { role_id }, + }, + orgId + ) ) const initialValues = { email: '', role: '' } diff --git a/studio/components/interfaces/Organization/TeamSettings/TeamSettings.tsx b/studio/components/interfaces/Organization/TeamSettings/TeamSettings.tsx index f998e5720d3..d704a29dc24 100644 --- a/studio/components/interfaces/Organization/TeamSettings/TeamSettings.tsx +++ b/studio/components/interfaces/Organization/TeamSettings/TeamSettings.tsx @@ -89,9 +89,10 @@ const TeamSettings = () => { placeholder="Filter members" /> - {canAddMembers && profile !== undefined && ( + {canAddMembers && profile !== undefined && selectedOrganization !== undefined && (