@open-mercato/core 0.4.2-canary-f821f89ef6 → 0.4.2-canary-3b5064ce72

package/src/modules/sales/widgets/notifications/SalesQuoteCreatedRenderer.tsx

@@ -0,0 +1,156 @@
+'use client'
+
+import * as React from 'react'
+import { FileText, ExternalLink, DollarSign, User, Calendar } from 'lucide-react'
+import { useRouter } from 'next/navigation'
+import { Button } from '@open-mercato/ui/primitives/button'
+import { cn } from '@open-mercato/shared/lib/utils'
+import { useT } from '@open-mercato/shared/lib/i18n/context'
+import type { NotificationRendererProps } from '@open-mercato/shared/modules/notifications/types'
+import { formatMoney } from '../../components/documents/lineItemUtils'
+import { useSalesDocumentTotals } from './useSalesDocumentTotals'
+
+function formatTimeAgo(dateString: string, t: (key: string, fallback?: string) => string): string {
+  const date = new Date(dateString)
+  const now = new Date()
+  const diffMs = now.getTime() - date.getTime()
+  const diffMins = Math.floor(diffMs / 60000)
+  const diffHours = Math.floor(diffMs / 3600000)
+  const diffDays = Math.floor(diffMs / 86400000)
+
+  if (diffMins < 1) return t('common.time.justNow', 'just now')
+  if (diffMins < 60) return t('common.time.minutesAgo', '{count}m ago').replace('{count}', String(diffMins))
+  if (diffHours < 24) return t('common.time.hoursAgo', '{count}h ago').replace('{count}', String(diffHours))
+  if (diffDays < 7) return t('common.time.daysAgo', '{count}d ago').replace('{count}', String(diffDays))
+  return date.toLocaleDateString()
+}
+
+function normalizeTotal(value?: string | null): string | null {
+  if (!value) return null
+  let trimmed = value.trim()
+  if (trimmed.startsWith('(') && trimmed.endsWith(')')) {
+    trimmed = trimmed.slice(1, -1).trim()
+  }
+  return trimmed.length ? trimmed : null
+}
+
+export function SalesQuoteCreatedRenderer({
+  notification,
+  onAction,
+  onDismiss,
+  actions = [],
+}: NotificationRendererProps) {
+  const t = useT()
+  const router = useRouter()
+  const [executing, setExecuting] = React.useState(false)
+  const isUnread = notification.status === 'unread'
+  const quoteNumber = notification.bodyVariables?.quoteNumber ?? notification.titleVariables?.quoteNumber
+  const fallbackTotal =
+    normalizeTotal(notification.bodyVariables?.totalAmount ?? null) ??
+    normalizeTotal(notification.bodyVariables?.total ?? null)
+  const { totals } = useSalesDocumentTotals('quote', notification.sourceEntityId)
+
+  const currentTotal =
+    totals && typeof totals.grandTotalGrossAmount === 'number'
+      ? formatMoney(totals.grandTotalGrossAmount, totals.currencyCode)
+      : fallbackTotal
+
+  const viewAction = actions.find((action) => action.id === 'view') ?? actions[0] ?? null
+
+  const handleView = async () => {
+    if (!viewAction) {
+      if (notification.linkHref) router.push(notification.linkHref)
+      return
+    }
+    setExecuting(true)
+    try {
+      await onAction(viewAction.id)
+    } finally {
+      setExecuting(false)
+    }
+  }
+
+  return (
+    <div
+      className={cn(
+        'group relative px-4 py-3 hover:bg-muted/50 cursor-pointer transition-colors border-l-4 border-l-amber-500',
+        isUnread && 'bg-amber-50/50 dark:bg-amber-950/20'
+      )}
+      onClick={handleView}
+    >
+      {isUnread && (
+        <div className="absolute left-1.5 top-1/2 -translate-y-1/2 h-2 w-2 rounded-full bg-primary" />
+      )}
+
+      <div className="flex gap-3">
+        <div className="flex-shrink-0 mt-0.5">
+          <div className="h-10 w-10 rounded-lg bg-amber-100 dark:bg-amber-900/40 flex items-center justify-center">
+            <FileText className="h-5 w-5 text-amber-600 dark:text-amber-400" />
+          </div>
+        </div>
+
+        <div className="flex-1 min-w-0">
+          <div className="flex items-start justify-between gap-2">
+            <div>
+              <h4 className={cn('text-sm font-medium', isUnread && 'font-semibold')}>
+                {notification.title}
+              </h4>
+              {quoteNumber && (
+                <div className="flex items-center gap-1 mt-0.5">
+                  <span className="text-xs font-mono text-muted-foreground bg-muted px-1.5 py-0.5 rounded">
+                    #{quoteNumber}
+                  </span>
+                </div>
+              )}
+            </div>
+            <span className="flex-shrink-0 text-xs text-muted-foreground flex items-center gap-1">
+              <Calendar className="h-3 w-3" />
+              {formatTimeAgo(notification.createdAt, t)}
+            </span>
+          </div>
+
+          <div className="mt-2 flex items-center gap-4 text-xs text-muted-foreground">
+            {currentTotal && (
+              <div className="flex items-center gap-1">
+                <DollarSign className="h-3 w-3" />
+                <span className="font-medium text-foreground">{currentTotal}</span>
+              </div>
+            )}
+            <div className="flex items-center gap-1">
+              <User className="h-3 w-3" />
+              <span>{t('sales.notifications.renderer.pendingReview', 'Pending review')}</span>
+            </div>
+          </div>
+
+          <div className="mt-3 flex gap-2">
+            <Button
+              variant="default"
+              size="sm"
+              onClick={(e) => {
+                e.stopPropagation()
+                handleView()
+              }}
+              disabled={executing || (!viewAction && !notification.linkHref)}
+              className="gap-1"
+            >
+              <ExternalLink className="h-3 w-3" />
+              {t('sales.notifications.renderer.viewQuote', 'View Quote')}
+            </Button>
+            <Button
+              variant="ghost"
+              size="sm"
+              onClick={(e) => {
+                e.stopPropagation()
+                onDismiss()
+              }}
+            >
+              {t('notifications.actions.dismiss', 'Dismiss')}
+            </Button>
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+export default SalesQuoteCreatedRenderer

package/src/modules/sales/widgets/notifications/index.ts

@@ -0,0 +1,2 @@
+export { SalesOrderCreatedRenderer } from './SalesOrderCreatedRenderer'
+export { SalesQuoteCreatedRenderer } from './SalesQuoteCreatedRenderer'

package/src/modules/sales/widgets/notifications/useSalesDocumentTotals.ts

@@ -0,0 +1,81 @@
+'use client'
+
+import * as React from 'react'
+import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+
+type DocumentKind = 'order' | 'quote'
+
+type DocumentTotals = {
+  grandTotalGrossAmount: number | null
+  currencyCode: string | null
+}
+
+type DocumentListResponse = {
+  items?: Array<{
+    grandTotalGrossAmount?: number | string | null
+    currencyCode?: string | null
+  }>
+}
+
+const REFRESH_INTERVAL_MS = 30000
+
+function buildDocumentTotalsUrl(kind: DocumentKind, documentId: string) {
+  const params = new URLSearchParams({ id: documentId, page: '1', pageSize: '1' })
+  const collection = kind === 'order' ? 'orders' : 'quotes'
+  return `/api/sales/${collection}?${params.toString()}`
+}
+
+function extractTotals(payload: DocumentListResponse | null): DocumentTotals | null {
+  const item = payload?.items?.[0]
+  if (!item) return null
+  const rawAmount = item.grandTotalGrossAmount
+  let grandTotalGrossAmount: number | null = null
+  if (typeof rawAmount === 'number') {
+    grandTotalGrossAmount = Number.isNaN(rawAmount) ? null : rawAmount
+  } else if (typeof rawAmount === 'string' && rawAmount.trim().length) {
+    const parsed = Number(rawAmount)
+    grandTotalGrossAmount = Number.isNaN(parsed) ? null : parsed
+  }
+  return {
+    grandTotalGrossAmount,
+    currencyCode: typeof item.currencyCode === 'string' ? item.currencyCode : null,
+  }
+}
+
+export function useSalesDocumentTotals(kind: DocumentKind, documentId?: string | null) {
+  const [totals, setTotals] = React.useState<DocumentTotals | null>(null)
+
+  React.useEffect(() => {
+    if (!documentId) {
+      setTotals(null)
+      return
+    }
+
+    let active = true
+
+    const loadTotals = async () => {
+      try {
+        const call = await apiCall<DocumentListResponse>(buildDocumentTotalsUrl(kind, documentId))
+        if (!active) return
+        if (call.ok) {
+          const nextTotals = extractTotals(call.result ?? null)
+          setTotals(nextTotals)
+        }
+      } catch {
+        if (active) {
+          setTotals(null)
+        }
+      }
+    }
+
+    loadTotals()
+    const interval = setInterval(loadTotals, REFRESH_INTERVAL_MS)
+
+    return () => {
+      active = false
+      clearInterval(interval)
+    }
+  }, [kind, documentId])
+
+  return { totals }
+}

package/src/modules/staff/backend/staff/team-members/page.tsx

@@ -434,7 +434,7 @@ export default function StaffTeamMembersPage() {
             <RowActions
               items={[
                 { id: 'edit', label: labels.actions.edit, onSelect: () => { router.push(`/backend/staff/team-members/${row.id}`) } },
-                { label: labels.actions.delete, destructive: true, onSelect: () => { void handleDelete(row) } },
+                { id: 'delete', label: labels.actions.delete, destructive: true, onSelect: () => { void handleDelete(row) } },
               ]}
             />
           ) : null}

package/src/modules/staff/backend/staff/team-roles/page.tsx

@@ -345,8 +345,8 @@ export default function StaffTeamRolesPage() {
           rowActions={(row) => row.kind === 'role' ? (
             <RowActions
               items={[
-                { label: labels.actions.edit, onSelect: () => { router.push(`/backend/staff/team-roles/${row.id}/edit`) } },
-                { label: labels.actions.delete, destructive: true, onSelect: () => { void handleDelete(row) } },
+                { id: 'edit', label: labels.actions.edit, onSelect: () => { router.push(`/backend/staff/team-roles/${row.id}/edit`) } },
+                { id: 'delete', label: labels.actions.delete, destructive: true, onSelect: () => { void handleDelete(row) } },
               ]}
             />
           ) : null}

package/src/modules/staff/backend/staff/teams/[id]/edit/page.tsx

@@ -369,8 +369,8 @@ export default function StaffTeamEditPage({ params }: { params?: { id?: string }
               rowActions={(row) => (
                 <RowActions
                   items={[
-                    { label: memberLabels.actions.edit, onSelect: () => { router.push(`/backend/staff/team-members/${row.id}`) } },
-                    { label: memberLabels.actions.unassign, onSelect: () => { void handleUnassignMember(row) } },
+                    { id: 'edit', label: memberLabels.actions.edit, onSelect: () => { router.push(`/backend/staff/team-members/${row.id}`) } },
+                    { id: 'unassign', label: memberLabels.actions.unassign, onSelect: () => { void handleUnassignMember(row) } },
                   ]}
                 />
               )}

package/src/modules/staff/backend/staff/teams/page.tsx

@@ -275,10 +275,10 @@ export default function StaffTeamsPage() {
           rowActions={(row) => (
             <RowActions
               items={[
-                { label: labels.actions.edit, href: `/backend/staff/teams/${row.id}/edit` },
+                { id: 'edit', label: labels.actions.edit, href: `/backend/staff/teams/${row.id}/edit` },
                 ...(row.memberCount > 0
                   ? []
-                  : [{ label: labels.actions.delete, destructive: true, onSelect: () => { void handleDelete(row) } }]),
+                  : [{ id: 'delete', label: labels.actions.delete, destructive: true, onSelect: () => { void handleDelete(row) } }]),
               ]}
             />
           )}

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

@@ -21,6 +21,9 @@ import {
 } from '../data/validators'
 import { ensureOrganizationScope, ensureTenantScope, extractUndoPayload, requireTeamMember } from './shared'
 import { E } from '#generated/entities.ids.generated'
+import { resolveNotificationService } from '../../notifications/lib/notificationService'
+import { buildFeatureNotificationFromType, buildNotificationFromType } from '../../notifications/lib/notificationBuilder'
+import { notificationTypes } from '../notifications'
 
 const leaveRequestCrudIndexer: CrudIndexerConfig<StaffLeaveRequest> = {
   entityType: E.staff.staff_leave_request,
@@ -258,6 +261,36 @@ const createLeaveRequestCommand: CommandHandler<StaffLeaveRequestCreateInput, {
       indexer: leaveRequestCrudIndexer,
     })
 
+    // Create notification for users who can approve/reject leave requests
+    try {
+      const notificationService = resolveNotificationService(ctx.container)
+      const typeDef = notificationTypes.find((type) => type.type === 'staff.leave_request.pending')
+      if (typeDef) {
+        const memberName = member.displayName || 'Team member'
+        const startDateStr = request.startDate.toLocaleDateString()
+        const endDateStr = request.endDate.toLocaleDateString()
+
+        const notificationInput = buildFeatureNotificationFromType(typeDef, {
+          requiredFeature: 'staff.leave_requests.manage',
+          bodyVariables: {
+            memberName,
+            startDate: startDateStr,
+            endDate: endDateStr,
+          },
+          sourceEntityType: 'staff:leave_request',
+          sourceEntityId: request.id,
+          linkHref: `/backend/staff/leave-requests/${request.id}`,
+        })
+
+        await notificationService.createForFeature(notificationInput, {
+          tenantId: request.tenantId,
+          organizationId: request.organizationId,
+        })
+      }
+    } catch {
+      // Notification creation is non-critical, don't fail the command
+    }
+
     return { requestId: request.id }
   },
   captureAfter: async (_input, result, ctx) => {
@@ -575,6 +608,36 @@ const acceptLeaveRequestCommand: CommandHandler<StaffLeaveRequestDecisionInput,
       ruleIds: createdRuleIds,
     })
 
+    // Send notification to the requester
+    if (request.submittedByUserId) {
+      try {
+        const notificationService = resolveNotificationService(ctx.container)
+        const typeDef = notificationTypes.find((type) => type.type === 'staff.leave_request.approved')
+        if (typeDef) {
+          const startDateStr = request.startDate.toLocaleDateString()
+          const endDateStr = request.endDate.toLocaleDateString()
+
+          const notificationInput = buildNotificationFromType(typeDef, {
+            recipientUserId: request.submittedByUserId,
+            bodyVariables: {
+              startDate: startDateStr,
+              endDate: endDateStr,
+            },
+            sourceEntityType: 'staff:leave_request',
+            sourceEntityId: request.id,
+            linkHref: `/backend/staff/leave-requests/${request.id}`,
+          })
+
+          await notificationService.create(notificationInput, {
+            tenantId: request.tenantId,
+            organizationId: request.organizationId,
+          })
+        }
+      } catch {
+        // Notification creation is non-critical, don't fail the command
+      }
+    }
+
     return { requestId: request.id, ruleIds: createdRuleIds }
   },
   buildLog: async ({ result, ctx, snapshots }) => {
@@ -696,6 +759,37 @@ const rejectLeaveRequestCommand: CommandHandler<StaffLeaveRequestDecisionInput,
       indexer: leaveRequestCrudIndexer,
     })
 
