@open-mercato/core 0.4.2-canary-5d2c419a9b → 0.4.2-canary-9e0237de8e

package/src/modules/customers/events.ts

@@ -0,0 +1,63 @@
+import { createModuleEvents } from '@open-mercato/shared/modules/events'
+
+/**
+ * Customers Module Events
+ *
+ * Declares all events that can be emitted by the customers module.
+ */
+const events = [
+  // People
+  { id: 'customers.people.created', label: 'Customer (Person) Created', entity: 'people', category: 'crud' },
+  { id: 'customers.people.updated', label: 'Customer (Person) Updated', entity: 'people', category: 'crud' },
+  { id: 'customers.people.deleted', label: 'Customer (Person) Deleted', entity: 'people', category: 'crud' },
+
+  // Companies
+  { id: 'customers.companies.created', label: 'Customer (Company) Created', entity: 'companies', category: 'crud' },
+  { id: 'customers.companies.updated', label: 'Customer (Company) Updated', entity: 'companies', category: 'crud' },
+  { id: 'customers.companies.deleted', label: 'Customer (Company) Deleted', entity: 'companies', category: 'crud' },
+
+  // Deals
+  { id: 'customers.deals.created', label: 'Deal Created', entity: 'deals', category: 'crud' },
+  { id: 'customers.deals.updated', label: 'Deal Updated', entity: 'deals', category: 'crud' },
+  { id: 'customers.deals.deleted', label: 'Deal Deleted', entity: 'deals', category: 'crud' },
+
+  // Comments
+  { id: 'customers.comments.created', label: 'Comment Created', entity: 'comments', category: 'crud' },
+  { id: 'customers.comments.updated', label: 'Comment Updated', entity: 'comments', category: 'crud' },
+  { id: 'customers.comments.deleted', label: 'Comment Deleted', entity: 'comments', category: 'crud' },
+
+  // Addresses
+  { id: 'customers.addresses.created', label: 'Address Created', entity: 'addresses', category: 'crud' },
+  { id: 'customers.addresses.updated', label: 'Address Updated', entity: 'addresses', category: 'crud' },
+  { id: 'customers.addresses.deleted', label: 'Address Deleted', entity: 'addresses', category: 'crud' },
+
+  // Activities
+  { id: 'customers.activities.created', label: 'Activity Created', entity: 'activities', category: 'crud' },
+  { id: 'customers.activities.updated', label: 'Activity Updated', entity: 'activities', category: 'crud' },
+  { id: 'customers.activities.deleted', label: 'Activity Deleted', entity: 'activities', category: 'crud' },
+
+  // Tags
+  { id: 'customers.tags.created', label: 'Tag Created', entity: 'tags', category: 'crud' },
+  { id: 'customers.tags.updated', label: 'Tag Updated', entity: 'tags', category: 'crud' },
+  { id: 'customers.tags.deleted', label: 'Tag Deleted', entity: 'tags', category: 'crud' },
+  { id: 'customers.tags.assigned', label: 'Tag Assigned', entity: 'tags', category: 'crud' },
+  { id: 'customers.tags.removed', label: 'Tag Removed', entity: 'tags', category: 'crud' },
+
+  // Todos
+  { id: 'customers.todos.created', label: 'Todo Created', entity: 'todos', category: 'crud' },
+  { id: 'customers.todos.updated', label: 'Todo Updated', entity: 'todos', category: 'crud' },
+  { id: 'customers.todos.deleted', label: 'Todo Deleted', entity: 'todos', category: 'crud' },
+] as const
+
+export const eventsConfig = createModuleEvents({
+  moduleId: 'customers',
+  events,
+})
+
+/** Type-safe event emitter for customers module */
+export const emitCustomersEvent = eventsConfig.emit
+
+/** Event IDs that can be emitted by the customers module */
+export type CustomersEventId = typeof events[number]['id']
+
+export default eventsConfig

package/src/modules/directory/events.ts

@@ -0,0 +1,31 @@
+import { createModuleEvents } from '@open-mercato/shared/modules/events'
+
+/**
+ * Directory Module Events
+ *
+ * Declares all events that can be emitted by the directory module.
+ */
+const events = [
+  // Tenants
+  { id: 'directory.tenants.created', label: 'Tenant Created', entity: 'tenants', category: 'crud' },
+  { id: 'directory.tenants.updated', label: 'Tenant Updated', entity: 'tenants', category: 'crud' },
+  { id: 'directory.tenants.deleted', label: 'Tenant Deleted', entity: 'tenants', category: 'crud' },
+
+  // Organizations
+  { id: 'directory.organizations.created', label: 'Organization Created', entity: 'organizations', category: 'crud' },
+  { id: 'directory.organizations.updated', label: 'Organization Updated', entity: 'organizations', category: 'crud' },
+  { id: 'directory.organizations.deleted', label: 'Organization Deleted', entity: 'organizations', category: 'crud' },
+] as const
+
+export const eventsConfig = createModuleEvents({
+  moduleId: 'directory',
+  events,
+})
+
+/** Type-safe event emitter for directory module */
+export const emitDirectoryEvent = eventsConfig.emit
+
+/** Event IDs that can be emitted by the directory module */
+export type DirectoryEventId = typeof events[number]['id']
+
+export default eventsConfig

