@open-mercato/core 0.4.6-develop-f7d3079656 → 0.4.6-develop-0861f05ea9

package/src/modules/staff/api/activities.ts

@@ -1,278 +1,34 @@
-import { z } from 'zod'
-import type { EntityManager } from '@mikro-orm/postgresql'
-import { makeCrudRoute } from '@open-mercato/shared/lib/crud/factory'
-import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
-import { resolveCrudRecordId, parseScopedCommandInput } from '@open-mercato/shared/lib/api/scoped'
-import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import { makeActivityRoute } from '@open-mercato/core/modules/entities/lib/makeActivityRoute'
 import { StaffTeamMemberActivity } from '../data/entities'
 import {
   staffTeamMemberActivityCreateSchema,
   staffTeamMemberActivityUpdateSchema,
 } from '../data/validators'
-import { User } from '@open-mercato/core/modules/auth/data/entities'
 import { E } from '#generated/entities.ids.generated'
-import { createStaffCrudOpenApi, createPagedListResponseSchema, defaultOkResponseSchema } from './openapi'
-
-const rawBodySchema = z.object({}).passthrough()
-
-const listSchema = z
-  .object({
-    page: z.coerce.number().min(1).default(1),
-    pageSize: z.coerce.number().min(1).max(100).default(50),
-    entityId: z.string().uuid().optional(),
-    sortField: z.string().optional(),
-    sortDir: z.enum(['asc', 'desc']).optional(),
-  })
-  .passthrough()
-
-const routeMetadata = {
-  GET: { requireAuth: true, requireFeatures: ['staff.view'] },
-  POST: { requireAuth: true, requireFeatures: ['staff.manage_team'] },
-  PUT: { requireAuth: true, requireFeatures: ['staff.manage_team'] },
-  DELETE: { requireAuth: true, requireFeatures: ['staff.manage_team'] },
-}
-
-export const metadata = routeMetadata
-
-const crud = makeCrudRoute({
-  metadata: routeMetadata,
-  orm: {
-    entity: StaffTeamMemberActivity,
-    idField: 'id',
-    orgField: 'organizationId',
-    tenantField: 'tenantId',
-  },
-  indexer: {
-    entityType: E.staff.staff_team_member_activity,
-  },
-  list: {
-    schema: listSchema,
-    entityId: E.staff.staff_team_member_activity,
-    fields: [
-      'id',
-      'member_id',
-      'activity_type',
-      'subject',
-      'body',
-      'occurred_at',
-      'author_user_id',
-      'appearance_icon',
-      'appearance_color',
-      'organization_id',
-      'tenant_id',
-      'created_at',
-      'updated_at',
-    ],
-    decorateCustomFields: {
-      entityIds: E.staff.staff_team_member_activity,
-    },
-    sortFieldMap: {
-      occurredAt: 'occurred_at',
-      createdAt: 'created_at',
-      updatedAt: 'updated_at',
-    },
-    buildFilters: async (query) => {
-      const filters: Record<string, unknown> = {}
-      if (query.entityId) filters.member_id = { $eq: query.entityId }
-      return filters
-    },
-    transformItem: (item: Record<string, unknown>) => {
-      const record = (item ?? {}) as Record<string, unknown>
-      const toIsoString = (value: unknown): string | null => {
-        if (value == null) return null
-        if (value instanceof Date) return value.toISOString()
-        if (typeof value === 'string') {
-          const trimmed = value.trim()
-          if (!trimmed.length) return null
-          const date = new Date(trimmed)
-          return Number.isNaN(date.getTime()) ? trimmed : date.toISOString()
-        }
-        return null
-      }
-      const readString = (value: unknown): string | null => (typeof value === 'string' ? value : null)
-      const idValue = readString(record.id) ?? (record.id != null ? String(record.id) : '')
-      const memberId = readString(record['member_id']) ?? readString(record['memberId']) ?? null
-      const activityType =
-        readString(record['activity_type']) ??
-        readString(record['activityType']) ??
-        ''
-      const subject =
-        readString(record.subject) ??
-        (record.subject == null ? null : String(record.subject))
-      const body =
-        readString(record.body) ??
-        (record.body == null ? null : String(record.body))
-      const authorUserId =
-        readString(record['author_user_id']) ?? readString(record['authorUserId']) ?? null
-      const appearanceIconRaw =
-        readString(record['appearance_icon']) ?? readString(record['appearanceIcon'])
-      const appearanceColorRaw =
-        readString(record['appearance_color']) ?? readString(record['appearanceColor'])
-      const organizationId =
-        readString(record['organization_id']) ?? readString(record['organizationId'])
-      const tenantId =
-        readString(record['tenant_id']) ?? readString(record['tenantId'])
-      const output: Record<string, unknown> = {
-        id: idValue,
-        entityId: memberId,
-        memberId,
-        activityType,
-        subject,
-        body,
-        occurredAt: toIsoString(record['occurred_at'] ?? record['occurredAt']),
-        createdAt: toIsoString(record['created_at'] ?? record['createdAt']),
-        authorUserId,
-        organizationId,
-        tenantId,
-        appearanceIcon: appearanceIconRaw && appearanceIconRaw.trim().length ? appearanceIconRaw : null,
-        appearanceColor: appearanceColorRaw && appearanceColorRaw.trim().length ? appearanceColorRaw : null,
-        customFields: Array.isArray(record.customFields) ? record.customFields : undefined,
-        customValues: record.customValues ?? undefined,
-      }
-      for (const [key, value] of Object.entries(record)) {
-        if (key.startsWith('cf_') || key.startsWith('cf:')) {
-          output[key] = value
-        }
-      }
-      return output
-    },
-  },
-  actions: {
-    create: {
-      commandId: 'staff.team-member-activities.create',
-      schema: rawBodySchema,
-      mapInput: async ({ raw, ctx }) => {
-        const { translate } = await resolveTranslations()
-        return parseScopedCommandInput(staffTeamMemberActivityCreateSchema, raw ?? {}, ctx, translate)
-      },
-      response: ({ result }) => ({
-        id: result?.activityId ?? result?.id ?? null,
-        authorUserId: result?.authorUserId ?? null,
-      }),
-      status: 201,
-    },
-    update: {
-      commandId: 'staff.team-member-activities.update',
-      schema: rawBodySchema,
-      mapInput: async ({ raw, ctx }) => {
-        const { translate } = await resolveTranslations()
-        return parseScopedCommandInput(staffTeamMemberActivityUpdateSchema, raw ?? {}, ctx, translate)
-      },
-      response: () => ({ ok: true }),
-    },
-    delete: {
-      commandId: 'staff.team-member-activities.delete',
-      schema: rawBodySchema,
-      mapInput: async ({ parsed, ctx }) => {
-        const { translate } = await resolveTranslations()
-        const id = resolveCrudRecordId(parsed, ctx, translate)
-        return { id }
-      },
-      response: () => ({ ok: true }),
-    },
-  },
-  hooks: {
-    afterList: async (payload, ctx) => {
-      const items = Array.isArray(payload.items) ? payload.items : []
-      if (!items.length) return
-      const userIds = new Set<string>()
-      items.forEach((item: unknown) => {
-        if (!item || typeof item !== 'object') return
-        const record = item as Record<string, unknown>
-        const userId =
-          typeof record.author_user_id === 'string'
-            ? record.author_user_id
-            : typeof record.authorUserId === 'string'
-              ? record.authorUserId
-              : null
-        if (userId) userIds.add(userId)
-      })
-      if (!userIds.size) return
-      try {
-        const em = (ctx.container.resolve('em') as EntityManager).fork()
-        const users = await findWithDecryption(
-          em,
-          User,
-          { id: { $in: Array.from(userIds) } },
-          undefined,
-          { tenantId: ctx.auth?.tenantId ?? null, organizationId: ctx.selectedOrganizationId ?? null },
-        )
-        const map = new Map<string, { name: string | null; email: string | null }>()
-        users.forEach((user) => {
-          const name = typeof user.name === 'string' && user.name.trim().length
-            ? user.name.trim()
-            : null
-          map.set(user.id, { name, email: user.email ?? null })
-        })
-        items.forEach((item: unknown) => {
-          if (!item || typeof item !== 'object') return
-          const record = item as Record<string, unknown>
-          const userId =
-            typeof record.author_user_id === 'string'
-              ? record.author_user_id
-              : typeof record.authorUserId === 'string'
-                ? record.authorUserId
-                : null
-          if (!userId) return
-          const meta = map.get(userId)
-          if (!meta) return
-          record.authorName = meta.name
-          record.authorEmail = meta.email
-          if (!('author_name' in record)) record.author_name = meta.name
-          if (!('author_email' in record)) record.author_email = meta.email
-        })
-      } catch (err) {
-        console.warn('[staff.activities] failed to enrich author metadata', err)
-      }
-    },
+import { createStaffCrudOpenApi } from './openapi'
+
+const route = makeActivityRoute({
+  entity: StaffTeamMemberActivity,
+  entityId: E.staff.staff_team_member_activity,
+  parentFkColumn: 'member_id',
+  parentFkParam: 'memberId',
+  features: { view: 'staff.view', manage: 'staff.manage_team' },
+  createSchema: staffTeamMemberActivityCreateSchema,
+  updateSchema: staffTeamMemberActivityUpdateSchema,
+  commandPrefix: 'staff.team-member-activities',
+  logPrefix: '[staff.activities]',
+  openApiFactory: createStaffCrudOpenApi,
+  openApi: {
+    resourceName: 'TeamMemberActivity',
+    createDescription: 'Adds an activity to a team member timeline.',
+    updateDescription: 'Updates a team member activity.',
+    deleteDescription: 'Deletes a team member activity.',
   },
 })
 
-export const GET = crud.GET
-export const POST = crud.POST
-export const PUT = crud.PUT
-export const DELETE = crud.DELETE
-
-const activityListItemSchema = z
-  .object({
-    id: z.string().uuid(),
-    member_id: z.string().uuid().nullable().optional(),
-    activity_type: z.string().nullable().optional(),
-    subject: z.string().nullable().optional(),
-    body: z.string().nullable().optional(),
-    occurred_at: z.string().nullable().optional(),
-    author_user_id: z.string().uuid().nullable(),
-    appearance_icon: z.string().nullable().optional(),
-    appearance_color: z.string().nullable().optional(),
-    organization_id: z.string().uuid().nullable().optional(),
-    tenant_id: z.string().uuid().nullable().optional(),
-    created_at: z.string().nullable(),
-    updated_at: z.string().nullable().optional(),
-  })
-  .passthrough()
-
-const activityCreateResponseSchema = z.object({
-  id: z.string().uuid().nullable(),
-  authorUserId: z.string().uuid().nullable(),
-})
-
-export const openApi = createStaffCrudOpenApi({
-  resourceName: 'TeamMemberActivity',
-  querySchema: listSchema,
-  listResponseSchema: createPagedListResponseSchema(activityListItemSchema),
-  create: {
-    schema: staffTeamMemberActivityCreateSchema,
-    responseSchema: activityCreateResponseSchema,
-    description: 'Adds an activity to a team member timeline.',
-  },
-  update: {
-    schema: staffTeamMemberActivityUpdateSchema,
-    responseSchema: defaultOkResponseSchema,
-    description: 'Updates a team member activity.',
-  },
-  del: {
-    schema: z.object({ id: z.string().uuid() }),
-    responseSchema: defaultOkResponseSchema,
-    description: 'Deletes a team member activity.',
-  },
-})
+export const metadata = route.metadata
+export const openApi = route.openApi
+export const GET = route.GET
+export const POST = route.POST
+export const PUT = route.PUT
+export const DELETE = route.DELETE

package/src/modules/staff/backend/staff/leave-requests/[id]/page.tsx

@@ -2,7 +2,6 @@
 
 import * as React from 'react'
 import { useRouter } from 'next/navigation'
-import { Send } from 'lucide-react'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { Badge } from '@open-mercato/ui/primitives/badge'
 import { Button } from '@open-mercato/ui/primitives/button'
@@ -14,32 +13,7 @@ import { updateCrud } from '@open-mercato/ui/backend/utils/crud'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { LeaveRequestForm, buildLeaveRequestPayload, type LeaveRequestFormValues } from '@open-mercato/core/modules/staff/components/LeaveRequestForm'
-
-type LeaveRequestRecord = {
-  id: string
-  member?: { id?: string; displayName?: string }
-  memberId?: string | null
-  member_id?: string | null
-  startDate?: string | null
-  start_date?: string | null
-  endDate?: string | null
-  end_date?: string | null
-  timezone?: string | null
-  status?: 'pending' | 'approved' | 'rejected'
-  unavailabilityReasonEntryId?: string | null
-  unavailability_reason_entry_id?: string | null
-  unavailabilityReasonValue?: string | null
-  unavailability_reason_value?: string | null
-  note?: string | null
-  decisionComment?: string | null
-  decision_comment?: string | null
-  decidedAt?: string | null
-  decided_at?: string | null
-} & Record<string, unknown>
-
-type LeaveRequestsResponse = {
-  items?: LeaveRequestRecord[]
-}
+import { type LeaveRequestRecord, type LeaveRequestsResponse, type NormalizedLeaveRequest, normalizeLeaveRequest, resolveStatusVariant, formatDateLabel, formatDateRange } from '../../../../lib/leaveRequestHelpers'
 
 export default function StaffLeaveRequestDetailPage({ params }: { params?: { id?: string } }) {
   const id = params?.id
@@ -47,7 +21,7 @@ export default function StaffLeaveRequestDetailPage({ params }: { params?: { id?
   const router = useRouter()
   const [isLoading, setIsLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
-  const [record, setRecord] = React.useState<LeaveRequestRecord | null>(null)
+  const [record, setRecord] = React.useState<NormalizedLeaveRequest | null>(null)
   const [decisionComment, setDecisionComment] = React.useState('')
 
   React.useEffect(() => {
@@ -71,14 +45,9 @@ export default function StaffLeaveRequestDetailPage({ params }: { params?: { id?
         const entry = Array.isArray(payload.items) ? payload.items[0] : null
         if (!entry) throw new Error(t('staff.leaveRequests.errors.notFound', 'Leave request not found.'))
         if (!cancelled) {
-          setRecord(entry)
-          setDecisionComment(
-            typeof entry.decisionComment === 'string'
-              ? entry.decisionComment
-              : typeof entry.decision_comment === 'string'
-                ? entry.decision_comment
-                : ''
-          )
+          const normalized = normalizeLeaveRequest(entry)
+          setRecord(normalized)
+          setDecisionComment(normalized.decisionComment ?? '')
         }
       } catch (err) {
         if (!cancelled) {
@@ -96,19 +65,16 @@ export default function StaffLeaveRequestDetailPage({ params }: { params?: { id?
 
   const status = record?.status ?? 'pending'
   const memberLabel = record?.member?.displayName ?? null
-  const dateSummary = formatDateRange(
-    record?.startDate ?? record?.start_date ?? null,
-    record?.endDate ?? record?.end_date ?? null,
-  )
+  const dateSummary = formatDateRange(record?.startDate, record?.endDate)
   const initialValues = React.useMemo<LeaveRequestFormValues>(() => ({
     id: record?.id,
-    memberId: record?.memberId ?? record?.member_id ?? null,
+    memberId: record?.memberId ?? null,
     memberLabel,
-    startDate: record?.startDate ?? record?.start_date ?? null,
-    endDate: record?.endDate ?? record?.end_date ?? null,
+    startDate: record?.startDate ?? null,
+    endDate: record?.endDate ?? null,
     timezone: record?.timezone ?? null,
-    unavailabilityReasonEntryId: record?.unavailabilityReasonEntryId ?? record?.unavailability_reason_entry_id ?? null,
-    unavailabilityReasonValue: record?.unavailabilityReasonValue ?? record?.unavailability_reason_value ?? null,
+    unavailabilityReasonEntryId: record?.unavailabilityReasonEntryId ?? null,
+    unavailabilityReasonValue: record?.unavailabilityReasonValue ?? null,
     note: record?.note ?? null,
   }), [record, memberLabel])
 
@@ -167,9 +133,9 @@ const handleSubmit = React.useCallback(async (values: LeaveRequestFormValues) =>
             <Badge variant={resolveStatusVariant(status)}>
               {t(`staff.leaveRequests.status.${status}`, status)}
             </Badge>
-            {record.decided_at || record.decidedAt ? (
+            {record.decidedAt ? (
               <span className="text-xs text-muted-foreground">
-                {t('staff.leaveRequests.decision.at', 'Decision at')} {formatDateLabel(record.decidedAt ?? record.decided_at ?? null)}
+                {t('staff.leaveRequests.decision.at', 'Decision at')} {formatDateLabel(record.decidedAt)}
               </span>
             ) : null}
           </div>
@@ -201,10 +167,10 @@ const handleSubmit = React.useCallback(async (values: LeaveRequestFormValues) =>
               </Button>
             </div>
           </div>
-        ) : record.decisionComment || record.decision_comment ? (
+        ) : record.decisionComment ? (
           <div className="mb-6 rounded-lg border bg-card p-4 text-sm text-muted-foreground">
             <div className="mb-1 font-medium text-foreground">{t('staff.leaveRequests.decision.comment', 'Decision comment')}</div>
-            <p>{record.decisionComment ?? record.decision_comment}</p>
+            <p>{record.decisionComment}</p>
           </div>
         ) : null}
 
@@ -252,23 +218,3 @@ const handleSubmit = React.useCallback(async (values: LeaveRequestFormValues) =>
     </Page>
   )
 }
-
-function resolveStatusVariant(status: 'pending' | 'approved' | 'rejected') {
-  if (status === 'approved') return 'default'
-  if (status === 'rejected') return 'destructive'
-  return 'secondary'
-}
-
-function formatDateLabel(value?: string | null): string {
-  if (!value) return ''
-  const date = new Date(value)
-  if (Number.isNaN(date.getTime())) return value
-  return date.toLocaleDateString()
-}
-
-function formatDateRange(start?: string | null, end?: string | null): string {
-  const startLabel = formatDateLabel(start)
-  const endLabel = formatDateLabel(end)
-  if (startLabel && endLabel) return `${startLabel} -> ${endLabel}`
-  return startLabel || endLabel || '-'
-}

package/src/modules/staff/backend/staff/my-leave-requests/[id]/page.tsx

@@ -2,7 +2,6 @@
 
 import * as React from 'react'
 import { useRouter } from 'next/navigation'
-import { Send } from 'lucide-react'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { Badge } from '@open-mercato/ui/primitives/badge'
 import { Button } from '@open-mercato/ui/primitives/button'
@@ -13,32 +12,7 @@ import { updateCrud } from '@open-mercato/ui/backend/utils/crud'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { LeaveRequestForm, buildLeaveRequestPayload, type LeaveRequestFormValues } from '@open-mercato/core/modules/staff/components/LeaveRequestForm'
-
-type LeaveRequestRecord = {
-  id: string
-  member?: { id?: string; displayName?: string }
-  memberId?: string | null
-  member_id?: string | null
-  startDate?: string | null
-  start_date?: string | null
-  endDate?: string | null
-  end_date?: string | null
-  timezone?: string | null
-  status?: 'pending' | 'approved' | 'rejected'
-  unavailabilityReasonEntryId?: string | null
-  unavailability_reason_entry_id?: string | null
-  unavailabilityReasonValue?: string | null
-  unavailability_reason_value?: string | null
-  note?: string | null
-  decisionComment?: string | null
-  decision_comment?: string | null
-  decidedAt?: string | null
-  decided_at?: string | null
-} & Record<string, unknown>
-
-type LeaveRequestsResponse = {
-  items?: LeaveRequestRecord[]
-}
+import { type LeaveRequestsResponse, type NormalizedLeaveRequest, normalizeLeaveRequest, resolveStatusVariant, formatDateLabel, formatDateRange } from '../../../../lib/leaveRequestHelpers'
 
 export default function StaffMyLeaveRequestDetailPage({ params }: { params?: { id?: string } }) {
   const id = params?.id
@@ -46,7 +20,7 @@ export default function StaffMyLeaveRequestDetailPage({ params }: { params?: { i
   const router = useRouter()
   const [isLoading, setIsLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
-  const [record, setRecord] = React.useState<LeaveRequestRecord | null>(null)
+  const [record, setRecord] = React.useState<NormalizedLeaveRequest | null>(null)
 
   React.useEffect(() => {
     if (!id) {
@@ -69,7 +43,7 @@ export default function StaffMyLeaveRequestDetailPage({ params }: { params?: { i
         const entry = Array.isArray(payload.items) ? payload.items[0] : null
         if (!entry) throw new Error(t('staff.leaveRequests.errors.notFound', 'Leave request not found.'))
         if (!cancelled) {
-          setRecord(entry)
+          setRecord(normalizeLeaveRequest(entry))
         }
       } catch (err) {
         if (!cancelled) {
@@ -89,19 +63,16 @@ export default function StaffMyLeaveRequestDetailPage({ params }: { params?: { i
   const memberLabel = record?.member?.displayName ?? null
   const initialValues = React.useMemo<LeaveRequestFormValues>(() => ({
     id: record?.id,
-    memberId: record?.memberId ?? record?.member_id ?? null,
+    memberId: record?.memberId ?? null,
     memberLabel,
-    startDate: record?.startDate ?? record?.start_date ?? null,
-    endDate: record?.endDate ?? record?.end_date ?? null,
+    startDate: record?.startDate ?? null,
+    endDate: record?.endDate ?? null,
     timezone: record?.timezone ?? null,
-    unavailabilityReasonEntryId: record?.unavailabilityReasonEntryId ?? record?.unavailability_reason_entry_id ?? null,
-    unavailabilityReasonValue: record?.unavailabilityReasonValue ?? record?.unavailability_reason_value ?? null,
+    unavailabilityReasonEntryId: record?.unavailabilityReasonEntryId ?? null,
+    unavailabilityReasonValue: record?.unavailabilityReasonValue ?? null,
     note: record?.note ?? null,
   }), [record, memberLabel])
-  const dateSummary = formatDateRange(
-    record?.startDate ?? record?.start_date ?? null,
-    record?.endDate ?? record?.end_date ?? null,
-  )
+  const dateSummary = formatDateRange(record?.startDate, record?.endDate)
 const handleSubmit = React.useCallback(async (values: LeaveRequestFormValues) => {
     if (!record?.id) return
     const payload = buildLeaveRequestPayload(values, { id: record.id })
@@ -140,16 +111,16 @@ const handleSubmit = React.useCallback(async (values: LeaveRequestFormValues) =>
             <Badge variant={resolveStatusVariant(status)}>
               {t(`staff.leaveRequests.status.${status}`, status)}
             </Badge>
-            {record.decided_at || record.decidedAt ? (
+            {record.decidedAt ? (
               <span className="text-xs text-muted-foreground">
-                {t('staff.leaveRequests.decision.at', 'Decision at')} {formatDateLabel(record.decidedAt ?? record.decided_at ?? null)}
+                {t('staff.leaveRequests.decision.at', 'Decision at')} {formatDateLabel(record.decidedAt)}
               </span>
             ) : null}
           </div>
-          {record.decisionComment || record.decision_comment ? (
+          {record.decisionComment ? (
             <div className="text-sm text-muted-foreground">
               <div className="font-medium text-foreground">{t('staff.leaveRequests.decision.comment', 'Decision comment')}</div>
-              <p>{record.decisionComment ?? record.decision_comment}</p>
+              <p>{record.decisionComment}</p>
             </div>
           ) : null}
         </div>
@@ -199,9 +170,9 @@ const handleSubmit = React.useCallback(async (values: LeaveRequestFormValues) =>
           <div className="rounded-lg border bg-card p-4 text-sm text-muted-foreground">
             <div className="font-medium text-foreground">{t('staff.leaveRequests.detail.summary', 'Request details')}</div>
             <p>{memberLabel ? t('staff.leaveRequests.detail.member', 'Team member') + `: ${memberLabel}` : null}</p>
-            <p>{t('staff.leaveRequests.detail.dates', 'Dates')}: {formatDateRange(record.startDate ?? record.start_date ?? null, record.endDate ?? record.end_date ?? null)}</p>
-            {record.unavailabilityReasonValue || record.unavailability_reason_value ? (
-              <p>{t('staff.leaveRequests.detail.reason', 'Reason')}: {record.unavailabilityReasonValue ?? record.unavailability_reason_value}</p>
+            <p>{t('staff.leaveRequests.detail.dates', 'Dates')}: {formatDateRange(record.startDate, record.endDate)}</p>
+            {record.unavailabilityReasonValue ? (
+              <p>{t('staff.leaveRequests.detail.reason', 'Reason')}: {record.unavailabilityReasonValue}</p>
             ) : null}
             {record.note ? <p>{t('staff.leaveRequests.detail.note', 'Note')}: {record.note}</p> : null}
           </div>
@@ -210,23 +181,3 @@ const handleSubmit = React.useCallback(async (values: LeaveRequestFormValues) =>
     </Page>
   )
 }
-
-function resolveStatusVariant(status: 'pending' | 'approved' | 'rejected') {
-  if (status === 'approved') return 'default'
-  if (status === 'rejected') return 'destructive'
-  return 'secondary'
-}
-
-function formatDateLabel(value?: string | null): string {
-  if (!value) return ''
-  const date = new Date(value)
-  if (Number.isNaN(date.getTime())) return value
-  return date.toLocaleDateString()
-}
-
-function formatDateRange(start?: string | null, end?: string | null): string {
-  const startLabel = formatDateLabel(start)
-  const endLabel = formatDateLabel(end)
-  if (startLabel && endLabel) return `${startLabel} -> ${endLabel}`
-  return startLabel || endLabel || '-'
-}

package/src/modules/staff/commands/activities.ts

@@ -7,6 +7,7 @@ import {
   requireId,
   parseWithCustomFields,
   setCustomFieldsIfAny,
+  normalizeAuthorUserId,
 } from '@open-mercato/shared/lib/commands/helpers'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
 import type { EntityManager } from '@mikro-orm/postgresql'
@@ -115,13 +116,7 @@ const createActivityCommand: CommandHandler<
     const { parsed, custom } = parseWithCustomFields(staffTeamMemberActivityCreateSchema, rawInput)
     ensureTenantScope(ctx, parsed.tenantId)
     ensureOrganizationScope(ctx, parsed.organizationId)
-    const authSub = ctx.auth?.isApiKey ? null : ctx.auth?.sub ?? null
-    const normalizedAuthor = (() => {
-      if (parsed.authorUserId) return parsed.authorUserId
-      if (!authSub) return null
-      const uuidRegex = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$/
-      return uuidRegex.test(authSub) ? authSub : null
-    })()
+    const normalizedAuthor = normalizeAuthorUserId(parsed.authorUserId, ctx.auth)
 
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const member = await requireTeamMember(em, parsed.entityId, 'Team member not found')

package/src/modules/staff/commands/comments.ts

@@ -1,6 +1,6 @@
 import { registerCommand } from '@open-mercato/shared/lib/commands'
 import type { CommandHandler } from '@open-mercato/shared/lib/commands'
-import { emitCrudSideEffects, emitCrudUndoSideEffects, buildChanges, requireId } from '@open-mercato/shared/lib/commands/helpers'
+import { emitCrudSideEffects, emitCrudUndoSideEffects, buildChanges, requireId, normalizeAuthorUserId } from '@open-mercato/shared/lib/commands/helpers'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
@@ -60,13 +60,7 @@ const createCommentCommand: CommandHandler<
     const parsed = staffTeamMemberCommentCreateSchema.parse(rawInput)
     ensureTenantScope(ctx, parsed.tenantId)
     ensureOrganizationScope(ctx, parsed.organizationId)
-    const authSub = ctx.auth?.isApiKey ? null : ctx.auth?.sub ?? null
-    const normalizedAuthor = (() => {
-      if (parsed.authorUserId) return parsed.authorUserId
-      if (!authSub) return null
-      const uuidRegex = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$/
-      return uuidRegex.test(authSub) ? authSub : null
-    })()
+    const normalizedAuthor = normalizeAuthorUserId(parsed.authorUserId, ctx.auth)
 
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const member = await requireTeamMember(em, parsed.entityId, 'Team member not found')