+    // Send notification to the requester
+    if (request.submittedByUserId) {
+      try {
+        const notificationService = resolveNotificationService(ctx.container)
+        const typeDef = notificationTypes.find((type) => type.type === 'staff.leave_request.rejected')
+        if (typeDef) {
+          const startDateStr = request.startDate.toLocaleDateString()
+          const endDateStr = request.endDate.toLocaleDateString()
+
+          const notificationInput = buildNotificationFromType(typeDef, {
+            recipientUserId: request.submittedByUserId,
+            bodyVariables: {
+              startDate: startDateStr,
+              endDate: endDateStr,
+              reason: request.decisionComment ?? '',
+            },
+            sourceEntityType: 'staff:leave_request',
+            sourceEntityId: request.id,
+            linkHref: `/backend/staff/leave-requests/${request.id}`,
+          })
+
+          await notificationService.create(notificationInput, {
+            tenantId: request.tenantId,
+            organizationId: request.organizationId,
+          })
+        }
+      } catch {
+        // Notification creation is non-critical, don't fail the command
+      }
+    }
+
     return { requestId: request.id }
   },
   async prepare(rawInput, ctx) {

package/src/modules/staff/i18n/de.json

@@ -797,6 +797,10 @@
   "staff.teams.tabs.details": "Details",
   "staff.teams.tabs.label": "Teamabschnitte",
   "staff.teams.tabs.members": "Teammitglieder",
+  "staff.notifications.leaveRequest.pending.title": "Urlaubsantrag ausstehend",
+  "staff.notifications.leaveRequest.pending.body": "{memberName} hat Urlaub vom {startDate} bis {endDate} beantragt",
+  "staff.notifications.leaveRequest.actions.approve": "Genehmigen",
+  "staff.notifications.leaveRequest.actions.reject": "Ablehnen",
   "staff.leaveRequests.page.title": "Urlaubsantr\u00e4ge",
   "staff.leaveRequests.page.description": "Urlaubsantr\u00e4ge des Teams pr\u00fcfen.",
   "staff.leaveRequests.my.title": "Meine Urlaubsantr\u00e4ge",

package/src/modules/staff/i18n/en.json

@@ -797,6 +797,10 @@
   "staff.teams.tabs.details": "Details",
   "staff.teams.tabs.label": "Team sections",
   "staff.teams.tabs.members": "Team members",
+  "staff.notifications.leaveRequest.pending.title": "Leave Request Pending",
+  "staff.notifications.leaveRequest.pending.body": "{memberName} has requested leave from {startDate} to {endDate}",
+  "staff.notifications.leaveRequest.actions.approve": "Approve",
+  "staff.notifications.leaveRequest.actions.reject": "Reject",
   "staff.leaveRequests.page.title": "Leave requests",
   "staff.leaveRequests.page.description": "Review leave requests from your team.",
   "staff.leaveRequests.my.title": "My leave requests",
@@ -874,5 +878,9 @@
   "staff.myAvailability.readOnly.body": "Use leave requests to request changes.",
   "staff.teamMembers.self.createTitle": "Create my profile",
   "staff.teamMembers.self.created": "Profile created.",
-  "staff.teamMembers.self.exists": "Team member profile already exists."
+  "staff.teamMembers.self.exists": "Team member profile already exists.",
+  "staff.notifications.leaveRequest.approved.title": "Leave Request Approved",
+  "staff.notifications.leaveRequest.approved.body": "Your leave request from {startDate} to {endDate} has been approved",
+  "staff.notifications.leaveRequest.rejected.title": "Leave Request Rejected",
+  "staff.notifications.leaveRequest.rejected.body": "Your leave request from {startDate} to {endDate} has been rejected{reason, select, other { - {reason}}}"
 }

