@open-mercato/core 0.4.2-canary-c71ef83148 → 0.4.2-canary-f821f89ef6

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>
       ),
     },
@@ -273,9 +272,8 @@ export default function UserTasksListPage() {
       id: 'actions',
       header: '',
       cell: ({ row }) => {
-        const items: Array<{ id: string; label: string; href?: string; onSelect?: () => void }> = [
+        const items: Array<{label: string; href?: string; onSelect?: () => void}> = [
           {
-            id: 'view',
             label: t('workflows.tasks.actions.viewDetails'),
             href: `/backend/tasks/${row.original.id}`,
           },
@@ -289,7 +287,6 @@ export default function UserTasksListPage() {
           row.original.assignedToRoles.length > 0
         ) {
           items.push({
-            id: 'claim',
             label: t('workflows.tasks.actions.claim'),
             onSelect: () => handleClaim(row.original.id, row.original.taskName),
           })
@@ -298,7 +295,6 @@ export default function UserTasksListPage() {
         // Allow completing if task is in progress or pending
         if (row.original.status === 'PENDING' || row.original.status === 'IN_PROGRESS') {
           items.push({
-            id: 'complete',
             label: t('workflows.tasks.actions.complete'),
             href: `/backend/tasks/${row.original.id}`,
           })

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'
@@ -56,7 +57,7 @@ const seedDemo: ModuleCli = {
       })
 
       if (existing) {
-        console.log(`ℹ️  Demo workflow '${demoData.workflowId}' already exists (ID: ${existing.id})`)
+        console.log(`✓ Demo workflow '${demoData.workflowId}' already exists (ID: ${existing.id})`)
         return
       }
 
@@ -69,7 +70,7 @@ const seedDemo: ModuleCli = {
 
       await em.persistAndFlush(workflow)
 
-      console.log(`✅ Seeded demo workflow: ${workflow.workflowName}`)
+      console.log(`✓ Seeded demo workflow: ${workflow.workflowName}`)
       console.log(`  - ID: ${workflow.id}`)
       console.log(`  - Workflow ID: ${workflow.workflowId}`)
       console.log(`  - Version: ${workflow.version}`)
@@ -107,15 +108,15 @@ const seedDemoWithRules: ModuleCli = {
       return
     }
 
-      console.log('🧩 Seeding demo workflow with guard rules...\n')
+    console.log('Seeding demo workflow with guard rules...\n')
 
     try {
       // Seed the workflow definition
-      console.log('1. 🧩 Seeding demo workflow...')
+      console.log('1. Seeding demo workflow...')
       await seedDemo.run(rest)
 
       // Seed the guard rules
-      console.log('\n2. 🧠 Seeding guard rules...')
+      console.log('\n2. Seeding guard rules...')
       const { resolve } = await createRequestContainer()
       const em = resolve<EntityManager>('em')
 
@@ -153,7 +154,7 @@ const seedDemoWithRules: ModuleCli = {
         seededCount++
       }
 
-      console.log(`\n✅ Demo workflow with guard rules seeded successfully!`)
+      console.log(`\n✓ Demo workflow with guard rules seeded successfully!`)
       console.log(`  - Workflow: checkout_simple_v1`)
       console.log(`  - Guard rules seeded: ${seededCount}`)
       console.log(`  - Guard rules skipped: ${skippedCount}`)
@@ -195,7 +196,7 @@ const seedSalesPipeline: ModuleCli = {
       })
 
       if (existing) {
-        console.log(`ℹ️  Sales pipeline workflow '${pipelineData.workflowId}' already exists (ID: ${existing.id})`)
+        console.log(`✓ Sales pipeline workflow '${pipelineData.workflowId}' already exists (ID: ${existing.id})`)
         return
       }
 
@@ -208,7 +209,7 @@ const seedSalesPipeline: ModuleCli = {
 
       await em.persistAndFlush(workflow)
 
-      console.log(`✅ Seeded sales pipeline workflow: ${workflow.workflowName}`)
+      console.log(`✓ Seeded sales pipeline workflow: ${workflow.workflowName}`)
       console.log(`  - ID: ${workflow.id}`)
       console.log(`  - Workflow ID: ${workflow.workflowId}`)
       console.log(`  - Version: ${workflow.version}`)
@@ -255,7 +256,7 @@ const seedSimpleApproval: ModuleCli = {
       })
 
       if (existing) {
-        console.log(`ℹ️  Simple approval workflow '${approvalData.workflowId}' already exists (ID: ${existing.id})`)
+        console.log(`✓ Simple approval workflow '${approvalData.workflowId}' already exists (ID: ${existing.id})`)
         return
       }
 
@@ -268,7 +269,7 @@ const seedSimpleApproval: ModuleCli = {
 
       await em.persistAndFlush(workflow)
 
-      console.log(`✅ Seeded simple approval workflow: ${workflow.workflowName}`)
+      console.log(`✓ Seeded simple approval workflow: ${workflow.workflowName}`)
       console.log(`  - ID: ${workflow.id}`)
       console.log(`  - Workflow ID: ${workflow.workflowId}`)
       console.log(`  - Version: ${workflow.version}`)
@@ -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
  */
@@ -351,7 +457,7 @@ const seedAll: ModuleCli = {
       return
     }
 
-    console.log('🧩 Seeding all example workflows...\n')
+    console.log('Seeding all example workflows...\n')
 
     try {
       // Seed demo checkout with rules
@@ -366,7 +472,11 @@ const seedAll: ModuleCli = {
       await seedSimpleApproval.run(rest)
       console.log('')
 
-      console.log('✅ All example workflows seeded successfully!')
+      // Seed order approval
+      await seedOrderApproval.run(rest)
+      console.log('')
+
+      console.log('✓ All example workflows seeded successfully!')
     } catch (error) {
       console.error('Error seeding workflows:', error)
       throw error
@@ -444,6 +554,7 @@ const workflowsCliCommands = [
   seedDemoWithRules,
   seedSalesPipeline,
   seedSimpleApproval,
+  seedOrderApproval,
   seedAll,
 ]