Merge pull request #999 from trycompai/main

[comp] Production Deploy

Author: Marfuen

apps/app/src/app/(app)/[orgId]/people/all/actions/addEmployeeWithoutInvite.ts

@@ -2,13 +2,16 @@
 
 import { auth } from '@/utils/auth';
 import { db } from '@comp/db';
+import type { Role } from '@comp/db/types';
 
 export const addEmployeeWithoutInvite = async ({
   email,
   organizationId,
+  roles,
 }: {
   email: string;
   organizationId: string;
+  roles: Role[];
 }) => {
   try {
     let userId = '';
@@ -34,7 +37,7 @@ export const addEmployeeWithoutInvite = async ({
       body: {
         userId: existingUser?.id ?? userId,
         organizationId,
-        role: 'employee',
+        role: roles, // Auth API expects role or role array
       },
     });
 

apps/app/src/app/(app)/[orgId]/people/all/actions/removeMember.ts

@@ -41,7 +41,7 @@ export const removeMember = authActionClient
 
       if (
         !currentUserMember ||
-        (currentUserMember.role !== 'admin' && currentUserMember.role !== 'owner')
+        (!currentUserMember.role.includes('admin') && !currentUserMember.role.includes('owner'))
       ) {
         return {
           success: false,
@@ -65,7 +65,7 @@ export const removeMember = authActionClient
       }
 
       // Prevent removing the owner
-      if (targetMember.role === 'owner') {
+      if (targetMember.role.includes('owner')) {
         return {
           success: false,
           error: 'Cannot remove the organization owner',

apps/app/src/app/(app)/[orgId]/people/all/components/InviteMembersModal.tsx

@@ -35,10 +35,17 @@ import { addEmployeeWithoutInvite } from '../actions/addEmployeeWithoutInvite';
 import { MultiRoleCombobox } from './MultiRoleCombobox';
 
 // --- Constants for Roles ---
-const selectableRoles = ['admin', 'auditor', 'employee'] as const satisfies Readonly<Role[]>;
+const selectableRoles = ['admin', 'auditor', 'employee'] as const satisfies Readonly<
+  [Role, ...Role[]]
+>;
 type InviteRole = (typeof selectableRoles)[number];
 const DEFAULT_ROLES: InviteRole[] = [];
 
+// Type guard to check if a string is a valid InviteRole
+const isInviteRole = (role: string): role is InviteRole => {
+  return role === 'admin' || role === 'auditor' || role === 'employee';
+};
+
 // --- Schemas ---
 const manualInviteSchema = z.object({
   email: z.string().email({ message: 'Invalid email address.' }),
@@ -151,12 +158,13 @@ export function InviteMembersModal({
 
         // Process each invitation sequentially
         for (const invite of values.manualInvites) {
-          const isEmployeeOnly = invite.roles.length === 1 && invite.roles[0] === 'employee';
+          const hasEmployeeRole = invite.roles.includes('employee');
           try {
-            if (isEmployeeOnly) {
+            if (hasEmployeeRole) {
               await addEmployeeWithoutInvite({
                 organizationId,
                 email: invite.email,
+                roles: invite.roles,
               });
             } else {
               // Use authClient to send the invitation
@@ -276,6 +284,7 @@ export function InviteMembersModal({
           // Process each row
           for (const row of dataRows) {
             const columns = row.split(',').map((col) => col.trim());
+
             if (columns.length <= Math.max(emailIndex, roleIndex)) {
               failedInvites.push({
                 email: columns[emailIndex] || 'Invalid row',
@@ -296,9 +305,9 @@ export function InviteMembersModal({
               continue;
             }
 
-            // Validate role(s)
-            const roles = roleValue.split(',').map((r) => r.trim()) as Role[];
-            const validRoles = roles.filter((role) => selectableRoles.includes(role as any));
+            // Validate role(s) - split by pipe for multiple roles
+            const roles = roleValue.split('|').map((r) => r.trim());
+            const validRoles = roles.filter(isInviteRole);
 
             if (validRoles.length === 0) {
               failedInvites.push({
@@ -309,11 +318,20 @@ export function InviteMembersModal({
             }
 
             // Attempt to invite
+            const hasEmployeeRole = validRoles.includes('employee');
             try {
-              await authClient.organization.inviteMember({
-                email,
-                role: validRoles.length === 1 ? validRoles[0] : validRoles,
-              });
+              if (hasEmployeeRole) {
+                await addEmployeeWithoutInvite({
+                  organizationId,
+                  email,
+                  roles: validRoles,
+                });
+              } else {
+                await authClient.organization.inviteMember({
+                  email,
+                  role: validRoles,
+                });
+              }
               successCount++;
             } catch (error) {
               console.error(`Failed to invite ${email}:`, error);
@@ -374,7 +392,12 @@ export function InviteMembersModal({
     }
   };
 
-  const csvTemplate = 'email,role\[email protected],employee\[email protected],admin';
+  const csvTemplate = `email,role
+[email protected],employee
+[email protected],employee|admin
+[email protected],auditor
+[email protected],employee|auditor
+[email protected],admin`;
   const csvTemplateDataUri = `data:text/csv;charset=utf-8,${encodeURIComponent(csvTemplate)}`;
 
   return (
@@ -499,7 +522,9 @@ export function InviteMembersModal({
                         />
                       </FormControl>
                       <FormDescription>
-                        {"Upload a CSV file with columns for 'email' and 'role'."}
+                        {
+                          "Upload a CSV file with 'email' and 'role' columns. Use pipe (|) to separate multiple roles (e.g., employee|admin)."
+                        }
                       </FormDescription>
                       <a
                         href={csvTemplateDataUri}

apps/app/src/app/(app)/[orgId]/people/all/components/MemberRow.tsx

@@ -74,7 +74,7 @@ export function MemberRow({ member, onRemove, onUpdateRole }: MemberRowProps) {
   const [isRemoving, setIsRemoving] = useState(false);
   const dropdownTriggerRef = useRef<HTMLButtonElement>(null);
   const focusRef = useRef<HTMLButtonElement | null>(null);
-  const currentUserIsOwner = member.role === 'owner';
+  const currentUserIsOwner = member.role.includes('owner');
 
   const memberName = member.user.name || member.user.email || 'Member';
   const memberEmail = member.user.email || '';