@open-mercato/core 0.10.1-develop.7716.1.cefe7975df → 0.10.1-develop.7721.1.b5c4a00a68

package/src/modules/staff/api/timesheets/tasks/route.ts

@@ -30,13 +30,12 @@ import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { resolveCrudRecordId, parseScopedCommandInput } from '@open-mercato/shared/lib/api/scoped'
 import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
 import { createLogger } from '@open-mercato/shared/lib/logger'
-import type { ModuleConfigService } from '@open-mercato/core/modules/configs/lib/module-config-service'
-import { StaffTimeTask, StaffTimeTaskTag } from '../../../data/entities'
+import { getTelemetryRuntime } from '@open-mercato/shared/lib/telemetry/runtime'
+import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import { StaffSupportTicket, StaffTimeTask, StaffTimeTaskStatus, StaffTimeTaskTag } from '../../../data/entities'
 import { staffTimeTaskCreateSchema, staffTimeTaskUpdateSchema } from '../../../data/validators'
 import { staffTimeTaskCommandIds } from '../../../commands/timesheets-tasks'
-import { resolveFeatureAccess } from '../../../lib/time-tracking/featureAccess'
-import { MANAGE_PROJECTS_FEATURE, resolveProjectAccess, type ProjectAccess } from '../../../lib/time-tracking/access'
-import { readTimeTrackingSettings } from '../../../lib/time-tracking/settings'
+import { resolveListProjectAccess } from '../../../lib/time-tracking/listProjectAccess'
 import { sanitizeSearchTerm, parseBooleanFlag } from '../../helpers'
 import { createStaffCrudOpenApi, createPagedListResponseSchema, defaultOkResponseSchema } from '../../openapi'
 
@@ -57,6 +56,8 @@ const F = {
   position: 'position',
   created_by_user_id: 'created_by_user_id',
   closed_at: 'closed_at',
+  source: 'source',
+  customer_id: 'customer_id',
   created_at: 'created_at',
   updated_at: 'updated_at',
 } as const
@@ -87,6 +88,13 @@ const listSchema = z
     parentTaskId: z.string().uuid().optional(),
     tagIds: z.string().optional(),
     topLevelOnly: z.string().optional(),
+    unassigned: z.string().optional(),
+    source: z.enum(['internal', 'portal']).optional(),
+    customerId: z.string().uuid().optional(),
+    supportCategory: z.string().optional(),
+    supportReference: z.string().optional(),
+    portalStatus: z.enum(['received', 'in_progress', 'resolved']).optional(),
+    supportUnnotified: z.string().optional(),
     sortField: z.string().optional(),
     sortDir: z.enum(['asc', 'desc']).optional(),
   })
@@ -100,71 +108,30 @@ type TaskListQuery = z.infer<typeof listSchema>
  */
 const IMPOSSIBLE_ID = '00000000-0000-0000-0000-000000000000'
 
-const DENIED_ACCESS: ProjectAccess = { canManageAll: false, projectIds: [], staffMemberId: null }
+export { resolveListProjectAccess }
 
-type RbacServiceLike = {
-  getGrantedFeatures?: (
-    userId: string,
-    options: { tenantId: string | null; organizationId: string | null },
-  ) => Promise<string[]>
-}
-
-type ContainerLike = { resolve: (name: string) => unknown }
+/**
+ * Upper bound on the task ids the support filters materialize into the `id IN (...)`
+ * narrowing. The newest matching tickets win; an older match beyond the cap drops out
+ * of the filtered list instead of growing an unbounded parameter list.
+ */
+export const SUPPORT_FILTER_MAX_TASK_IDS = 1000
 
-/** One access decision per request, shared by every filter that needs it. */
-const accessByRequest = new WeakMap<Request, Promise<ProjectAccess>>()
+/**
+ * Requests whose support-filter narrowing hit `SUPPORT_FILTER_MAX_TASK_IDS`. The list's
+ * `afterList` hook reports them as `totalIsCapped`, so a truncated support filter is
+ * never presented as the complete result.
+ */
+const supportFilterTruncatedRequests = new WeakSet<Request>()
 
