chore: merge main into release for new releases

Author: Marfuen

apps/app/src/actions/organization/remove-employee.ts

@@ -67,18 +67,18 @@ export const removeEmployeeRoleOrMember = authActionClient
           };
         }
 
-        // 3. Check if target has 'employee' role
+        // 3. Check if target has 'employee' or 'contractor' role
         const roles = targetMember.role.split(',').filter(Boolean); // Handle empty strings/commas
-        if (!roles.includes('employee')) {
+        if (!roles.includes('employee') && !roles.includes('contractor')) {
           return {
             success: false,
-            error: 'Target member does not have the employee role.',
+            error: 'Target member does not have the employee or contractor role.',
           };
         }
 
         // 4. Logic: Remove role or delete member
-        if (roles.length === 1 && roles[0] === 'employee') {
-          // Only has employee role - delete member fully
+        if (roles.length === 1 && (roles[0] === 'employee' || roles[0] === 'contractor')) {
+          // Only has employee or contractor role - delete member fully
 
           // Cannot remove owner (shouldn't happen if only role is employee, but safety check)
           if (targetMember.role === 'owner') {

apps/app/src/actions/policies/accept-requested-policy-changes.ts

@@ -88,10 +88,10 @@ export const acceptRequestedPolicyChangesAction = authActionClient
         },
       });
 
-      // Filter to get only employees
+      // Filter to get only employees and contractors
       const employeeMembers = employees.filter((member) => {
         const roles = member.role.includes(',') ? member.role.split(',') : [member.role];
-        return roles.includes('employee');
+        return roles.includes('employee') || roles.includes('contractor');
       });
 
       // Prepare the events array for the API

apps/app/src/app/(app)/[orgId]/layout.tsx

@@ -63,7 +63,7 @@ export default async function Layout({
     return redirect('/auth/unauthorized');
   }
 
-  if (member.role === 'employee') {
+  if (member.role === 'employee' || member.role === 'contractor') {
     return redirect('/no-access');
   }
 

apps/app/src/app/(app)/[orgId]/people/[employeeId]/page.tsx

@@ -113,6 +113,8 @@ const getPoliciesTasks = async (employeeId: string) => {
     where: {
       organizationId: organizationId,
       status: 'published',
+      isRequiredToSign: true,
+      isArchived: false,
     },
     orderBy: {
       name: 'asc',

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

@@ -35,15 +35,15 @@ import { addEmployeeWithoutInvite } from '../actions/addEmployeeWithoutInvite';
 import { MultiRoleCombobox } from './MultiRoleCombobox';
 
 // --- Constants for Roles ---
-const selectableRoles = ['admin', 'auditor', 'employee'] as const satisfies Readonly<
+const selectableRoles = ['admin', 'auditor', 'employee', 'contractor'] 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';
+  return role === 'admin' || role === 'auditor' || role === 'employee' || role === 'contractor';
 };
 
 // --- Schemas ---
@@ -159,7 +159,8 @@ export function InviteMembersModal({
         // Process each invitation sequentially
         for (const invite of values.manualInvites) {
           const hasEmployeeRoleAndNoAdmin =
-            !invite.roles.includes('admin') && invite.roles.includes('employee');
+            !invite.roles.includes('admin') &&
+            (invite.roles.includes('employee') || invite.roles.includes('contractor'));
           try {
             if (hasEmployeeRoleAndNoAdmin) {
               await addEmployeeWithoutInvite({
@@ -320,7 +321,8 @@ export function InviteMembersModal({
 
             // Attempt to invite
             const hasEmployeeRoleAndNoAdmin =
-              validRoles.includes('employee') && !validRoles.includes('admin');
+              (validRoles.includes('employee') || validRoles.includes('contractor')) &&
+              !validRoles.includes('admin');
             try {
               if (hasEmployeeRoleAndNoAdmin) {
                 await addEmployeeWithoutInvite({

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

@@ -168,6 +168,8 @@ export function MemberRow({ member, onRemove, onUpdateRole, canEdit }: MemberRow
                       return 'Auditor';
                     case 'employee':
                       return 'Employee';
+                    case 'contractor':
+                      return 'Contractor';
                     default:
                       return '???';
                   }

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

@@ -28,6 +28,11 @@ const selectableRoles: {
     labelKey: 'people.roles.employee',
     descriptionKey: 'people.roles.employee_description',
   },
+  {
+    value: 'contractor',
+    labelKey: 'people.roles.contractor',
+    descriptionKey: 'people.roles.contractor_description',
+  },
   {
     value: 'auditor',
     labelKey: 'people.roles.auditor',
@@ -95,6 +100,8 @@ export function MultiRoleCombobox({
         return 'Auditor';
       case 'employee':
         return 'Employee';
+      case 'contractor':
+        return 'Contractor';
       default:
         return roleValue;
     }
@@ -112,6 +119,8 @@ export function MultiRoleCombobox({
           return 'Auditor';
         case 'employee':
           return 'Employee';
+        case 'contractor':
+          return 'Contractor';
         case 'owner':
           return 'Owner';
         default:

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

@@ -42,6 +42,8 @@ export function MultiRoleComboboxContent({
         return 'Auditor';
       case 'employee':
         return 'Employee';
+      case 'contractor':
+        return 'Contractor';
       default:
         return roleValue;
     }
@@ -57,6 +59,8 @@ export function MultiRoleComboboxContent({
         return 'Read-only access for compliance checks.';
       case 'employee':
         return 'Can sign policies and complete training.';
+      case 'contractor':
+        return 'Can sign policies and complete training.';
       default:
         return '';
     }

apps/app/src/app/(app)/[orgId]/people/dashboard/components/EmployeesOverview.tsx

@@ -49,13 +49,16 @@ export async function EmployeesOverview() {
 
     employees = fetchedMembers.filter((member) => {
       const roles = member.role.includes(',') ? member.role.split(',') : [member.role];
-      return roles.includes('employee');
+      return roles.includes('employee') || roles.includes('contractor');
     });
 
-    // Fetch required policies
+    // Fetch required policies that are published and not archived
     policies = await db.policy.findMany({
       where: {
         organizationId: organizationId,
+        isRequiredToSign: true,
+        status: 'published',
+        isArchived: false,
       },
     });
 

apps/app/src/app/(app)/[orgId]/people/layout.tsx

@@ -23,7 +23,7 @@ export default async function Layout({ children }: { children: React.ReactNode }
 
   const employees = allMembers.filter((member) => {
     const roles = member.role.includes(',') ? member.role.split(',') : [member.role];
-    return roles.includes('employee');
+    return roles.includes('employee') || roles.includes('contractor');
   });
 
   return (