@open-mercato/core 0.4.2-canary-d0a025141f → 0.4.2-canary-3efa759f5c

package/src/modules/sales/commands/documents.ts

@@ -4,7 +4,7 @@ import { randomUUID } from 'crypto'
 import { z } from 'zod'
 import { registerCommand } from '@open-mercato/shared/lib/commands'
 import type { CommandHandler } from '@open-mercato/shared/lib/commands'
-import { emitCrudSideEffects, requireId, type CrudEventsConfig } from '@open-mercato/shared/lib/commands/helpers'
+import { emitCrudSideEffects, requireId } from '@open-mercato/shared/lib/commands/helpers'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import type { EventBus } from '@open-mercato/events'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
@@ -89,29 +89,6 @@ import { resolveStatusEntryIdByValue } from '../lib/statusHelpers'
 import { SalesDocumentNumberGenerator } from '../services/salesDocumentNumberGenerator'
 import { loadSalesSettings } from './settings'
 
-// CRUD events configuration for workflow triggers
-const orderCrudEvents: CrudEventsConfig<SalesOrder> = {
-  module: 'sales',
-  entity: 'orders',
-  persistent: true,
-  buildPayload: (ctx) => ({
-    id: ctx.identifiers.id,
-    organizationId: ctx.identifiers.organizationId,
-    tenantId: ctx.identifiers.tenantId,
-  }),
-}
-
-const quoteCrudEvents: CrudEventsConfig<SalesQuote> = {
-  module: 'sales',
-  entity: 'quotes',
-  persistent: true,
-  buildPayload: (ctx) => ({
-    id: ctx.identifiers.id,
-    organizationId: ctx.identifiers.organizationId,
-    tenantId: ctx.identifiers.tenantId,
-  }),
-}
-
 type DocumentAddressSnapshot = {
   id: string
   organizationId: string
@@ -3134,31 +3111,6 @@ const createQuoteCommand: CommandHandler<QuoteCreateInput, { quoteId: string }>
     })
     await em.flush()
 
-    // Emit CRUD side effects to trigger workflow event listeners
-    const dataEngine = ctx.container.resolve('dataEngine') as DataEngine
-    await emitCrudSideEffects({
-      dataEngine,
-      action: 'created',
-      entity: quote,
-      identifiers: {
-        id: quote.id,
-        organizationId: quote.organizationId,
-        tenantId: quote.tenantId,
-      },
-      events: quoteCrudEvents,
-      indexer: { entityType: E.sales.sales_quote },
-    })
-
-    // Invalidate cache
-    const resourceKind = deriveResourceFromCommandId(createQuoteCommand.id) ?? 'sales.quote'
-    await invalidateCrudCache(
-      ctx.container,
-      resourceKind,
-      { id: quote.id, organizationId: quote.organizationId, tenantId: quote.tenantId },
-      ctx.auth?.tenantId ?? null,
-      'created'
-    )
-
     return { quoteId: quote.id }
   },
   captureAfter: async (_input, result, ctx) => {
@@ -3830,31 +3782,6 @@ const createOrderCommand: CommandHandler<OrderCreateInput, { orderId: string }>
     })
     await em.flush()
 
