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

package/src/modules/auth/lib/setup-app.ts

@@ -16,6 +16,7 @@ import { DEFAULT_ENCRYPTION_MAPS } from '@open-mercato/core/modules/entities/lib
 import { createKmsService } from '@open-mercato/shared/lib/encryption/kms'
 import { TenantDataEncryptionService } from '@open-mercato/shared/lib/encryption/tenantDataEncryptionService'
 import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
 
 const DEFAULT_ROLE_NAMES = ['employee', 'admin', 'superadmin'] as const
 const DEMO_SUPERADMIN_EMAIL = 'superadmin@acme.com'
@@ -87,6 +88,11 @@ type PrimaryUserInput = {
   confirm?: boolean
 }
 
+const DERIVED_EMAIL_ENV = {
+  admin: 'OM_INIT_ADMIN_EMAIL',
+  employee: 'OM_INIT_EMPLOYEE_EMAIL',
+} as const
+
 export type SetupInitialTenantOptions = {
   orgName: string
   primaryUser: PrimaryUserInput
@@ -170,16 +176,28 @@ export async function setupInitialTenant(
   })
 
   if (!existingUser) {
-    const baseUsers: Array<{ email: string; roles: string[]; name?: string | null }> = [
+    const baseUsers: Array<{
+      email: string
+      roles: string[]
+      name?: string | null
+      passwordHash?: string | null
+    }> = [
       { email: primaryUser.email, roles: primaryRoles, name: resolvePrimaryName(primaryUser) },
     ]
     if (includeDerivedUsers) {
-      const [local, domain] = String(primaryUser.email).split('@')
-      const isSuperadminLocal = (local || '').toLowerCase() === 'superadmin' && !!domain
-      if (isSuperadminLocal) {
-        baseUsers.push({ email: `admin@${domain}`, roles: ['admin'] })
-        baseUsers.push({ email: `employee@${domain}`, roles: ['employee'] })
-      }
+      const [, domain] = String(primaryUser.email).split('@')
+      const adminOverride = readEnvValue(DERIVED_EMAIL_ENV.admin)
+      const employeeOverride = readEnvValue(DERIVED_EMAIL_ENV.employee)
+      const adminEmail = adminOverride ?? (domain ? `admin@${domain}` : '')
+      const employeeEmail = employeeOverride ?? (domain ? `employee@${domain}` : '')
+      const adminPassword = readEnvValue('OM_INIT_ADMIN_PASSWORD')
+      const employeePassword = readEnvValue('OM_INIT_EMPLOYEE_PASSWORD')
+      const adminPasswordHash = adminPassword ? await resolvePasswordHash({ email: adminEmail, password: adminPassword }) : null
+      const employeePasswordHash = employeePassword
+        ? await resolvePasswordHash({ email: employeeEmail, password: employeePassword })
+        : null
+      addUniqueBaseUser(baseUsers, { email: adminEmail, roles: ['admin'], passwordHash: adminPasswordHash })
+      addUniqueBaseUser(baseUsers, { email: employeeEmail, roles: ['employee'], passwordHash: employeePasswordHash })
     }
     const passwordHash = await resolvePasswordHash(primaryUser)
 
@@ -271,13 +289,14 @@ export async function setupInitialTenant(
       }
 
       for (const base of baseUsers) {
+        const resolvedPasswordHash = base.passwordHash ?? passwordHash
         let user = await tem.findOne(User, { email: base.email })
         const confirm = primaryUser.confirm ?? true
         const encryptedPayload = encryptionService
           ? await encryptionService.encryptEntityPayload('auth:user', { email: base.email }, tenantId, organizationId)
           : { email: base.email, emailHash: computeEmailHash(base.email) }
         if (user) {
-          user.passwordHash = passwordHash
+          user.passwordHash = resolvedPasswordHash
           user.organizationId = organizationId
           user.tenantId = tenantId
           if (isTenantDataEncryptionEnabled()) {
@@ -292,7 +311,7 @@ export async function setupInitialTenant(
           user = tem.create(User, {
             email: (encryptedPayload as any).email ?? base.email,
             emailHash: isTenantDataEncryptionEnabled() ? (encryptedPayload as any).emailHash ?? computeEmailHash(base.email) : undefined,
-            passwordHash,
+            passwordHash: resolvedPasswordHash,
             organizationId,
             tenantId,
             name: base.name ?? undefined,
@@ -340,6 +359,34 @@ function resolvePrimaryName(input: PrimaryUserInput): string | null {
   return null
 }
 
+function readEnvValue(key: string): string | undefined {
+  const value = process.env[key]
+  if (typeof value !== 'string') return undefined
+  const trimmed = value.trim()
+  return trimmed.length > 0 ? trimmed : undefined
+}
+
+function addUniqueBaseUser(
+  baseUsers: Array<{ email: string; roles: string[]; name?: string | null; passwordHash?: string | null }>,
+  entry: { email: string; roles: string[]; name?: string | null; passwordHash?: string | null },
+) {
+  if (!entry.email) return
+  const normalized = entry.email.toLowerCase()
+  if (baseUsers.some((user) => user.email.toLowerCase() === normalized)) return
+  baseUsers.push(entry)
+}
+
+function isDemoModeEnabled(): boolean {
+  const parsed = parseBooleanToken(process.env.DEMO_MODE ?? '')
+  return parsed === false ? false : true
+}
+
+function shouldKeepDemoSuperadminDuringInit(): boolean {
+  if (process.env.OM_INIT_FLOW !== 'true') return false
+  if (!readEnvValue('OM_INIT_SUPERADMIN_EMAIL')) return false
+  return isDemoModeEnabled()
+}
+
 async function resolvePasswordHash(input: PrimaryUserInput): Promise<string | null> {
   if (typeof input.hashedPassword === 'string') return input.hashedPassword
   if (input.password) return hash(input.password, 10)
@@ -396,6 +443,7 @@ async function ensureDefaultRoleAcls(
       'dashboards.admin.assign-widgets',
       'analytics.view',
       'api_keys.*',
+      'notifications.manage',
       'perspectives.use',
       'perspectives.role_defaults',
       'business_rules.*',
@@ -487,6 +535,7 @@ async function ensureRoleAclFor(
 
 async function deactivateDemoSuperAdminIfSelfOnboardingEnabled(em: EntityManager) {
   if (process.env.SELF_SERVICE_ONBOARDING_ENABLED !== 'true') return
+  if (shouldKeepDemoSuperadminDuringInit()) return
   try {
     const user = await em.findOne(User, { email: DEMO_SUPERADMIN_EMAIL })
     if (!user) return

package/src/modules/auth/notifications.ts

@@ -0,0 +1,109 @@
+import type { NotificationTypeDefinition } from '@open-mercato/shared/modules/notifications/types'
+
+export const notificationTypes: NotificationTypeDefinition[] = [
+  {
+    type: 'auth.password_reset.requested',
+    module: 'auth',
+    titleKey: 'auth.notifications.passwordReset.requested.title',
+    bodyKey: 'auth.notifications.passwordReset.requested.body',
+    icon: 'key',
+    severity: 'info',
+    actions: [
+      {
+        id: 'view',
+        labelKey: 'common.view',
+        variant: 'outline',
+        href: '/backend/auth/profile',
+        icon: 'external-link',
+      },
+    ],
+    linkHref: '/backend/auth/profile',
+    expiresAfterHours: 24,
+  },
+  {
+    type: 'auth.password_reset.completed',
+    module: 'auth',
+    titleKey: 'auth.notifications.passwordReset.completed.title',
+    bodyKey: 'auth.notifications.passwordReset.completed.body',
+    icon: 'check-circle',
+    severity: 'success',
+    actions: [],
+    expiresAfterHours: 72,
+  },
+  {
+    type: 'auth.account.locked',
+    module: 'auth',
+    titleKey: 'auth.notifications.account.locked.title',
+    bodyKey: 'auth.notifications.account.locked.body',
+    icon: 'lock',
+    severity: 'warning',
+    actions: [
+      {
+        id: 'contact_support',
+        labelKey: 'auth.actions.contactSupport',
+        variant: 'default',
+        href: '/backend/support',
+        icon: 'mail',
+      },
+    ],
+    linkHref: '/backend/support',
+  },
+  {
+    type: 'auth.login.new_device',
+    module: 'auth',
+    titleKey: 'auth.notifications.login.newDevice.title',
+    bodyKey: 'auth.notifications.login.newDevice.body',
+    icon: 'smartphone',
+    severity: 'info',
+    actions: [
+      {
+        id: 'view_sessions',
+        labelKey: 'auth.actions.viewSessions',
+        variant: 'outline',
+        href: '/backend/auth/sessions',
+        icon: 'list',
+      },
+    ],
+    linkHref: '/backend/auth/sessions',
+    expiresAfterHours: 168, // 7 days
+  },
+  {
+    type: 'auth.role.assigned',
+    module: 'auth',
+    titleKey: 'auth.notifications.role.assigned.title',
+    bodyKey: 'auth.notifications.role.assigned.body',
+    icon: 'user-plus',
+    severity: 'success',
+    actions: [
+      {
+        id: 'view_permissions',
+        labelKey: 'auth.actions.viewPermissions',
+        variant: 'outline',
+        href: '/backend/auth/profile',
+        icon: 'shield',
+      },
+    ],
+    linkHref: '/backend/auth/profile',
+    expiresAfterHours: 168,
+  },
+  {
+    type: 'auth.role.revoked',
+    module: 'auth',
+    titleKey: 'auth.notifications.role.revoked.title',
+    bodyKey: 'auth.notifications.role.revoked.body',
+    icon: 'user-minus',
+    severity: 'warning',
+    actions: [
+      {
+        id: 'view_profile',
+        labelKey: 'common.view',
+        variant: 'outline',
+        href: '/backend/auth/profile',
+      },
+    ],
+    linkHref: '/backend/auth/profile',
+    expiresAfterHours: 168,
+  },
+]
+
+export default notificationTypes

package/src/modules/auth/services/authService.ts

@@ -18,6 +18,29 @@ export class AuthService {
     } as any)
   }
 
+  async findUsersByEmail(email: string) {
+    const emailHash = computeEmailHash(email)
+    return this.em.find(User, {
+      deletedAt: null,
+      $or: [
+        { email },
+        { emailHash },
+      ],
+    } as any)
+  }
+
+  async findUserByEmailAndTenant(email: string, tenantId: string) {
+    const emailHash = computeEmailHash(email)
+    return this.em.findOne(User, {
+      tenantId,
+      deletedAt: null,
+      $or: [
+        { email },
+        { emailHash },
+      ],
+    } as any)
+  }
+
   async verifyPassword(user: User, password: string) {
     if (!user.passwordHash) return false
     return compare(password, user.passwordHash)
@@ -75,15 +98,15 @@ export class AuthService {
     return { user, token }
   }
 
-  async confirmPasswordReset(token: string, newPassword: string) {
+  async confirmPasswordReset(token: string, newPassword: string): Promise<User | null> {
     const now = new Date()
     const row = await this.em.findOne(PasswordReset, { token })
-    if (!row || (row.usedAt && row.usedAt <= now) || row.expiresAt <= now) return false
+    if (!row || (row.usedAt && row.usedAt <= now) || row.expiresAt <= now) return null
     const user = await this.em.findOne(User, { id: row.user.id })
-    if (!user) return false
+    if (!user) return null
     user.passwordHash = await hash(newPassword, 10)
     row.usedAt = new Date()
     await this.em.flush()
-    return true
+    return user
   }
 }

package/src/modules/business_rules/api/execute/route.ts

@@ -4,6 +4,7 @@ import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import type { EntityManager } from '@mikro-orm/postgresql'
+import type { EventBus } from '@open-mercato/events'
 import { ruleEngineContextSchema } from '../../data/validators'
 import * as ruleEngine from '../../lib/rule-engine'
 
@@ -46,6 +47,12 @@ export async function POST(req: Request) {
 
   const container = await createRequestContainer()
   const em = container.resolve('em') as EntityManager
+  let eventBus: EventBus | null = null
+  try {
+    eventBus = container.resolve('eventBus') as EventBus
+  } catch {
+    eventBus = null
+  }
 
   let body: any
   try {
@@ -85,7 +92,7 @@ export async function POST(req: Request) {
   }
 
   try {
-    const result = await ruleEngine.executeRules(em, context)
+    const result = await ruleEngine.executeRules(em, context, { eventBus })
 
     const response = {
       allowed: result.allowed,

package/src/modules/business_rules/backend/rules/page.tsx

@@ -264,14 +264,17 @@ export default function RulesListPage() {
         <RowActions
           items={[
             {
+              id: 'edit',
               label: t('common.edit'),
               href: `/backend/rules/${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: () => {
                 // TODO: Implement duplicate functionality in Step 5.2
@@ -279,6 +282,7 @@ export default function RulesListPage() {
               },
             },
             {
+              id: 'delete',
               label: t('common.delete'),
               onSelect: () => handleDelete(row.original.id, row.original.ruleName),
               destructive: true,

package/src/modules/business_rules/backend/sets/page.tsx

@@ -196,14 +196,17 @@ export default function RuleSetsListPage() {
         <RowActions
           items={[
             {
+              id: 'edit',
               label: t('common.edit'),
               href: `/backend/sets/${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: 'delete',
               label: t('common.delete'),
               onSelect: () => handleDelete(row.original.id, row.original.setName),
               destructive: true,

package/src/modules/business_rules/cli.ts

@@ -44,6 +44,7 @@ const seedGuardRules: ModuleCli = {
       const rulesPath = path.join(__dirname, '../workflows/examples', 'guard-rules-example.json')
       const rulesData = JSON.parse(fs.readFileSync(rulesPath, 'utf8'))
 
+      console.log('🧠 Seeding guard rules...')
       let seededCount = 0
       let skippedCount = 0
 
@@ -73,7 +74,7 @@ const seedGuardRules: ModuleCli = {
         seededCount++
       }
 
-      console.log(`\n✓ Guard rules seeding complete:`)
+      console.log(`\n✅ Guard rules seeding complete:`)
       console.log(`  - Seeded: ${seededCount}`)
       console.log(`  - Skipped (existing): ${skippedCount}`)
       console.log(`  - Total: ${rulesData.length}`)

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

@@ -367,5 +367,7 @@
   "business_rules.components.conditionRow.field.comparisonPlaceholder": "e.g., user.role",
   "business_rules.components.conditionRow.value.help": "Use JSON for arrays: [\"a\",\"b\"]",
   "business_rules.components.conditionRow.field.comparisonHelp": "Field path to compare with",
-  "business_rules.components.conditionRow.deleteCondition": "Delete condition"
+  "business_rules.components.conditionRow.deleteCondition": "Delete condition",
+  "businessRules.notifications.rule.executionFailed.title": "Business Rule Failed",
+  "businessRules.notifications.rule.executionFailed.body": "Rule \"{ruleName}\" failed to execute{entityType, select, other { on {entityType}}}: {errorMessage}"
 }

package/src/modules/business_rules/lib/__tests__/rule-engine.test.ts

@@ -654,6 +654,57 @@ describe('Rule Engine (Unit Tests)', () => {
       expect(result.errors).toBeDefined()
       expect(result.errors![0]).toContain('Rule count limit exceeded')
     })
+
+    test('should emit execution_failed event when rule evaluation fails', async () => {
+      const mockRule: Partial<BusinessRule> = {
+        id: 'rule-1',
+        ruleId: 'TEST-001',
+        ruleName: 'Test Rule',
+        ruleType: 'ACTION',
+        entityType: 'WorkOrder',
+        conditionExpression: { field: 'status', operator: '=', value: 'RELEASED' },
+        enabled: true,
+        tenantId: testTenantId,
+        organizationId: testOrgId,
+      }
+
+      mockEm.find.mockResolvedValue([mockRule as BusinessRule])
+      mockEm.create.mockReturnValue({ id: 'log-1' } as any)
+      mockEm.persistAndFlush.mockResolvedValue(undefined)
+
+      jest.mocked(ruleEvaluator.evaluateSingleRule).mockResolvedValue({
+        rule: mockRule as BusinessRule,
+        conditionsPassed: false,
+        evaluationCompleted: false,
+        evaluationTime: 1,
+        error: 'Evaluation error',
+      })
+
+      const eventBus = { emitEvent: jest.fn().mockResolvedValue(undefined) }
+
+      const context: RuleEngineContext = {
+        entityType: 'WorkOrder',
+        entityId: testEntityId,
+        data: { status: 'RELEASED' },
+        tenantId: testTenantId,
+        organizationId: testOrgId,
+        dryRun: false,
+      }
+
+      await ruleEngine.executeRules(mockEm, context, { eventBus })
+
+      expect(eventBus.emitEvent).toHaveBeenCalledWith(
+        'business_rules.rule.execution_failed',
+        expect.objectContaining({
+          ruleId: 'TEST-001',
+          ruleName: 'Test Rule',
+          entityType: 'WorkOrder',
+          errorMessage: 'Evaluation error',
+          tenantId: testTenantId,
+          organizationId: testOrgId,
+        })
+      )
+    })
   })
 
   describe('logRuleExecution', () => {

package/src/modules/business_rules/lib/rule-engine.ts

@@ -1,4 +1,5 @@
 import type { EntityManager } from '@mikro-orm/core'
+import type { EventBus } from '@open-mercato/events'
 import { BusinessRule, RuleExecutionLog, type RuleType } from '../data/entities'
 import * as ruleEvaluator from './rule-evaluator'
 import * as actionExecutor from './action-executor'
@@ -85,6 +86,19 @@ export interface RuleDiscoveryOptions {
   ruleType?: RuleType
 }
 
+export type RuleEngineExecutionOptions = {
+  eventBus?: Pick<EventBus, 'emitEvent'> | null
+}
+
+type RuleExecutionFailedPayload = {
+  ruleId: string
+  ruleName: string
+  entityType?: string | null
+  errorMessage?: string | null
+  tenantId: string
+  organizationId?: string | null
+}
+
 /**
  * Execute a function with a timeout
  */
@@ -113,7 +127,8 @@ async function withTimeout<T>(
  */
 export async function executeRules(
   em: EntityManager,
-  context: RuleEngineContext
+  context: RuleEngineContext,
+  options: RuleEngineExecutionOptions = {}
 ): Promise<RuleEngineResult> {
   // Validate input
   const validation = ruleEngineContextSchema.safeParse(context)
@@ -159,7 +174,7 @@ export async function executeRules(
     const executionPromise = (async () => {
       for (const rule of rules) {
       try {
-        const ruleResult = await executeSingleRule(em, rule, context)
+        const ruleResult = await executeSingleRule(em, rule, context, options)
         executedRules.push(ruleResult)
 
         if (ruleResult.logId) {
@@ -177,6 +192,17 @@ export async function executeRules(
           `Unexpected error in rule execution [ruleId=${rule.ruleId}, type=${rule.ruleType}]: ${errorMessage}`
         )
 
+        if (!context.dryRun) {
+          await emitRuleExecutionFailed(options.eventBus, {
+            ruleId: rule.ruleId,
+            ruleName: rule.ruleName,
+            entityType: context.entityType ?? null,
+            errorMessage,
+            tenantId: context.tenantId,
+            organizationId: context.organizationId ?? null,
+          })
+        }
+
         executedRules.push({
           rule,
           conditionResult: false,
@@ -233,7 +259,8 @@ export async function executeRules(
 export async function executeSingleRule(
   em: EntityManager,
   rule: BusinessRule,
-  context: RuleEngineContext
+  context: RuleEngineContext,
+  options: RuleEngineExecutionOptions = {}
 ): Promise<RuleExecutionResult> {
   const startTime = Date.now()
 
@@ -269,6 +296,15 @@ export async function executeSingleRule(
             executionTime,
             error: result.error,
           })
+
+          await emitRuleExecutionFailed(options.eventBus, {
+            ruleId: rule.ruleId,
+            ruleName: rule.ruleName,
+            entityType: context.entityType ?? null,
+            errorMessage: result.error ?? null,
+            tenantId: context.tenantId,
+            organizationId: context.organizationId ?? null,
+          })
         }
 
         return {
@@ -346,6 +382,15 @@ export async function executeSingleRule(
         executionTime,
         error: enhancedError,
       })
+
+      await emitRuleExecutionFailed(options.eventBus, {
+        ruleId: rule.ruleId,
+        ruleName: rule.ruleName,
+        entityType: context.entityType ?? null,
+        errorMessage: enhancedError,
+        tenantId: context.tenantId,
+        organizationId: context.organizationId ?? null,
+      })
     }
 
     return {
@@ -544,3 +589,12 @@ export async function logRuleExecution(
 
   return log.id
 }
+
+async function emitRuleExecutionFailed(
+  eventBus: Pick<EventBus, 'emitEvent'> | null | undefined,
+  payload: RuleExecutionFailedPayload
+): Promise<void> {
+  if (!eventBus?.emitEvent) return
+
+  await eventBus.emitEvent('business_rules.rule.execution_failed', payload).catch(() => undefined)
+}

package/src/modules/business_rules/notifications.ts

@@ -0,0 +1,25 @@
+import type { NotificationTypeDefinition } from '@open-mercato/shared/modules/notifications/types'
+
+export const notificationTypes: NotificationTypeDefinition[] = [
+  {
+    type: 'business_rules.rule.execution_failed',
+    module: 'business_rules',
+    titleKey: 'businessRules.notifications.rule.executionFailed.title',
+    bodyKey: 'businessRules.notifications.rule.executionFailed.body',
+    icon: 'alert-triangle',
+    severity: 'error',
+    actions: [
+      {
+        id: 'view',
+        labelKey: 'common.view',
+        variant: 'outline',
+        href: '/backend/business-rules/{sourceEntityId}',
+        icon: 'external-link',
+      },
+    ],
+    linkHref: '/backend/business-rules/{sourceEntityId}',
+    expiresAfterHours: 168, // 7 days
+  },
+]
+
+export default notificationTypes

package/src/modules/business_rules/subscribers/rule-execution-failed-notification.ts

@@ -0,0 +1,50 @@
+import type { EntityManager } from '@mikro-orm/postgresql'
+import { resolveNotificationService } from '../../notifications/lib/notificationService'
+import { buildFeatureNotificationFromType } from '../../notifications/lib/notificationBuilder'
+import { notificationTypes } from '../notifications'
+
+export const metadata = {
+  event: 'business_rules.rule.execution_failed',
+  persistent: true,
+  id: 'business_rules:rule-execution-failed-notification',
+}
+
+type RuleExecutionFailedPayload = {
+  ruleId: string
+  ruleName: string
+  entityType?: string | null
+  errorMessage?: string | null
+  tenantId: string
+  organizationId?: string | null
+}
+
+type ResolverContext = {
+  resolve: <T = unknown>(name: string) => T
+}
+
+export default async function handle(payload: RuleExecutionFailedPayload, ctx: ResolverContext) {
+  try {
+    const notificationService = resolveNotificationService(ctx)
+    const typeDef = notificationTypes.find((type) => type.type === 'business_rules.rule.execution_failed')
+    if (!typeDef) return
+
+    const notificationInput = buildFeatureNotificationFromType(typeDef, {
+      requiredFeature: 'business_rules.manage',
+      bodyVariables: {
+        ruleName: payload.ruleName,
+        entityType: payload.entityType ?? '',
+        errorMessage: payload.errorMessage ?? 'Unknown error',
+      },
+      sourceEntityType: 'business_rules:rule',
+      sourceEntityId: payload.ruleId,
+      linkHref: `/backend/business-rules/${payload.ruleId}`,
+    })
+
+    await notificationService.createForFeature(notificationInput, {
+      tenantId: payload.tenantId,
+      organizationId: payload.organizationId ?? null,
+    })
+  } catch (err) {
+    console.error('[business_rules:rule-execution-failed-notification] Failed to create notification:', err)
+  }
+}

package/src/modules/catalog/components/PriceKindSettings.tsx

@@ -420,10 +420,12 @@ export function PriceKindSettings() {
             <RowActions
               items={[
                 {
+                  id: 'edit',
                   label: t('catalog.priceKinds.actions.edit', 'Edit'),
                   onSelect: () => openDialog({ mode: 'edit', entry }),
                 },
                 {
+                  id: 'delete',
                   label: t('catalog.priceKinds.actions.delete', 'Delete'),
                   destructive: true,
                   onSelect: () => { void handleDelete(entry) },

package/src/modules/catalog/components/categories/CategoriesDataTable.tsx

@@ -221,8 +221,8 @@ export default function CategoriesDataTable() {
         canManage ? (
           <RowActions
             items={[
-              { label: t('catalog.categories.list.actions.edit', 'Edit'), href: `/backend/catalog/categories/${row.id}/edit` },
-              { label: t('catalog.categories.list.actions.delete', 'Delete'), destructive: true, onSelect: () => handleDelete(row) },
+              { id: 'edit', label: t('catalog.categories.list.actions.edit', 'Edit'), href: `/backend/catalog/categories/${row.id}/edit` },
+              { id: 'delete', label: t('catalog.categories.list.actions.delete', 'Delete'), destructive: true, onSelect: () => handleDelete(row) },
             ]}
           />
         ) : null