Skip to content

:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.

fix(invites): stop a blocked invite submit from reporting success (#128108)

Yasena580127e1b3d
diff --git a/frontend/src/lib/logic/inviteLogic.test.ts b/frontend/src/lib/logic/inviteLogic.test.ts
index de76cb89735c..2c4f1e1f1ec5 100644
--- a/frontend/src/lib/logic/inviteLogic.test.ts
+++ b/frontend/src/lib/logic/inviteLogic.test.ts
@@ -2,6 +2,8 @@ import { MOCK_DEFAULT_ORGANIZATION } from 'lib/api.mock'
import { expectLogic } from 'kea-test-utils'
+import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
+
import { membersLogic } from '~/models/membersLogic'
import { initKeaTests } from '~/test/init'
@@ -35,6 +37,20 @@ describe('inviteLogic', () => {
})
})
+ it('keeps the rows and shows no success toast when a blocked invite is submitted', async () => {
+ const successToast = jest.spyOn(lemonToast, 'success')
+ logic.actions.updateInviteAtIndex({ target_email: '[email protected]', isValid: true }, 0)
+
+ await expectLogic(logic, () => {
+ logic.actions.inviteTeamMembers()
+ })
+ .toFinishAllListeners()
+ .toMatchValues({
+ invitesToSend: [expect.objectContaining({ target_email: '[email protected]' })],
+ })
+ expect(successToast).not.toHaveBeenCalled()
+ })
+
it('shows a message validation error under the field until the message changes', async () => {
logic.actions.inviteTeamMembersFailure('', {
status: 400,
diff --git a/frontend/src/lib/logic/inviteLogic.ts b/frontend/src/lib/logic/inviteLogic.ts
index 377de8d3a3c0..c6e6c856dfdf 100644
--- a/frontend/src/lib/logic/inviteLogic.ts
+++ b/frontend/src/lib/logic/inviteLogic.ts
@@ -239,6 +239,8 @@ export const inviteLogic = kea<inviteLogicType>([
[] as OrganizationInviteType[],
{
inviteTeamMembers: async () => {
+ // A sent request always returns at least one invite, so the success handlers
+ // treat this empty result as "nothing was sent" and keep the form as it is.
if (!values.canSubmit) {
return []
}
@@ -334,7 +336,8 @@ export const inviteLogic = kea<inviteLogicType>([
},
appendInviteRow: (state) => [...state, EMPTY_INVITE],
resetInviteRows: () => [EMPTY_INVITE],
- inviteTeamMembersSuccess: () => [EMPTY_INVITE],
+ inviteTeamMembersSuccess: (state, { invitedTeamMembersInternal }) =>
+ invitedTeamMembersInternal.length > 0 ? [EMPTY_INVITE] : state,
addProjectAccess: (state, { inviteIndex, projectId, level }) => {
const newState = [...state]
const invite = { ...newState[inviteIndex] }
@@ -382,7 +385,8 @@ export const inviteLogic = kea<inviteLogicType>([
INLINE_ERROR_FIELDS.has(errorObject?.attr) && errorObject?.detail
? { attr: errorObject.attr, detail: errorObject.detail }
: null,
- inviteTeamMembersSuccess: () => null,
+ inviteTeamMembersSuccess: (state, { invitedTeamMembersInternal }) =>
+ invitedTeamMembersInternal.length > 0 ? null : state,
updateMessage: (state) => (state?.attr === 'message' ? null : state),
updateInviteAtIndex: (state, { payload }) =>
state?.attr === 'first_name' && 'first_name' in payload ? null : state,
@@ -459,8 +463,11 @@ export const inviteLogic = kea<inviteLogicType>([
],
}),
listeners(({ values, actions }) => ({
- inviteTeamMembersSuccess: (): void => {
- const inviteCount = values.invitedTeamMembersInternal.length
+ inviteTeamMembersSuccess: ({ invitedTeamMembersInternal }): void => {
+ if (invitedTeamMembersInternal.length === 0) {
+ return
+ }
+ const inviteCount = invitedTeamMembersInternal.length
if (values.preflight?.email_service_available) {
lemonToast.success(`Invited ${pluralize(inviteCount, 'new team member')}`)
} else {
diff --git a/frontend/src/scenes/settings/organization/InviteModal.tsx b/frontend/src/scenes/settings/organization/InviteModal.tsx
index 39547ffe6240..445bb58445f2 100644
--- a/frontend/src/scenes/settings/organization/InviteModal.tsx
+++ b/frontend/src/scenes/settings/organization/InviteModal.tsx
@@ -196,7 +196,7 @@ export function InviteRow({
const { hasAvailableFeature } = useValues(userLogic)
const hasAccessControl = hasAvailableFeature(AvailableFeature.ACCESS_CONTROL)
- const { invitesToSend, existingMemberInviteRows } = useValues(inviteLogic)
+ const { invitesToSend, existingMemberInviteRows, canSubmit } = useValues(inviteLogic)
const { updateInviteAtIndex, inviteTeamMembers, deleteInviteAtIndex } = useActions(inviteLogic)
const isExistingMember = existingMemberInviteRows[index]
const { preflight } = useValues(preflightLogic)
@@ -279,7 +279,7 @@ export function InviteRow({
<LemonButton
type="primary"
className="flex-1"
- disabled={!isEmail(invitesToSend[index].target_email) || isExistingMember}
+ disabled={!isEmail(invitesToSend[index].target_email) || !canSubmit}
onClick={() => {
inviteTeamMembers()
}}