-    // Emit CRUD side effects to trigger workflow event listeners
-    const dataEngine = ctx.container.resolve('dataEngine') as DataEngine
-    await emitCrudSideEffects({
-      dataEngine,
-      action: 'created',
-      entity: order,
-      identifiers: {
-        id: order.id,
-        organizationId: order.organizationId,
-        tenantId: order.tenantId,
-      },
-      events: orderCrudEvents,
-      indexer: { entityType: E.sales.sales_order },
-    })
-
-    // Invalidate cache
-    const resourceKind = deriveResourceFromCommandId(createOrderCommand.id) ?? 'sales.order'
-    await invalidateCrudCache(
-      ctx.container,
-      resourceKind,
-      { id: order.id, organizationId: order.organizationId, tenantId: order.tenantId },
-      ctx.auth?.tenantId ?? null,
-      'created'
-    )
-
     return { orderId: order.id }
   },
   captureAfter: async (_input, result, ctx) => {

package/src/modules/sales/lib/dictionaries.ts

@@ -125,9 +125,6 @@ type SeedScope = { tenantId: string; organizationId: string }
 
 const ORDER_STATUS_DEFAULTS: SalesDictionarySeed[] = [
   { value: 'draft', label: 'Draft', color: '#94a3b8', icon: 'lucide:file-pen-line' },
-  { value: 'pending_approval', label: 'Pending Approval', color: '#f59e0b', icon: 'lucide:hourglass' },
-  { value: 'approved', label: 'Approved', color: '#16a34a', icon: 'lucide:check-circle' },
-  { value: 'rejected', label: 'Rejected', color: '#ef4444', icon: 'lucide:x-circle' },
   { value: 'sent', label: 'Sent', color: '#0ea5e9', icon: 'lucide:send' },
   { value: 'confirmed', label: 'Confirmed', color: '#2563eb', icon: 'lucide:badge-check' },
   { value: 'in_fulfillment', label: 'In fulfillment', color: '#f59e0b', icon: 'lucide:loader-2' },

package/src/modules/workflows/acl.ts

@@ -19,8 +19,6 @@ export const features = [
   { id: 'workflows.tasks.complete', title: 'Complete workflow tasks', module: moduleId },
   { id: 'workflows.signals.send', title: 'Send workflow signals', module: moduleId },
   { id: 'workflows.events.view', title: 'View workflow events', module: moduleId },
-  // Note: Event triggers are now embedded in workflow definitions.
-  // Trigger management permissions are covered by workflows.definitions.edit
 ]
 
 export default features

package/src/modules/workflows/api/__tests__/instances.route.test.ts

@@ -194,14 +194,11 @@ describe('Workflow Instances API', () => {
       const request = new NextRequest('http://localhost/api/workflows/instances?entityType=order&entityId=order-123')
       await listInstances(request)
 
-      // The implementation uses JSONB $contains queries for metadata filtering
       expect(mockEm.findAndCount).toHaveBeenCalledWith(
         WorkflowInstance,
         expect.objectContaining({
-          $and: expect.arrayContaining([
-            { metadata: { $contains: { entityType: 'order' } } },
-            { metadata: { $contains: { entityId: 'order-123' } } },
-          ]),
+          'metadata.entityType': 'order',
+          'metadata.entityId': 'order-123',
         }),
         expect.any(Object)
       )

package/src/modules/workflows/api/instances/route.ts

@@ -70,33 +70,19 @@ export async function GET(request: NextRequest) {
     }
 
     if (status) {
-      // Support comma-separated status values (e.g., "RUNNING,PAUSED,WAITING_FOR_ACTIVITIES")
-      const statuses = status.split(',').map(s => s.trim()).filter(Boolean)
-      if (statuses.length === 1) {
-        where.status = statuses[0]
-      } else if (statuses.length > 1) {
-        where.status = { $in: statuses }
-      }
+      where.status = status
     }
 
     if (correlationKey) {
       where.correlationKey = correlationKey
     }
 
-    // For JSONB metadata filtering, use $contains with explicit key-value pairs
-    // MikroORM's dot notation creates table joins, not JSON access
-    if (entityType || entityId) {
-      where.$and = where.$and || []
-      if (entityType) {
-        where.$and.push({
-          metadata: { $contains: { entityType: entityType } }
-        })
-      }
-      if (entityId) {
-        where.$and.push({
-          metadata: { $contains: { entityId: entityId } }
-        })
-      }
+    if (entityType) {
+      where['metadata.entityType'] = entityType
+    }
+
+    if (entityId) {
+      where['metadata.entityId'] = entityId
     }
 
     const [instances, total] = await em.findAndCount(

package/src/modules/workflows/api/tasks/route.ts

@@ -67,13 +67,7 @@ export async function GET(request: NextRequest) {
     }
 
     if (status) {
-      // Handle comma-separated status values
-      const statusValues = status.split(',').map(s => s.trim()).filter(Boolean)
-      if (statusValues.length === 1) {
-        where.status = statusValues[0]
-      } else if (statusValues.length > 1) {
-        where.status = { $in: statusValues }
-      }
+      where.status = status
     }
 
     if (assignedTo) {

package/src/modules/workflows/backend/definitions/[id]/page.meta.ts

@@ -4,7 +4,7 @@ export const metadata = {
   pageTitle: 'Edit Workflow Definition',
   pageTitleKey: 'workflows.edit.title',
   breadcrumb: [
-    { label: 'Workflows', labelKey: 'workflows.module.name', href: '/backend/definitions' },
+    { label: 'Workflows', labelKey: 'workflows.module.name', href: '/backend/workflows/definitions' },
     { label: 'Edit', labelKey: 'workflows.common.edit' },
   ],
 }

package/src/modules/workflows/backend/definitions/[id]/page.tsx

@@ -19,7 +19,6 @@ import {
 } from '../../../components/formConfig'
 import { StepsEditor } from '../../../components/StepsEditor'
 import { TransitionsEditor } from '../../../components/TransitionsEditor'
-import { EventTriggersEditor } from '../../../components/EventTriggersEditor'
 
 export default function EditWorkflowDefinitionPage() {
   const router = useRouter()
@@ -146,14 +145,6 @@ export default function EditWorkflowDefinitionPage() {
           groups={formGroups}
           submitLabel={t('workflows.form.update')}
         />
-
-        {/* Event Triggers Section */}
-        <div className="mt-8">
-          <EventTriggersEditor
-            workflowDefinitionId={definitionId!}
-            workflowId={definition?.workflowId}
-          />
-        </div>
       </PageBody>
     </Page>
   )

package/src/modules/workflows/backend/definitions/create/page.meta.ts

@@ -20,7 +20,7 @@ export const metadata = {
   pageOrder: 100,
   icon: createIcon,
   breadcrumb: [
-    { label: 'Workflows', labelKey: 'workflows.module.name', href: '/backend/definitions' },
+    { label: 'Workflows', labelKey: 'workflows.module.name', href: '/backend/workflows/definitions' },
     { label: 'Create', labelKey: 'workflows.common.create' },
   ],
 }

package/src/modules/workflows/backend/definitions/create/page.tsx

@@ -16,8 +16,6 @@ import {
 } from '../../../components/formConfig'
 import { StepsEditor } from '../../../components/StepsEditor'
 import { TransitionsEditor } from '../../../components/TransitionsEditor'
-import { Alert, AlertDescription, AlertTitle } from '@open-mercato/ui/primitives/alert'
-import { Zap } from 'lucide-react'
 
 export default function CreateWorkflowDefinitionPage() {
   const router = useRouter()
@@ -52,13 +50,6 @@ export default function CreateWorkflowDefinitionPage() {
   return (
     <Page>
       <PageBody>
-        <Alert variant="info" className="mb-6">
-          <Zap className="w-4 h-4" />
-          <AlertTitle>Event Triggers</AlertTitle>
-          <AlertDescription>
-            After creating this workflow definition, you can configure event triggers to automatically start the workflow when specific events occur in the system.
-          </AlertDescription>
-        </Alert>
         <CrudForm
           title={t('workflows.create.title')}
           backHref="/backend/definitions"

package/src/modules/workflows/backend/definitions/visual-editor/page.meta.ts

@@ -19,7 +19,7 @@ export const metadata = {
   pageOrder: 150,
   icon: visualEditorIcon,
   breadcrumb: [
-    { label: 'Workflows', labelKey: 'workflows.module.name', href: '/backend/definitions' },
+    { label: 'Workflows', labelKey: 'workflows.module.name', href: '/backend/workflows/definitions' },
     { label: 'Visual Editor', labelKey: 'workflows.backend.definitions.visual_editor.title' },
   ],
 }

package/src/modules/workflows/backend/definitions/visual-editor/page.tsx

@@ -34,8 +34,6 @@ import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import {CircleQuestionMark, Info, PanelTopClose, PanelTopOpen, Play, Save, Trash2} from 'lucide-react'
 import { NODE_TYPE_ICONS, NODE_TYPE_COLORS, NODE_TYPE_LABELS } from '../../../lib/node-type-icons'
-import { DefinitionTriggersEditor } from '../../../components/DefinitionTriggersEditor'
-import type { WorkflowDefinitionTrigger } from '../../../data/entities'
 import * as React from "react";
 
 /**
@@ -78,7 +76,6 @@ export default function VisualEditorPage() {
   const [icon, setIcon] = useState('')
   const [effectiveFrom, setEffectiveFrom] = useState('')
   const [effectiveTo, setEffectiveTo] = useState('')
-  const [triggers, setTriggers] = useState<WorkflowDefinitionTrigger[]>([])
 
   // Load existing definition if ID is provided
   useEffect(() => {
@@ -116,9 +113,6 @@ export default function VisualEditorPage() {
         setNodes(graph.nodes)
         setEdges(graph.edges)
 
-        // Load embedded triggers from definition
-        setTriggers(definition.definition?.triggers || [])
-
         flash('Workflow loaded successfully', 'success')
       } catch (error) {
         console.error('Error loading workflow definition:', error)
@@ -290,12 +284,8 @@ export default function VisualEditorPage() {
       return
     }
 
-    // Generate definition data and include triggers
-    const graphDefinition = graphToDefinition(nodes, edges, { includePositions: true })
-    const definitionData = {
-      ...graphDefinition,
-      triggers: triggers.length > 0 ? triggers : undefined,
-    }
+    // Generate definition data
+    const definitionData = graphToDefinition(nodes, edges, { includePositions: true })
 
     // Run Zod schema validation before saving
     const schemaResult = workflowDefinitionDataSchema.safeParse(definitionData)
@@ -367,7 +357,7 @@ export default function VisualEditorPage() {
     } finally {
       setIsSaving(false)
     }
-  }, [nodes, edges, workflowId, workflowName, description, version, enabled, category, tags, triggers, definitionId, router])
+  }, [nodes, edges, workflowId, workflowName, description, version, enabled, category, tags, definitionId, router])
 
   // Test workflow
   const handleTest = useCallback(() => {
@@ -485,7 +475,6 @@ export default function VisualEditorPage() {
     setIcon('')
     setEffectiveFrom('')
     setEffectiveTo('')
-    setTriggers([])
     setShowClearConfirm(false)
     flash('Canvas cleared', 'success')
   }, [])
@@ -720,13 +709,6 @@ export default function VisualEditorPage() {
             </div>
             </div>
           </div>
-
-          {/* Event Triggers - Always visible, managed as part of definition */}
-          <DefinitionTriggersEditor
-            value={triggers}
-            onChange={setTriggers}
-            className="mt-4"
-          />
         </div>
       )}
 

package/src/modules/workflows/backend/events/[id]/page.meta.ts

@@ -4,8 +4,8 @@ export const metadata = {
   pageTitle: 'Event Details',
   pageTitleKey: 'workflows.events.detail.title',
   breadcrumb: [
-    { label: 'Workflows', labelKey: 'workflows.module.name', href: '/backend/definitions' },
-    { label: 'Events', labelKey: 'workflows.events.plural', href: '/backend/events' },
+    { label: 'Workflows', labelKey: 'workflows.module.name', href: '/backend/workflows/definitions' },
+    { label: 'Events', labelKey: 'workflows.events.plural', href: '/backend/workflows/events' },
     { label: 'Details', labelKey: 'common.details' },
   ],
 }

package/src/modules/workflows/backend/events/[id]/page.tsx

@@ -212,7 +212,7 @@ export default function WorkflowEventDetailPage() {
                   </dt>
                   <dd className="mt-1">
                     <Link
-                      href={`/backend/instances/${event.workflowInstance.id}`}
+                      href={`/backend/workflows/instances/${event.workflowInstance.id}`}
                       className="text-sm text-primary hover:underline font-mono"
                     >
                       {event.workflowInstance.id}

package/src/modules/workflows/backend/instances/[id]/page.meta.ts

@@ -4,8 +4,8 @@ export const metadata = {
   pageTitle: 'Workflow Instance Details',
   pageTitleKey: 'workflows.instances.singular',
   breadcrumb: [
-    { label: 'Workflows', labelKey: 'workflows.module.name', href: '/backend/definitions' },
-    { label: 'Instances', labelKey: 'workflows.instances.plural', href: '/backend/instances' },
+    { label: 'Workflows', labelKey: 'workflows.module.name', href: '/backend/workflows/definitions' },
+    { label: 'Instances', labelKey: 'workflows.instances.plural', href: '/backend/workflows/instances' },
     { label: 'Details', labelKey: 'common.details' },
   ],
 }

package/src/modules/workflows/backend/tasks/[id]/page.meta.ts

@@ -4,8 +4,8 @@ export const metadata = {
   pageTitle: 'Task Details',
   pageTitleKey: 'workflows.tasks.singular',
   breadcrumb: [
-    { label: 'Workflows', labelKey: 'workflows.module.name', href: '/backend/definitions' },
-    { label: 'Tasks', labelKey: 'workflows.tasks.plural', href: '/backend/tasks' },
+    { label: 'Workflows', labelKey: 'workflows.module.name', href: '/backend/workflows/definitions' },
+    { label: 'Tasks', labelKey: 'workflows.tasks.plural', href: '/backend/workflows/tasks' },
     { label: 'Details', labelKey: 'common.details' },
   ],
 }

package/src/modules/workflows/backend/tasks/[id]/page.tsx

@@ -381,7 +381,7 @@ export default function UserTaskDetailPage({ params }: { params: { id: string }
                 task.status
               )}`}
             >
-              {t(`workflows.tasks.statuses.${task.status}`)}
+              {t(`workflows.tasks.status.${task.status}`)}
             </span>
           </div>
 

package/src/modules/workflows/backend/tasks/page.tsx

@@ -72,6 +72,7 @@ export default function UserTasksListPage() {
       params.set('offset', offset.toString())
 
       if (filterValues.status) params.set('status', filterValues.status as string)
+      if (filterValues.myTasks === 'true') params.set('myTasks', 'true')
       if (filterValues.overdue === 'true') params.set('overdue', 'true')
       if (filterValues.workflowInstanceId) params.set('workflowInstanceId', filterValues.workflowInstanceId as string)
 
@@ -154,10 +155,10 @@ export default function UserTasksListPage() {
       label: t('workflows.tasks.filters.status'),
       options: [
         { label: t('common.all'), value: '' },
-        { label: t('workflows.tasks.statuses.PENDING'), value: 'PENDING' },
-        { label: t('workflows.tasks.statuses.IN_PROGRESS'), value: 'IN_PROGRESS' },
-        { label: t('workflows.tasks.statuses.COMPLETED'), value: 'COMPLETED' },
-        { label: t('workflows.tasks.statuses.CANCELLED'), value: 'CANCELLED' },
+        { label: t('workflows.tasks.status.PENDING'), value: 'PENDING' },
+        { label: t('workflows.tasks.status.IN_PROGRESS'), value: 'IN_PROGRESS' },
+        { label: t('workflows.tasks.status.COMPLETED'), value: 'COMPLETED' },
+        { label: t('workflows.tasks.status.CANCELLED'), value: 'CANCELLED' },
       ],
     },
     {
@@ -213,7 +214,7 @@ export default function UserTasksListPage() {
       accessorKey: 'status',
       cell: ({ row }) => (
         <span className={`inline-flex items-center px-2 py-1 rounded text-xs font-medium ${getStatusBadgeClass(row.original.status)}`}>
-          {t(`workflows.tasks.statuses.${row.original.status}`)}
+          {t(`workflows.tasks.status.${row.original.status}`)}
         </span>
       ),
     },

package/src/modules/workflows/cli.ts

@@ -2,7 +2,6 @@ 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 { WorkflowDefinition } from './data/entities'
-import { BusinessRule, type RuleType } from '@open-mercato/core/modules/business_rules/data/entities'
 import * as fs from 'fs'
 import * as path from 'path'
 import { fileURLToPath } from 'url'
@@ -284,111 +283,6 @@ const seedSimpleApproval: ModuleCli = {
   },
 }
 
-/**
- * Seed order approval example
- */
-const seedOrderApproval: ModuleCli = {
-  command: 'seed-order-approval',
-  async run(rest: string[]) {
-    const args = parseArgs(rest)
-    const tenantId = String(args.tenantId ?? args.tenant ?? args.t ?? '')
-    const organizationId = String(args.organizationId ?? args.orgId ?? args.org ?? args.o ?? '')
-
-    if (!tenantId || !organizationId) {
-      console.error('Usage: mercato workflows seed-order-approval --tenant <tenantId> --org <organizationId>')
-      return
-    }
-
-    try {
-      const { resolve } = await createRequestContainer()
-      const em = resolve<EntityManager>('em')
-
-      // 1. Seed order approval guard rules first
-      const guardRulesPath = path.join(__dirname, 'examples', 'order-approval-guard-rules.json')
-      const guardRulesData = JSON.parse(fs.readFileSync(guardRulesPath, 'utf8')) as Array<{
-        ruleId: string
-        ruleName: string
-        ruleType: RuleType
-        entityType: string
-        description?: string
-        eventType?: string
-        conditionExpression?: Record<string, unknown>
-        enabled?: boolean
-        priority?: number
-      }>
-
-      let rulesSeeded = 0
-      let rulesSkipped = 0
-      for (const rule of guardRulesData) {
-        const existingRule = await em.findOne(BusinessRule, {
-          ruleId: rule.ruleId,
-          tenantId,
-          organizationId,
-        })
-
-        if (existingRule) {
-          rulesSkipped++
-          continue
-        }
-
-        const newRule = em.create(BusinessRule, {
-          ...rule,
-          tenantId,
-          organizationId,
-        })
-        em.persist(newRule)
-        console.log(`  ✓ Seeded guard rule: ${rule.ruleName}`)
-        rulesSeeded++
-      }
-
-      if (rulesSeeded > 0) {
-        await em.flush()
-      }
-
-      // 2. Read the order approval workflow definition
-      const approvalPath = path.join(__dirname, 'examples', 'order-approval-definition.json')
-      const approvalData = JSON.parse(fs.readFileSync(approvalPath, 'utf8'))
-
-      // Check if it already exists
-      const existing = await em.findOne(WorkflowDefinition, {
-        workflowId: approvalData.workflowId,
-        tenantId,
-        organizationId,
-      })
-
-      if (existing) {
-        console.log(`✓ Order approval workflow '${approvalData.workflowId}' already exists (ID: ${existing.id})`)
-        console.log(`  - Guard rules seeded: ${rulesSeeded}`)
-        console.log(`  - Guard rules skipped: ${rulesSkipped}`)
-        return
-      }
-
-      // Create the workflow definition
-      const workflow = em.create(WorkflowDefinition, {
-        ...approvalData,
-        tenantId,
-        organizationId,
-      })
-
-      await em.persistAndFlush(workflow)
-
-      console.log(`✓ Seeded order approval workflow: ${workflow.workflowName}`)
-      console.log(`  - ID: ${workflow.id}`)
-      console.log(`  - Workflow ID: ${workflow.workflowId}`)
-      console.log(`  - Version: ${workflow.version}`)
-      console.log(`  - Steps: ${workflow.definition.steps.length}`)
-      console.log(`  - Transitions: ${workflow.definition.transitions.length}`)
-      console.log(`  - Guard rules seeded: ${rulesSeeded}`)
-      console.log(`  - Guard rules skipped: ${rulesSkipped}`)
-      console.log('')
-      console.log('Order approval workflow is ready!')
-    } catch (error) {
-      console.error('Error seeding order approval workflow:', error)
-      throw error
-    }
-  },
-}
-
 /**
  * Start workflow activity worker
  */
@@ -472,10 +366,6 @@ const seedAll: ModuleCli = {
       await seedSimpleApproval.run(rest)
       console.log('')
 
-      // Seed order approval
-      await seedOrderApproval.run(rest)
-      console.log('')
-
       console.log('✓ All example workflows seeded successfully!')
     } catch (error) {
       console.error('Error seeding workflows:', error)
@@ -554,7 +444,6 @@ const workflowsCliCommands = [
   seedDemoWithRules,
   seedSalesPipeline,
   seedSimpleApproval,
-  seedOrderApproval,
   seedAll,
 ]