-async function resolveAssignmentGraceDays(container: ContainerLike, tenantId: string): Promise<number | null> {
-  try {
-    const configService = container.resolve('moduleConfigService') as ModuleConfigService
-    const settings = await readTimeTrackingSettings(configService, { tenantId })
-    return settings.access.assignmentGraceDays
-  } catch {
-    // Fail safe to the documented default rather than widening the window.
-    return null
-  }
+export function markTaskListTotalCapped(payload: Record<string, unknown>, ctx: { request?: Request }): void {
+  if (ctx.request && supportFilterTruncatedRequests.has(ctx.request)) payload.totalIsCapped = true
 }
 
-async function loadProjectAccess(
-  container: ContainerLike,
-  userId: string | null,
-  tenantId: string | null,
-  organizationId: string | null,
-): Promise<ProjectAccess> {
-  if (!tenantId || !organizationId) return { ...DENIED_ACCESS }
-  const scope = { tenantId, organizationId }
-  try {
-    // One lookup, one authority, and a failure that says so. The previous
-    // `catch → []` could not tell "denied" from "could not ask", so an RBAC
-    // hiccup silently demoted a manager to their own memberships.
-    const access = await resolveFeatureAccess(container, userId, [MANAGE_PROJECTS_FEATURE], scope)
-    const em = container.resolve('em') as EntityManager
-    return await resolveProjectAccess({
-      em: em.fork(),
-      userId,
-      tenantId,
-      organizationId,
-      canManageAll: access.allowed,
-      userFeatures: access.grantedFeatures,
-      assignmentGraceDays: await resolveAssignmentGraceDays(container, tenantId),
-    })
-  } catch (err) {
-    logger.error('staff.timesheets.tasks access resolution failed', { err })
-    return { ...DENIED_ACCESS }
-  }
-}
-
-export async function resolveListProjectAccess(ctx: CrudCtx): Promise<ProjectAccess> {
-  const tenantId = ctx.auth?.tenantId ?? null
-  const organizationId = ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null
-  const load = () => loadProjectAccess(ctx.container, ctx.auth?.sub ?? null, tenantId, organizationId)
-  const request = ctx.request
-  if (!request) return load()
-  const cached = accessByRequest.get(request)
-  if (cached) return cached
-  const pending = load()
-  accessByRequest.set(request, pending)
-  return pending
+function intersectIds(current: string[] | null, next: string[]): string[] {
+  if (current === null) return next
+  const allowed = new Set(next)
+  return current.filter((id) => allowed.has(id))
 }
 
 function splitIdList(value: unknown): string[] | null {
@@ -210,6 +177,65 @@ async function resolveTaskIdsForTags(ctx: CrudCtx, tagIds: string[]): Promise<st
     return [...seen.entries()].filter(([, tags]) => tags.size >= required).map(([taskId]) => taskId)
   } catch (err) {
     logger.error('staff.timesheets.tasks tag filter resolution failed', { err })
+    getTelemetryRuntime()?.reportError(err, { module: 'staff', code: 'staff.task_tag_filter_failed' })
+    return []
+  }
+}
+
+type SupportFilterCriteria = {
+  supportCategory?: string
+  supportReference?: string
+  supportUnnotified?: boolean
+}
+
+/**
+ * Task ids whose support ticket row matches the requested support criteria. Like the
+ * tag lookup, a failed lookup narrows to nothing rather than widening the page.
+ */
+async function resolveTaskIdsForSupport(ctx: CrudCtx, criteria: SupportFilterCriteria): Promise<string[]> {
+  const tenantId = ctx.auth?.tenantId ?? null
+  const organizationId = ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null
+  if (!tenantId || !organizationId) return []
+  try {
+    const em = (ctx.container.resolve('em') as EntityManager).fork()
+    const where: Record<string, unknown> = { tenantId, organizationId, deletedAt: null }
+    if (criteria.supportCategory) where.categoryValue = criteria.supportCategory
+    if (criteria.supportReference) where.supportReference = { $ilike: `${escapeLikePattern(criteria.supportReference)}%` }
+    if (criteria.supportUnnotified) where.unnotifiedAt = { $ne: null }
+    const rows = await findWithDecryption(
+      em,
+      StaffSupportTicket,
+      where,
+      { fields: ['taskId'], limit: SUPPORT_FILTER_MAX_TASK_IDS + 1, orderBy: { createdAt: 'desc' } },
+      { tenantId, organizationId },
+    )
+    if (rows.length > SUPPORT_FILTER_MAX_TASK_IDS && ctx.request) supportFilterTruncatedRequests.add(ctx.request)
+    return Array.from(new Set(rows.slice(0, SUPPORT_FILTER_MAX_TASK_IDS).map((row) => row.taskId)))
+  } catch (err) {
+    logger.error('staff.timesheets.tasks support filter resolution failed', { err })
+    getTelemetryRuntime()?.reportError(err, { module: 'staff', code: 'staff.task_support_filter_failed' })
+    return []
+  }
+}
+
+async function resolveStatusIdsForPortalStatus(
+  ctx: CrudCtx,
+  portalStatus: 'received' | 'in_progress' | 'resolved',
+): Promise<string[]> {
+  const tenantId = ctx.auth?.tenantId ?? null
+  const organizationId = ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null
+  if (!tenantId || !organizationId) return []
+  try {
+    const em = (ctx.container.resolve('em') as EntityManager).fork()
+    const where: Record<string, unknown> = { tenantId, organizationId, deletedAt: null }
+    if (portalStatus === 'resolved') where.isDone = true
+    else if (portalStatus === 'received') Object.assign(where, { isDone: false, isDefault: true })
+    else Object.assign(where, { isDone: false, isDefault: false })
+    const rows = await em.find(StaffTimeTaskStatus, where, { fields: ['id'] })
+    return rows.map((row) => row.id)
+  } catch (err) {
+    logger.error('staff.timesheets.tasks portal status filter resolution failed', { err })
+    getTelemetryRuntime()?.reportError(err, { module: 'staff', code: 'staff.task_portal_status_filter_failed' })
     return []
   }
 }
@@ -228,13 +254,25 @@ export async function buildTaskListFilters(
   for (const raw of [query.ids, query.id]) {
     const parsed = splitIdList(raw)
     if (parsed === null) continue
-    narrowIds = narrowIds ? narrowIds.filter((id) => parsed.includes(id)) : parsed
+    narrowIds = intersectIds(narrowIds, parsed)
   }
 
   const requestedTagIds = splitIdList(query.tagIds)
   if (requestedTagIds !== null) {
     const tagged = requestedTagIds.length === 0 ? [] : await resolveTaskIdsForTags(ctx, requestedTagIds)
-    narrowIds = narrowIds ? narrowIds.filter((id) => tagged.includes(id)) : tagged
+    narrowIds = intersectIds(narrowIds, tagged)
+  }
+
+  const supportCategory = typeof query.supportCategory === 'string' ? query.supportCategory.trim() : ''
+  const supportReference = sanitizeSearchTerm(query.supportReference) ?? ''
+  const supportUnnotified = parseBooleanFlag(query.supportUnnotified)
+  if (supportCategory || supportReference || supportUnnotified) {
+    const supportTaskIds = await resolveTaskIdsForSupport(ctx, {
+      supportCategory: supportCategory || undefined,
+      supportReference: supportReference || undefined,
+      supportUnnotified,
+    })
+    narrowIds = intersectIds(narrowIds, supportTaskIds)
   }
 
   const access = await resolveListProjectAccess(ctx)
@@ -266,10 +304,17 @@ export async function buildTaskListFilters(
 
   if (typeof query.taskStatusId === 'string' && query.taskStatusId.trim().length > 0) {
     filters[F.task_status_id] = query.taskStatusId.trim()
+  } else if (query.portalStatus) {
+    const statusIds = await resolveStatusIdsForPortalStatus(ctx, query.portalStatus)
+    filters[F.task_status_id] = { $in: statusIds.length > 0 ? statusIds : [IMPOSSIBLE_ID] }
   }
   if (typeof query.assigneeStaffMemberId === 'string' && query.assigneeStaffMemberId.trim().length > 0) {
     filters[F.assignee_staff_member_id] = query.assigneeStaffMemberId.trim()
+  } else if (parseBooleanFlag(query.unassigned)) {
+    filters[F.assignee_staff_member_id] = { $eq: null }
   }
+  if (query.source) filters[F.source] = query.source
+  if (query.customerId) filters[F.customer_id] = query.customerId
   if (typeof query.parentTaskId === 'string' && query.parentTaskId.trim().length > 0) {
     // The drawer's checklist: one parent's children, in position order.
     filters[F.parent_task_id] = query.parentTaskId.trim()
@@ -320,6 +365,8 @@ export const taskListFields = [
   F.position,
   F.created_by_user_id,
   F.closed_at,
+  F.source,
+  F.customer_id,
   F.created_at,
   F.updated_at,
 ] as const
@@ -355,6 +402,9 @@ const crud = makeCrudRoute({
     buildFilters: buildTaskListFilters,
   },
   enrichers: { entityId: 'staff:staff_time_task' },
+  hooks: {
+    afterList: (payload, ctx) => markTaskListTotalCapped(payload, ctx),
+  },
   actions: {
     create: {
       commandId: staffTimeTaskCommandIds.create,
@@ -408,6 +458,8 @@ export const taskListItemSchema = z.object({
   position: z.number().int().nullable().optional(),
   created_by_user_id: z.string().uuid().nullable().optional(),
   closed_at: z.string().nullable().optional(),
+  source: z.enum(['internal', 'portal']).nullable().optional(),
+  customer_id: z.string().uuid().nullable().optional(),
   created_at: z.string().nullable().optional(),
   updated_at: z.string().nullable().optional(),
   /** This task's own entries, in raw minutes. */

package/src/modules/staff/api/timesheets/time-projects/[id]/employees/route.ts

@@ -31,6 +31,7 @@ const F = {
   status: 'status',
   assigned_start_date: 'assigned_start_date',
   assigned_end_date: 'assigned_end_date',
+  is_assigner: 'is_assigner',
   created_at: 'created_at',
   updated_at: 'updated_at',
   deleted_at: 'deleted_at',
@@ -90,6 +91,7 @@ const crud = makeCrudRoute({
       F.status,
       F.assigned_start_date,
       F.assigned_end_date,
+      F.is_assigner,
       F.created_at,
       F.updated_at,
     ],
@@ -201,6 +203,7 @@ const projectMemberListItemSchema = z.object({
   status: z.string().nullable().optional(),
   assigned_start_date: z.string().nullable().optional(),
   assigned_end_date: z.string().nullable().optional(),
+  is_assigner: z.boolean().nullable().optional(),
   created_at: z.string().nullable().optional(),
   updated_at: z.string().nullable().optional(),
 })

package/src/modules/staff/api/timesheets/time-projects/route.ts

@@ -47,6 +47,7 @@ const F = {
   budget_kind: 'budget_kind',
   budget_value: 'budget_value',
   budget_warn_at_percent: 'budget_warn_at_percent',
+  default_assignee_staff_member_id: 'default_assignee_staff_member_id',
   created_at: 'created_at',
   updated_at: 'updated_at',
   deleted_at: 'deleted_at',
@@ -338,6 +339,7 @@ export const timeProjectListFields = [
   F.budget_kind,
   F.budget_value,
   F.budget_warn_at_percent,
+  F.default_assignee_staff_member_id,
   F.created_at,
   F.updated_at,
 ] as const
@@ -563,6 +565,7 @@ export const timeProjectListItemSchema = z.object({
   budget_kind: z.string().nullable().optional(),
   budget_value: z.union([z.string(), z.number()]).nullable().optional(),
   budget_warn_at_percent: z.number().int().nullable().optional(),
+  default_assignee_staff_member_id: z.string().uuid().nullable().optional(),
   created_at: z.string().nullable().optional(),
   updated_at: z.string().nullable().optional(),
   entryCount: z.number().int().optional(),

package/src/modules/staff/backend/staff/time-tracking/projects/[id]/edit/page.tsx

@@ -89,6 +89,7 @@ function toValues(record: ProjectRecord): ProjectFormValues {
     budgetValue: readString(record, 'budgetValue', 'budget_value'),
     budgetWarnAtPercent:
       readString(record, 'budgetWarnAtPercent', 'budget_warn_at_percent') ?? String(DEFAULT_BUDGET_WARN_AT_PERCENT),
+    defaultAssigneeStaffMemberId: readString(record, 'defaultAssigneeStaffMemberId', 'default_assignee_staff_member_id') ?? null,
     projectType: readString(record, 'projectType', 'project_type'),
     color: readString(record, 'color'),
     startDate: readString(record, 'startDate', 'start_date'),

package/src/modules/staff/backend/staff/time-tracking/projects/[id]/page.tsx

@@ -11,8 +11,10 @@ import { Input } from '@open-mercato/ui/primitives/input'
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@open-mercato/ui/primitives/dialog'
 import { LookupSelect } from '@open-mercato/ui/backend/inputs/LookupSelect'
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@open-mercato/ui/primitives/tabs'
-import { apiCall, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
-import { deleteCrud, createCrud } from '@open-mercato/ui/backend/utils/crud'
+import { apiCall, readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { deleteCrud, createCrud, updateCrud } from '@open-mercato/ui/backend/utils/crud'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
+import { Switch } from '@open-mercato/ui/primitives/switch'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
@@ -102,6 +104,9 @@ type EmployeeAssignment = {
   assignedEndDate: string | null
   displayName: string | null
   teamName: string | null
+  isAssigner: boolean
+  hasUserAccount: boolean | null
+  updatedAt: string | null
 }
 
 type EmployeesResponse = {
@@ -113,6 +118,8 @@ type StaffMemberRecord = {
   id: string
   display_name?: string
   displayName?: string
+  user_id?: string | null
+  userId?: string | null
   team?: { id: string; name: string } | null
 }
 
@@ -475,6 +482,9 @@ export default function TimesheetProjectDetailPage({ params }: { params?: { id?:
             : null,
           displayName: staff?.display_name ?? staff?.displayName ?? null,
           teamName: staff?.team?.name ?? null,
+          isAssigner: item.is_assigner === true || item.isAssigner === true,
+          hasUserAccount: staff ? Boolean(staff.user_id ?? staff.userId) : null,
+          updatedAt: typeof (item.updated_at ?? item.updatedAt) === 'string' ? String(item.updated_at ?? item.updatedAt) : null,
         }
       })
 
@@ -562,6 +572,37 @@ export default function TimesheetProjectDetailPage({ params }: { params?: { id?:
     }
   }, [projectId, confirm, employeeMutationContext, runMutation, t])
 
+  const handleToggleAssigner = React.useCallback(async (emp: EmployeeAssignment, nextValue: boolean) => {
+    const payload = { id: emp.id, isAssigner: nextValue }
+    try {
+      await runMutation({
+        operation: () =>
+          withScopedApiRequestHeaders(buildOptimisticLockHeader(emp.updatedAt), () =>
+            updateCrud(`staff/timesheets/time-projects/${projectId}/employees`, payload, {
+              errorMessage: t('staff.time_tracking.assigners.saveError', 'Could not change the assigner setting.'),
+            }),
+          ),
+        context: employeeMutationContext(emp.id),
+        mutationPayload: payload,
+      })
+      flash(
+        nextValue
+          ? t('staff.time_tracking.assigners.enabled', 'Member is now an assigner.')
+          : t('staff.time_tracking.assigners.disabled', 'Member is no longer an assigner.'),
+        'success',
+      )
+      setReloadToken((token) => token + 1)
+    } catch (toggleError) {
+      if (surfaceRecordConflict(toggleError, t, { onRefresh: () => setReloadToken((token) => token + 1) })) return
+      flash(
+        toggleError instanceof Error && toggleError.message
+          ? toggleError.message
+          : t('staff.time_tracking.assigners.saveError', 'Could not change the assigner setting.'),
+        'error',
+      )
+    }
+  }, [projectId, employeeMutationContext, runMutation, t])
+
   // --- Add employee dialog ---
   const openAddDialog = React.useCallback(() => {
     setAddStaffMemberId(null)
@@ -1104,6 +1145,11 @@ export default function TimesheetProjectDetailPage({ params }: { params?: { id?:
                           </div>
                         </div>
                         <div className="flex items-center gap-3 shrink-0">
+                          {emp.isAssigner ? (
+                            <Badge variant="info" data-testid={`project-member-assigner-badge-${emp.id}`}>
+                              {t('staff.time_tracking.assigners.badge', 'Assigner')}
+                            </Badge>
+                          ) : null}
                           <Badge
                             variant={(emp.status ?? 'active') === 'active' ? 'success' : 'neutral'}
                             className="capitalize"
@@ -1155,6 +1201,25 @@ export default function TimesheetProjectDetailPage({ params }: { params?: { id?:
                                 <dd>{emp.teamName}</dd>
                               </div>
                             ) : null}
+                            <div className="col-span-2">
+                              <dt className="font-medium text-muted-foreground">
+                                {t('staff.time_tracking.assigners.label', 'Assigner')}
+                              </dt>
+                              <dd className="flex items-center gap-2 pt-1">
+                                <Switch
+                                  checked={emp.isAssigner}
+                                  disabled={!canManageProjects || emp.hasUserAccount === false}
+                                  onCheckedChange={(checked) => { void handleToggleAssigner(emp, checked === true) }}
+                                  aria-label={t('staff.time_tracking.assigners.label', 'Assigner')}
+                                  data-testid={`project-member-assigner-switch-${emp.id}`}
+                                />
+                                <span className="text-xs text-muted-foreground">
+                                  {emp.hasUserAccount === false
+                                    ? t('staff.time_tracking.assigners.needsUser', 'Only members with a user account can be assigners.')
+                                    : t('staff.time_tracking.assigners.help', 'Assigners are notified about new and released work and can claim unassigned tasks.')}
+                                </span>
+                              </dd>
+                            </div>
                           </dl>
                           {canManageProjects && (
                             <div className="flex justify-end">

package/src/modules/staff/backend/staff/time-tracking/projects/projectFormConfig.ts

@@ -15,6 +15,7 @@ import {
   ProjectBudgetSection,
   ProjectRoundingNotice,
   ProjectTeamSection,
+  ProjectDefaultAssigneeField,
   type ProjectBudgetKind,
 } from '../../../../lib/time-tracking-ui/ProjectFormSections'
 
@@ -43,6 +44,7 @@ export type ProjectFormValues = {
   startDate?: string | null
   costCenter?: string | null
   status?: string
+  defaultAssigneeStaffMemberId?: string | null
   /**
    * Custom-field values rendered by `CrudForm` from `entityIds`. They are keyed
    * `cf_<key>` / `cf:<key>` and are opaque here: this form neither declares nor
@@ -112,6 +114,7 @@ export function createProjectFormSchema() {
     startDate: z.string().optional().nullable(),
     costCenter: z.string().max(100).optional().nullable(),
     status: z.enum(['active', 'on_hold', 'completed']).optional(),
+    defaultAssigneeStaffMemberId: z.string().optional().nullable(),
   })
 }
 
@@ -381,9 +384,22 @@ export function createProjectFormGroups(
       id: 'team',
       column: 2,
       title: t('staff.time_tracking.projects.form.groupTeam', 'Team'),
-      component: (ctx) => React.createElement(ProjectTeamSection, {
-        projectId: typeof ctx.values.id === 'string' ? ctx.values.id : null,
-      }),
+      component: (ctx) => {
+        const projectId = typeof ctx.values.id === 'string' ? ctx.values.id : null
+        const defaultAssignee = ctx.values.defaultAssigneeStaffMemberId
+        return React.createElement(
+          React.Fragment,
+          null,
+          React.createElement(ProjectTeamSection, { projectId }),
+          projectId
+            ? React.createElement(ProjectDefaultAssigneeField, {
+                projectId,
+                value: typeof defaultAssignee === 'string' && defaultAssignee.length > 0 ? defaultAssignee : null,
+                onChange: (next: string | null) => ctx.setValue('defaultAssigneeStaffMemberId', next),
+              })
+            : null,
+        )
+      },
     },
     {
       id: 'rounding',
@@ -456,6 +472,9 @@ export function buildProjectPayload(values: ProjectFormValues): Record<string, u
     payload.currencyCode = trimmedOrNull(values.currencyCode)
   } else {
     payload.id = values.id
+    if (values.defaultAssigneeStaffMemberId !== undefined) {
+      payload.defaultAssigneeStaffMemberId = values.defaultAssigneeStaffMemberId || null
+    }
   }
   if (values.status) payload.status = values.status
   // The form renders custom-field inputs whenever `entityIds` is passed, but this