Skip to content

[comp] Production Deploy #1486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Marfuen merged 3 commits into from
Sep 10, 2025
Merged

[comp] Production Deploy #1486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b91547e
[dev] [Marfuen] mariano/email-issues (#1481)
github-actions[bot] Sep 9, 2025
18f3440
fix: update role validation in InviteMembersModal to prevent admin an…
github-actions[bot] Sep 10, 2025
bd9f330
Merge branch 'release' into main
Marfuen Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions apps/app/src/app/(app)/[orgId]/people/all/components/InviteMembersModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,10 @@ export function InviteMembersModal({

// Process each invitation sequentially
for (const invite of values.manualInvites) {
const hasEmployeeRole = invite.roles.includes('employee');
const hasEmployeeRoleAndNoAdmin =
!invite.roles.includes('admin') && invite.roles.includes('employee');
try {
if (hasEmployeeRole) {
if (hasEmployeeRoleAndNoAdmin) {
await addEmployeeWithoutInvite({
organizationId,
email: invite.email,
Expand Down Expand Up @@ -318,9 +319,10 @@ export function InviteMembersModal({
}

// Attempt to invite
const hasEmployeeRole = validRoles.includes('employee');
const hasEmployeeRoleAndNoAdmin =
validRoles.includes('employee') && !validRoles.includes('admin');
try {
if (hasEmployeeRole) {
if (hasEmployeeRoleAndNoAdmin) {
await addEmployeeWithoutInvite({
organizationId,
email,
Expand Down
20 changes: 15 additions & 5 deletions bun.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading