@open-mercato/core 0.6.4-develop.4217.1.c9aa050183 → 0.6.4-develop.4236.1.9fa6806b34

package/src/modules/staff/backend/staff/timesheets/projects/projectFormConfig.ts

@@ -0,0 +1,138 @@
+import * as React from 'react'
+import { z } from 'zod'
+import type { CrudField, CrudFormGroup } from '@open-mercato/ui/backend/CrudForm'
+import type { TranslateFn } from '@open-mercato/shared/lib/i18n/context'
+import { ColorPicker } from '../../../../lib/timesheets-ui/ColorPicker'
+import { PROJECT_COLOR_KEYS } from '../../../../lib/timesheets-ui/colors'
+
+export type ProjectFormValues = {
+  id?: string
+  name: string
+  code: string
+  description?: string | null
+  projectType?: string | null
+  color?: string | null
+  startDate?: string | null
+  costCenter?: string | null
+  status?: string
+}
+
+export function createProjectFormSchema() {
+  return z.object({
+    name: z.string().min(1),
+    code: z.string().min(1).max(50).regex(/^[a-zA-Z0-9-]+$/),
+    description: z.string().max(2000).optional().nullable(),
+    projectType: z.string().max(100).optional().nullable(),
+    color: z
+      .string()
+      .refine(
+        (value) => (PROJECT_COLOR_KEYS as readonly string[]).includes(value),
+        { message: 'Invalid project color key.' },
+      )
+      .optional()
+      .nullable(),
+    startDate: z.string().optional().nullable(),
+    costCenter: z.string().max(100).optional().nullable(),
+    status: z.enum(['active', 'on_hold', 'completed']).optional(),
+  })
+}
+
+export function createProjectFormFields(t: TranslateFn): CrudField[] {
+  return [
+    {
+      id: 'name',
+      type: 'text',
+      label: t('staff.timesheets.projects.form.name', 'Name'),
+      placeholder: t('staff.timesheets.projects.form.namePlaceholder', 'Project name'),
+      required: true,
+    },
+    {
+      id: 'code',
+      type: 'text',
+      label: t('staff.timesheets.projects.form.code', 'Code'),
+      placeholder: t('staff.timesheets.projects.form.codePlaceholder', 'PROJECT-001'),
+      required: true,
+    },
+    {
+      id: 'status',
+      type: 'select',
+      label: t('staff.timesheets.projects.form.status', 'Status'),
+      options: [
+        { value: 'active', label: t('staff.timesheets.projects.statuses.active', 'Active') },
+        { value: 'on_hold', label: t('staff.timesheets.projects.statuses.onHold', 'On Hold') },
+        { value: 'completed', label: t('staff.timesheets.projects.statuses.completed', 'Completed') },
+      ],
+    },
+    {
+      id: 'description',
+      type: 'textarea',
+      label: t('staff.timesheets.projects.form.description', 'Description'),
+      placeholder: t('staff.timesheets.projects.form.descriptionPlaceholder', 'Project description'),
+    },
+    {
+      id: 'projectType',
+      type: 'text',
+      label: t('staff.timesheets.projects.form.projectType', 'Project type'),
+      placeholder: t('staff.timesheets.projects.form.projectTypePlaceholder', 'e.g. Internal, Client, R&D'),
+    },
+    {
+      id: 'color',
+      type: 'custom',
+      label: t('staff.timesheets.projects.form.color', 'Project color'),
+      component: ({ value, setValue }) => {
+        const current = typeof value === 'string' ? value : null
+        return React.createElement(ColorPicker, {
+          value: current,
+          onChange: (next: string | null) => setValue(next),
+          resetLabel: t('staff.timesheets.projects.form.colorAuto', 'Auto'),
+        })
+      },
+    },
+    {
+      id: 'startDate',
+      type: 'date',
+      label: t('staff.timesheets.projects.form.startDate', 'Start date'),
+    },
+    {
+      id: 'costCenter',
+      type: 'text',
+      label: t('staff.timesheets.projects.form.costCenter', 'Cost center'),
+      placeholder: t('staff.timesheets.projects.form.costCenterPlaceholder', 'Cost center code'),
+    },
+  ]
+}
+
+export function createProjectFormGroups(t: TranslateFn): CrudFormGroup[] {
+  return [
+    {
+      id: 'main',
+      title: t('staff.timesheets.projects.form.groupMain', 'Project Details'),
+      fields: ['name', 'code', 'status', 'color', 'projectType', 'startDate'],
+    },
+    {
+      id: 'details',
+      title: t('staff.timesheets.projects.form.groupDetails', 'Additional Information'),
+      fields: ['description', 'costCenter'],
+    },
+  ]
+}
+
+export function buildProjectPayload(values: ProjectFormValues): Record<string, unknown> {
+  const payload: Record<string, unknown> = {
+    name: values.name.trim(),
+    code: values.code.trim(),
+  }
+  if (values.id) payload.id = values.id
+  if (values.description?.trim()) payload.description = values.description.trim()
+  else payload.description = null
+  if (values.projectType?.trim()) payload.projectType = values.projectType.trim()
+  else payload.projectType = null
+  if (values.color?.trim()) payload.color = values.color.trim()
+  else payload.color = null
+  if (values.startDate) payload.startDate = values.startDate
+  else payload.startDate = null
+  if (values.costCenter?.trim()) payload.costCenter = values.costCenter.trim()
+  else payload.costCenter = null
+  if (values.status) payload.status = values.status
+  return payload
+}