package/src/modules/staff/i18n/es.json

@@ -797,6 +797,10 @@
   "staff.teams.tabs.details": "Detalles",
   "staff.teams.tabs.label": "Secciones del equipo",
   "staff.teams.tabs.members": "Miembros del equipo",
+  "staff.notifications.leaveRequest.pending.title": "Solicitud de ausencia pendiente",
+  "staff.notifications.leaveRequest.pending.body": "{memberName} ha solicitado ausencia del {startDate} al {endDate}",
+  "staff.notifications.leaveRequest.actions.approve": "Aprobar",
+  "staff.notifications.leaveRequest.actions.reject": "Rechazar",
   "staff.leaveRequests.page.title": "Solicitudes de ausencia",
   "staff.leaveRequests.page.description": "Revisa las solicitudes de ausencia del equipo.",
   "staff.leaveRequests.my.title": "Mis solicitudes de ausencia",

package/src/modules/staff/i18n/pl.json

@@ -797,6 +797,10 @@
   "staff.teams.tabs.details": "Szczeg\u00f3\u0142y",
   "staff.teams.tabs.label": "Sekcje zespo\u0142u",
   "staff.teams.tabs.members": "Cz\u0142onkowie zespo\u0142u",
+  "staff.notifications.leaveRequest.pending.title": "Wniosek urlopowy oczekuje",
+  "staff.notifications.leaveRequest.pending.body": "{memberName} zło\u017cył wniosek o urlop od {startDate} do {endDate}",
+  "staff.notifications.leaveRequest.actions.approve": "Zatwierd\u017a",
+  "staff.notifications.leaveRequest.actions.reject": "Odrzu\u0107",
   "staff.leaveRequests.page.title": "Wnioski urlopowe",
   "staff.leaveRequests.page.description": "Przegl\u0105daj wnioski urlopowe zespo\u0142u.",
   "staff.leaveRequests.my.title": "Moje wnioski urlopowe",

