@open-mercato/core 0.4.2-canary-51881f6bf3 → 0.4.2-canary-5f415b8a44

package/src/modules/sales/lib/frontend/documentDataEvents.ts

@@ -0,0 +1,28 @@
+"use client"
+
+export const SALES_DOCUMENT_DATA_REFRESH_EVENT = 'sales:document:data:refresh'
+
+export type SalesDocumentDataRefreshDetail = {
+  documentId: string
+  kind?: 'order' | 'quote'
+}
+
+export function emitSalesDocumentDataRefresh(detail: SalesDocumentDataRefreshDetail): void {
+  if (typeof window === 'undefined' || typeof CustomEvent === 'undefined') return
+  window.dispatchEvent(
+    new CustomEvent<SalesDocumentDataRefreshDetail>(SALES_DOCUMENT_DATA_REFRESH_EVENT, { detail }),
+  )
+}
+
+export function subscribeSalesDocumentDataRefresh(
+  handler: (detail: SalesDocumentDataRefreshDetail) => void,
+): () => void {
+  if (typeof window === 'undefined') return () => {}
+  const listener = (event: Event) => {
+    const detail = (event as CustomEvent<SalesDocumentDataRefreshDetail>).detail
+    if (!detail) return
+    handler(detail)
+  }
+  window.addEventListener(SALES_DOCUMENT_DATA_REFRESH_EVENT, listener as EventListener)
+  return () => window.removeEventListener(SALES_DOCUMENT_DATA_REFRESH_EVENT, listener as EventListener)
+}

package/src/modules/workflows/acl.ts

@@ -19,6 +19,8 @@ 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/instances/route.ts

@@ -70,19 +70,33 @@ export async function GET(request: NextRequest) {
     }
 
     if (status) {
-      where.status = 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 }
+      }
     }
 
     if (correlationKey) {
       where.correlationKey = correlationKey
     }
 
-    if (entityType) {
-      where['metadata.entityType'] = entityType
-    }
-
-    if (entityId) {
-      where['metadata.entityId'] = entityId
+    // 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 } }
+        })
+      }
     }
 
     const [instances, total] = await em.findAndCount(

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

@@ -67,7 +67,13 @@ export async function GET(request: NextRequest) {
     }
 
     if (status) {
-      where.status = 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 }
+      }
     }
 
     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/workflows/definitions' },
+    { label: 'Workflows', labelKey: 'workflows.module.name', href: '/backend/definitions' },
     { label: 'Edit', labelKey: 'workflows.common.edit' },
   ],
 }

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

@@ -19,6 +19,7 @@ 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()
@@ -145,6 +146,14 @@ 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/workflows/definitions' },
+    { label: 'Workflows', labelKey: 'workflows.module.name', href: '/backend/definitions' },
     { label: 'Create', labelKey: 'workflows.common.create' },
   ],
 }

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

@@ -16,6 +16,8 @@ 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()
@@ -50,6 +52,13 @@ 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/workflows/definitions' },
+    { label: 'Workflows', labelKey: 'workflows.module.name', href: '/backend/definitions' },
     { label: 'Visual Editor', labelKey: 'workflows.backend.definitions.visual_editor.title' },
   ],
 }

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

@@ -34,6 +34,8 @@ 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";
 
 /**
@@ -76,6 +78,7 @@ 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(() => {
@@ -113,6 +116,9 @@ 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)
@@ -284,8 +290,12 @@ export default function VisualEditorPage() {
       return
     }
 
-    // Generate definition data
-    const definitionData = graphToDefinition(nodes, edges, { includePositions: true })
+    // Generate definition data and include triggers
+    const graphDefinition = graphToDefinition(nodes, edges, { includePositions: true })
+    const definitionData = {
+      ...graphDefinition,
+      triggers: triggers.length > 0 ? triggers : undefined,
+    }
 
     // Run Zod schema validation before saving
     const schemaResult = workflowDefinitionDataSchema.safeParse(definitionData)
@@ -357,7 +367,7 @@ export default function VisualEditorPage() {
     } finally {
       setIsSaving(false)
     }
-  }, [nodes, edges, workflowId, workflowName, description, version, enabled, category, tags, definitionId, router])
+  }, [nodes, edges, workflowId, workflowName, description, version, enabled, category, tags, triggers, definitionId, router])
 
   // Test workflow
   const handleTest = useCallback(() => {
@@ -475,6 +485,7 @@ export default function VisualEditorPage() {
     setIcon('')
     setEffectiveFrom('')
     setEffectiveTo('')
+    setTriggers([])
     setShowClearConfirm(false)
     flash('Canvas cleared', 'success')
   }, [])
@@ -709,6 +720,13 @@ 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/workflows/definitions' },
-    { label: 'Events', labelKey: 'workflows.events.plural', href: '/backend/workflows/events' },
+    { label: 'Workflows', labelKey: 'workflows.module.name', href: '/backend/definitions' },
+    { label: 'Events', labelKey: 'workflows.events.plural', href: '/backend/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/workflows/instances/${event.workflowInstance.id}`}
+                      href={`/backend/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/workflows/definitions' },
-    { label: 'Instances', labelKey: 'workflows.instances.plural', href: '/backend/workflows/instances' },
+    { label: 'Workflows', labelKey: 'workflows.module.name', href: '/backend/definitions' },
+    { label: 'Instances', labelKey: 'workflows.instances.plural', href: '/backend/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/workflows/definitions' },
-    { label: 'Tasks', labelKey: 'workflows.tasks.plural', href: '/backend/workflows/tasks' },
+    { label: 'Workflows', labelKey: 'workflows.module.name', href: '/backend/definitions' },
+    { label: 'Tasks', labelKey: 'workflows.tasks.plural', href: '/backend/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.status.${task.status}`)}
+              {t(`workflows.tasks.statuses.${task.status}`)}
             </span>
           </div>
 

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

@@ -72,7 +72,6 @@ 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)
 
@@ -155,10 +154,10 @@ export default function UserTasksListPage() {
       label: t('workflows.tasks.filters.status'),
       options: [
         { label: t('common.all'), value: '' },
-        { 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' },
+        { 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' },
       ],
     },
     {
@@ -214,7 +213,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.status.${row.original.status}`)}
+          {t(`workflows.tasks.statuses.${row.original.status}`)}
         </span>
       ),
     },

package/src/modules/workflows/cli.ts

@@ -2,6 +2,7 @@ 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'
@@ -283,6 +284,111 @@ 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
  */
@@ -366,6 +472,10 @@ 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)
@@ -444,6 +554,7 @@ const workflowsCliCommands = [
   seedDemoWithRules,
   seedSalesPipeline,
   seedSimpleApproval,
+  seedOrderApproval,
   seedAll,
 ]