@open-mercato/core 0.4.2-canary-ed15f2e753 → 0.4.2-canary-e2aeb1a7bf

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/staff/setup.ts

@@ -0,0 +1,27 @@
+import type { ModuleSetupConfig } from '@open-mercato/shared/modules/setup'
+import { seedStaffAddressTypes, seedStaffTeamExamples } from './lib/seeds'
+
+export const setup: ModuleSetupConfig = {
+  seedDefaults: async (ctx) => {
+    const scope = { tenantId: ctx.tenantId, organizationId: ctx.organizationId }
+    await seedStaffAddressTypes(ctx.em, scope)
+  },
+
+  seedExamples: async (ctx) => {
+    const scope = { tenantId: ctx.tenantId, organizationId: ctx.organizationId }
+    await seedStaffTeamExamples(ctx.em, scope)
+  },
+
+  defaultRoleFeatures: {
+    admin: ['staff.*', 'staff.leave_requests.manage'],
+    employee: [
+      'staff.leave_requests.send',
+      'staff.my_availability.view',
+      'staff.my_availability.manage',
+      'staff.my_leave_requests.view',
+      'staff.my_leave_requests.send',
+    ],
+  },
+}
+
+export default setup

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/page.tsx

@@ -274,22 +274,27 @@ export default function WorkflowDefinitionsListPage() {
         <RowActions
           items={[
             {
+              id: 'edit',
               label: t('common.edit'),
               href: `/backend/definitions/${row.original.id}`,
             },
             {
+              id: 'edit-visual',
               label: t('workflows.actions.editVisually'),
               href: `/backend/definitions/visual-editor?id=${row.original.id}`,
             },
             {
+              id: row.original.enabled ? 'disable' : 'enable',
               label: row.original.enabled ? t('common.disable') : t('common.enable'),
               onSelect: () => handleToggleEnabled(row.original.id, row.original.enabled),
             },
             {
+              id: 'duplicate',
               label: t('common.duplicate'),
               onSelect: () => handleDuplicate(row.original),
             },
             {
+              id: 'delete',
               label: t('common.delete'),
               onSelect: () => handleDelete(row.original.id, row.original.workflowName),
               destructive: true,

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/instances/page.tsx

@@ -266,8 +266,9 @@ export default function WorkflowInstancesListPage() {
       id: 'actions',
       header: '',
       cell: ({ row }) => {
-        const items: Array<{label: string; href?: string; onSelect?: () => void}> = [
+        const items: Array<{ id: string; label: string; href?: string; onSelect?: () => void }> = [
           {
+            id: 'view',
             label: t('workflows.instances.actions.viewDetails'),
             href: `/backend/instances/${row.original.id}`,
           },
@@ -275,6 +276,7 @@ export default function WorkflowInstancesListPage() {
 
         if (row.original.status === 'RUNNING' || row.original.status === 'PAUSED') {
           items.push({
+            id: 'cancel',
             label: t('workflows.instances.actions.cancel'),
             onSelect: () => handleCancel(row.original.id, row.original.workflowId),
           })
@@ -282,6 +284,7 @@ export default function WorkflowInstancesListPage() {
 
         if (row.original.status === 'FAILED') {
           items.push({
+            id: 'retry',
             label: t('workflows.instances.actions.retry'),
             onSelect: () => handleRetry(row.original.id, row.original.workflowId),
           })

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>