package/src/modules/staff/cli.ts

@@ -2,6 +2,12 @@ import type { ModuleCli } from '@open-mercato/shared/modules/registry'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { seedStaffActivityTypes, seedStaffAddressTypes, seedStaffTeamExamples, type StaffSeedScope } from './lib/seeds'
+import { appendWidgetsToRoles } from '@open-mercato/core/modules/dashboards/lib/role-widgets'
+
+const TIMESHEETS_DASHBOARD_WIDGET_IDS = [
+  'staff.timesheets.timeReporting',
+  'staff.timesheets.hoursByProject',
+]
 
 function parseArgs(rest: string[]) {
   const args: Record<string, string> = {}
@@ -101,4 +107,37 @@ const seedAddressTypesCommand: ModuleCli = {
   },
 }
 
-export default [seedActivityTypesCommand, seedAddressTypesCommand, seedExamplesCommand]
+const seedTimesheetsWidgetsCommand: ModuleCli = {
+  command: 'seed-timesheets-widgets',
+  async run(rest) {
+    const args = parseArgs(rest)
+    const tenantId = String(args.tenantId ?? args.tenant ?? '')
+    const organizationId = String(args.organizationId ?? args.org ?? args.orgId ?? '')
+    if (!tenantId || !organizationId) {
+      console.error('Usage: mercato staff seed-timesheets-widgets --tenant <tenantId> --org <organizationId>')
+      console.error('Backfills timesheets dashboard widgets (timeReporting, hoursByProject) to existing tenant roles.')
+      process.exit(1)
+      return
+    }
+    const container = await createRequestContainer()
+    try {
+      const em = container.resolve<EntityManager>('em')
+      await em.transactional(async (tem) => {
+        await appendWidgetsToRoles(tem, {
+          tenantId,
+          organizationId,
+          roleNames: ['superadmin', 'admin', 'employee'],
+          widgetIds: TIMESHEETS_DASHBOARD_WIDGET_IDS,
+        })
+      })
+      console.log('📊 Timesheets dashboard widgets seeded for organization', organizationId)
+    } finally {
+      const disposable = container as unknown as { dispose?: () => Promise<void> }
+      if (typeof disposable.dispose === 'function') {
+        await disposable.dispose()
+      }
+    }
+  },
+}
+
+export default [seedActivityTypesCommand, seedAddressTypesCommand, seedExamplesCommand, seedTimesheetsWidgetsCommand]

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

@@ -7,3 +7,5 @@ import './activities'
 import './addresses'
 import './job-histories'
 import './leave-requests'
+import './timesheets-entries'
+import './timesheets-projects'

package/src/modules/staff/commands/leave-requests.ts

@@ -5,6 +5,7 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { emitCrudSideEffects, emitCrudUndoSideEffects, buildChanges } from '@open-mercato/shared/lib/commands/helpers'
+import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
 import type { CrudIndexerConfig } from '@open-mercato/shared/lib/crud/types'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
 import { invalidateCrudCache } from '@open-mercato/shared/lib/crud/cache'
@@ -694,12 +695,30 @@ const acceptLeaveRequestCommand: CommandHandler<StaffLeaveRequestDecisionInput,
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const request = await em.findOne(StaffLeaveRequest, { id: before.id })
     if (!request) return
-    request.status = before.status
-    request.decisionComment = before.decisionComment
-    request.decidedByUserId = before.decidedByUserId
-    request.decidedAt = before.decidedAt ? new Date(before.decidedAt) : null
-    request.updatedAt = new Date()
-    await em.flush()
+
+    // Fetch rules before mutating so the query cannot reset unit-of-work tracking
+    // between the request scalar mutations and the flush (SPEC-018 Problem 1).
+    const rules = availabilityRuleIds.length
+      ? await em.find(PlannerAvailabilityRule, { id: { $in: availabilityRuleIds } })
+      : []
+
+    await withAtomicFlush(em, [
+      () => {
+        request.status = before.status
+        request.decisionComment = before.decisionComment
+        request.decidedByUserId = before.decidedByUserId
+        request.decidedAt = before.decidedAt ? new Date(before.decidedAt) : null
+        request.updatedAt = new Date()
+
+        if (rules.length) {
+          const now = new Date()
+          rules.forEach((rule) => {
+            rule.deletedAt = now
+            rule.updatedAt = now
+          })
+        }
+      },
+    ], { transaction: true })
 
     const de = (ctx.container.resolve('dataEngine') as DataEngine)
     await emitCrudUndoSideEffects({
@@ -715,30 +734,19 @@ const acceptLeaveRequestCommand: CommandHandler<StaffLeaveRequestDecisionInput,
       indexer: leaveRequestCrudIndexer,
     })
 