package/src/modules/staff/notifications.ts

@@ -0,0 +1,71 @@
+import type { NotificationTypeDefinition } from '@open-mercato/shared/modules/notifications/types'
+
+export const notificationTypes: NotificationTypeDefinition[] = [
+  {
+    type: 'staff.leave_request.pending',
+    module: 'staff',
+    titleKey: 'staff.notifications.leaveRequest.pending.title',
+    bodyKey: 'staff.notifications.leaveRequest.pending.body',
+    icon: 'calendar-off',
+    severity: 'warning',
+    actions: [
+      {
+        id: 'approve',
+        labelKey: 'staff.notifications.leaveRequest.actions.approve',
+        variant: 'default',
+        icon: 'check',
+        commandId: 'staff.leave-requests.accept',
+      },
+      {
+        id: 'reject',
+        labelKey: 'staff.notifications.leaveRequest.actions.reject',
+        variant: 'destructive',
+        icon: 'x',
+        commandId: 'staff.leave-requests.reject',
+      },
+    ],
+    primaryActionId: 'approve',
+    linkHref: '/backend/staff/leave-requests/{sourceEntityId}',
+    expiresAfterHours: 168,
+  },
+  {
+    type: 'staff.leave_request.approved',
+    module: 'staff',
+    titleKey: 'staff.notifications.leaveRequest.approved.title',
+    bodyKey: 'staff.notifications.leaveRequest.approved.body',
+    icon: 'calendar-check',
+    severity: 'success',
+    actions: [
+      {
+        id: 'view',
+        labelKey: 'common.view',
+        variant: 'outline',
+        href: '/backend/staff/leave-requests/{sourceEntityId}',
+        icon: 'external-link',
+      },
+    ],
+    linkHref: '/backend/staff/leave-requests/{sourceEntityId}',
+    expiresAfterHours: 168, // 7 days
+  },
+  {
+    type: 'staff.leave_request.rejected',
+    module: 'staff',
+    titleKey: 'staff.notifications.leaveRequest.rejected.title',
+    bodyKey: 'staff.notifications.leaveRequest.rejected.body',
+    icon: 'calendar-x',
+    severity: 'warning',
+    actions: [
+      {
+        id: 'view',
+        labelKey: 'common.view',
+        variant: 'outline',
+        href: '/backend/staff/leave-requests/{sourceEntityId}',
+        icon: 'external-link',
+      },
+    ],
+    linkHref: '/backend/staff/leave-requests/{sourceEntityId}',
+    expiresAfterHours: 168, // 7 days
+  },
+]
+
+export default notificationTypes

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>
   )