package/src/modules/sales/acl.ts

@@ -1,6 +1,7 @@
 export const features = [
   { id: 'sales.orders.view', title: 'View sales orders', module: 'sales' },
   { id: 'sales.orders.manage', title: 'Manage sales orders', module: 'sales' },
+  { id: 'sales.orders.approve', title: 'Approve sales orders', module: 'sales' },
   { id: 'sales.quotes.view', title: 'View sales quotes', module: 'sales' },
   { id: 'sales.quotes.manage', title: 'Manage sales quotes', module: 'sales' },
   { id: 'sales.shipments.manage', title: 'Manage order shipments', module: 'sales' },

package/src/modules/sales/backend/sales/documents/[id]/page.tsx

@@ -50,6 +50,9 @@ import {
   emitSalesDocumentTotalsRefresh,
   subscribeSalesDocumentTotalsRefresh,
 } from '@open-mercato/core/modules/sales/lib/frontend/documentTotalsEvents'
+import {
+  subscribeSalesDocumentDataRefresh,
+} from '@open-mercato/core/modules/sales/lib/frontend/documentDataEvents'
 import type { CommentSummary, SectionAction } from '@open-mercato/ui/backend/detail'
 import { ICON_SUGGESTIONS } from '@open-mercato/core/modules/customers/lib/dictionaries'
 import { readMarkdownPreferenceCookie, writeMarkdownPreferenceCookie } from '@open-mercato/core/modules/customers/lib/markdownPreference'
@@ -2601,6 +2604,19 @@ export default function SalesDocumentDetailPage({
     [kind, record?.id, refreshDocumentTotals],
   )
 
+  // Subscribe to document data refresh events (e.g., from workflow status updates)
+  React.useEffect(
+    () =>
+      subscribeSalesDocumentDataRefresh((detail) => {
+        if (!record?.id) return
+        if (detail.documentId !== record.id) return
+        if (detail.kind && detail.kind !== kind) return
+        // Increment reloadKey to trigger a full document reload
+        setReloadKey((prev) => prev + 1)
+      }),
+    [kind, record?.id],
+  )
+
   const statusDictionaryMap = React.useMemo(
     () =>
       createDictionaryMap(

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 } from '@open-mercato/shared/lib/commands/helpers'
+import { emitCrudSideEffects, requireId, type CrudEventsConfig } 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'
@@ -92,6 +92,29 @@ import { SalesDocumentNumberGenerator } from '../services/salesDocumentNumberGen
 import { loadSalesSettings } from './settings'
 import { notificationTypes } from '../notifications'
 
+// 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
@@ -3145,6 +3168,32 @@ const createQuoteCommand: CommandHandler<QuoteCreateInput, { quoteId: string }>
       console.error('[sales.quotes.create] Failed to create notification:', err)
     }
 
+    // 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) => {
@@ -3847,6 +3896,31 @@ const createOrderCommand: CommandHandler<OrderCreateInput, { orderId: string }>
       console.error('[sales.orders.create] Failed to create notification:', err)
     }
 
+    // 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/events.ts

@@ -0,0 +1,82 @@
+import { createModuleEvents } from '@open-mercato/shared/modules/events'
+
+/**
+ * Sales Module Events
+ *
+ * Declares all events that can be emitted by the sales module.
+ */
+const events = [
+  // Orders
+  { id: 'sales.orders.created', label: 'Sales Order Created', entity: 'orders', category: 'crud' },
+  { id: 'sales.orders.updated', label: 'Sales Order Updated', entity: 'orders', category: 'crud' },
+  { id: 'sales.orders.deleted', label: 'Sales Order Deleted', entity: 'orders', category: 'crud' },
+
+  // Quotes
+  { id: 'sales.quotes.created', label: 'Quote Created', entity: 'quotes', category: 'crud' },
+  { id: 'sales.quotes.updated', label: 'Quote Updated', entity: 'quotes', category: 'crud' },
+  { id: 'sales.quotes.deleted', label: 'Quote Deleted', entity: 'quotes', category: 'crud' },
+
+  // Invoices
+  { id: 'sales.invoices.created', label: 'Invoice Created', entity: 'invoices', category: 'crud' },
+  { id: 'sales.invoices.updated', label: 'Invoice Updated', entity: 'invoices', category: 'crud' },
+  { id: 'sales.invoices.deleted', label: 'Invoice Deleted', entity: 'invoices', category: 'crud' },
+
+  // Order Lines
+  { id: 'sales.lines.created', label: 'Order Line Created', entity: 'lines', category: 'crud' },
+  { id: 'sales.lines.updated', label: 'Order Line Updated', entity: 'lines', category: 'crud' },
+  { id: 'sales.lines.deleted', label: 'Order Line Deleted', entity: 'lines', category: 'crud' },
+
+  // Payments
+  { id: 'sales.payments.created', label: 'Payment Created', entity: 'payments', category: 'crud' },
+  { id: 'sales.payments.updated', label: 'Payment Updated', entity: 'payments', category: 'crud' },
+  { id: 'sales.payments.deleted', label: 'Payment Deleted', entity: 'payments', category: 'crud' },
+
+  // Shipments
+  { id: 'sales.shipments.created', label: 'Shipment Created', entity: 'shipments', category: 'crud' },
+  { id: 'sales.shipments.updated', label: 'Shipment Updated', entity: 'shipments', category: 'crud' },
+  { id: 'sales.shipments.deleted', label: 'Shipment Deleted', entity: 'shipments', category: 'crud' },
+
+  // Notes
+  { id: 'sales.notes.created', label: 'Note Created', entity: 'notes', category: 'crud' },
+  { id: 'sales.notes.updated', label: 'Note Updated', entity: 'notes', category: 'crud' },
+  { id: 'sales.notes.deleted', label: 'Note Deleted', entity: 'notes', category: 'crud' },
+
+  // Configuration
+  { id: 'sales.configuration.created', label: 'Configuration Created', entity: 'configuration', category: 'crud' },
+  { id: 'sales.configuration.updated', label: 'Configuration Updated', entity: 'configuration', category: 'crud' },
+  { id: 'sales.configuration.deleted', label: 'Configuration Deleted', entity: 'configuration', category: 'crud' },
+
+  // Lifecycle events - Document calculations
+  { id: 'sales.document.totals.calculated', label: 'Document Totals Calculated', category: 'lifecycle' },
+  { id: 'sales.document.calculate.before', label: 'Before Document Calculate', category: 'lifecycle', excludeFromTriggers: true },
+  { id: 'sales.document.calculate.after', label: 'After Document Calculate', category: 'lifecycle', excludeFromTriggers: true },
+
+  // Lifecycle events - Line calculations
+  { id: 'sales.line.calculate.before', label: 'Before Line Calculate', category: 'lifecycle', excludeFromTriggers: true },
+  { id: 'sales.line.calculate.after', label: 'After Line Calculate', category: 'lifecycle', excludeFromTriggers: true },
+
+  // Lifecycle events - Tax calculations
+  { id: 'sales.tax.calculate.before', label: 'Before Tax Calculate', category: 'lifecycle', excludeFromTriggers: true },
+  { id: 'sales.tax.calculate.after', label: 'After Tax Calculate', category: 'lifecycle', excludeFromTriggers: true },
+
+  // Lifecycle events - Shipping adjustments
+  { id: 'sales.shipping.adjustments.apply.before', label: 'Before Shipping Adjustments', category: 'lifecycle', excludeFromTriggers: true },
+  { id: 'sales.shipping.adjustments.apply.after', label: 'After Shipping Adjustments', category: 'lifecycle', excludeFromTriggers: true },
+
+  // Lifecycle events - Payment adjustments
+  { id: 'sales.payment.adjustments.apply.before', label: 'Before Payment Adjustments', category: 'lifecycle', excludeFromTriggers: true },
+  { id: 'sales.payment.adjustments.apply.after', label: 'After Payment Adjustments', category: 'lifecycle', excludeFromTriggers: true },
+] as const
+
+export const eventsConfig = createModuleEvents({
+  moduleId: 'sales',
+  events,
+})
+
+/** Type-safe event emitter for sales module */
+export const emitSalesEvent = eventsConfig.emit
+
+/** Event IDs that can be emitted by the sales module */
+export type SalesEventId = typeof events[number]['id']
+
+export default eventsConfig

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

@@ -125,6 +125,9 @@ 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/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/__tests__/instances.route.test.ts

@@ -194,11 +194,14 @@ 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({
-          'metadata.entityType': 'order',
-          'metadata.entityId': 'order-123',
+          $and: expect.arrayContaining([
+            { metadata: { $contains: { entityType: 'order' } } },
+            { metadata: { $contains: { entityId: 'order-123' } } },
+          ]),
         }),
         expect.any(Object)
       )

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' },
   ],
 }