-    if (availabilityRuleIds.length) {
-      const rules = await em.find(PlannerAvailabilityRule, { id: { $in: availabilityRuleIds } })
-      const now = new Date()
-      rules.forEach((rule) => {
-        rule.deletedAt = now
-        rule.updatedAt = now
+    for (const rule of rules) {
+      await emitCrudUndoSideEffects({
+        dataEngine: de,
+        action: 'deleted',
+        entity: rule,
+        identifiers: {
+          id: rule.id,
+          organizationId: rule.organizationId,
+          tenantId: rule.tenantId,
+        },
+        events: plannerAvailabilityRuleCrudEvents,
+        indexer: availabilityRuleCrudIndexer,
       })
-      await em.flush()
-
-      const de = (ctx.container.resolve('dataEngine') as DataEngine)
-      for (const rule of rules) {
-        await emitCrudUndoSideEffects({
-          dataEngine: de,
-          action: 'deleted',
-          entity: rule,
-          identifiers: {
-            id: rule.id,
-            organizationId: rule.organizationId,
-            tenantId: rule.tenantId,
-          },
-          events: plannerAvailabilityRuleCrudEvents,
-          indexer: availabilityRuleCrudIndexer,
-        })
-      }
     }
     await invalidateAvailabilityCache({
       container: ctx.container,

package/src/modules/staff/commands/team-members.ts

@@ -6,6 +6,7 @@ import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { buildChanges, emitCrudSideEffects, emitCrudUndoSideEffects, parseWithCustomFields, setCustomFieldsIfAny } from '@open-mercato/shared/lib/commands/helpers'
 import { buildCustomFieldResetMap, diffCustomFieldChanges, loadCustomFieldSnapshot, type CustomFieldSnapshot } from '@open-mercato/shared/lib/commands/customFieldSnapshots'
+import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
 import type { CrudIndexerConfig } from '@open-mercato/shared/lib/crud/types'
 import { User } from '@open-mercato/core/modules/auth/data/entities'
@@ -270,30 +271,34 @@ const updateTeamMemberCommand: CommandHandler<StaffTeamMemberUpdateInput, { memb
     ensureTenantScope(ctx, member.tenantId)
     ensureOrganizationScope(ctx, member.organizationId)
 
-    if (parsed.userId !== undefined) {
-      if (parsed.userId) {
-        await ensureUserExists(em, parsed.userId, member.tenantId, member.organizationId)
-      }
-      member.userId = parsed.userId ?? null
+    // Resolve validation queries BEFORE mutating scalars: `ensure*` runs `em.find`,
+    // which would otherwise reset unit-of-work tracking between mutations and the
+    // flush and silently drop earlier scalar changes (SPEC-018 Problem 1).
+    if (parsed.userId !== undefined && parsed.userId) {
+      await ensureUserExists(em, parsed.userId, member.tenantId, member.organizationId)
     }
-    if (parsed.teamId !== undefined) {
-      if (parsed.teamId) {
-        await ensureTeamExists(em, parsed.teamId, member.tenantId, member.organizationId)
-      }
-      member.teamId = parsed.teamId ?? null
+    if (parsed.teamId !== undefined && parsed.teamId) {
+      await ensureTeamExists(em, parsed.teamId, member.tenantId, member.organizationId)
     }
+    let nextRoleIds: string[] | undefined
     if (parsed.roleIds !== undefined) {
-      const roleIds = normalizeStringList(parsed.roleIds)
-      await ensureRolesExist(em, roleIds, member.tenantId, member.organizationId)
-      member.roleIds = roleIds
+      nextRoleIds = normalizeStringList(parsed.roleIds)
+      await ensureRolesExist(em, nextRoleIds, member.tenantId, member.organizationId)
     }
-    if (parsed.tags !== undefined) member.tags = normalizeStringList(parsed.tags)
-    if (parsed.availabilityRuleSetId !== undefined) member.availabilityRuleSetId = parsed.availabilityRuleSetId ?? null
-    if (parsed.displayName !== undefined) member.displayName = parsed.displayName
-    if (parsed.description !== undefined) member.description = parsed.description ?? null
-    if (parsed.isActive !== undefined) member.isActive = parsed.isActive
-    member.updatedAt = new Date()
-    await em.flush()
+
+    await withAtomicFlush(em, [
+      () => {
+        if (parsed.userId !== undefined) member.userId = parsed.userId ?? null
+        if (parsed.teamId !== undefined) member.teamId = parsed.teamId ?? null
+        if (parsed.roleIds !== undefined) member.roleIds = nextRoleIds ?? []
+        if (parsed.tags !== undefined) member.tags = normalizeStringList(parsed.tags)
+        if (parsed.availabilityRuleSetId !== undefined) member.availabilityRuleSetId = parsed.availabilityRuleSetId ?? null
+        if (parsed.displayName !== undefined) member.displayName = parsed.displayName
+        if (parsed.description !== undefined) member.description = parsed.description ?? null
+        if (parsed.isActive !== undefined) member.isActive = parsed.isActive
+        member.updatedAt = new Date()
+      },
+    ], { transaction: true })
 
     const de = (ctx.container.resolve('dataEngine') as DataEngine)
     await setCustomFieldsIfAny({