@open-mercato/core 0.4.2-canary-10c7a8bf2a → 0.4.2-canary-c84cff7ed5

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

@@ -273,8 +273,9 @@ export default function UserTasksListPage() {
       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.tasks.actions.viewDetails'),
             href: `/backend/tasks/${row.original.id}`,
           },
@@ -288,6 +289,7 @@ 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),
           })
@@ -296,6 +298,7 @@ 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/i18n/en.json

@@ -676,5 +676,7 @@
       "success": "Sub-workflow completed successfully",
       "failed": "Sub-workflow failed"
     }
-  }
+  },
+  "workflows.notifications.task.assigned.title": "Task Assigned",
+  "workflows.notifications.task.assigned.body": "You have been assigned to task \"{taskName}\" in workflow \"{workflowName}\"{dueDate, select, other { (due: {dueDate})}}"
 }

package/src/modules/workflows/notifications.ts

@@ -0,0 +1,25 @@
+import type { NotificationTypeDefinition } from '@open-mercato/shared/modules/notifications/types'
+
+export const notificationTypes: NotificationTypeDefinition[] = [
+  {
+    type: 'workflows.task.assigned',
+    module: 'workflows',
+    titleKey: 'workflows.notifications.task.assigned.title',
+    bodyKey: 'workflows.notifications.task.assigned.body',
+    icon: 'clipboard-list',
+    severity: 'info',
+    actions: [
+      {
+        id: 'view',
+        labelKey: 'common.view',
+        variant: 'outline',
+        href: '/backend/workflows/tasks/{sourceEntityId}',
+        icon: 'external-link',
+      },
+    ],
+    linkHref: '/backend/workflows/tasks/{sourceEntityId}',
+    expiresAfterHours: 168, // 7 days
+  },
+]
+
+export default notificationTypes

package/src/modules/workflows/subscribers/task-assigned-notification.ts

@@ -0,0 +1,53 @@
+import type { EntityManager } from '@mikro-orm/postgresql'
+import { resolveNotificationService } from '../../notifications/lib/notificationService'
+import { buildNotificationFromType } from '../../notifications/lib/notificationBuilder'
+import { notificationTypes } from '../notifications'
+
+export const metadata = {
+  event: 'workflows.task.assigned',
+  persistent: true,
+  id: 'workflows:task-assigned-notification',
+}
+
+type TaskAssignedPayload = {
+  taskId: string
+  taskName: string
+  workflowName: string
+  assignedUserId: string
+  dueDate?: string | null
+  tenantId: string
+  organizationId?: string | null
+}
+
+type ResolverContext = {
+  resolve: <T = unknown>(name: string) => T
+}
+
+export default async function handle(payload: TaskAssignedPayload, ctx: ResolverContext) {
+  if (!payload.assignedUserId) return
+
+  try {
+    const notificationService = resolveNotificationService(ctx)
+    const typeDef = notificationTypes.find((type) => type.type === 'workflows.task.assigned')
+    if (!typeDef) return
+
+    const notificationInput = buildNotificationFromType(typeDef, {
+      recipientUserId: payload.assignedUserId,
+      bodyVariables: {
+        taskName: payload.taskName,
+        workflowName: payload.workflowName,
+        dueDate: payload.dueDate ?? '',
+      },
+      sourceEntityType: 'workflows:user_task',
+      sourceEntityId: payload.taskId,
+      linkHref: `/backend/workflows/tasks/${payload.taskId}`,
+    })
+
+    await notificationService.create(notificationInput, {
+      tenantId: payload.tenantId,
+      organizationId: payload.organizationId ?? null,
+    })
+  } catch (err) {
+    console.error('[workflows:task-assigned-notification] Failed to create notification:', err)
+  }
+}