@open-mercato/core 0.6.4-develop.4236.1.9fa6806b34 → 0.6.4-develop.4254.1.7a123d970c

package/src/modules/workflows/backend/instances/[id]/page.tsx

@@ -19,6 +19,7 @@ import { MobileInstanceOverview } from '../../../components/mobile/MobileInstanc
 import { useIsMobile } from '@open-mercato/ui/hooks/useIsMobile'
 import { definitionToGraph } from '../../../lib/graph-utils'
 import { Node } from '@xyflow/react'
+import { RecordNotFoundState, ErrorMessage } from '@open-mercato/ui/backend/detail'
 
 export default function WorkflowInstanceDetailPage({ params }: { params?: { id?: string } }) {
   const id = params?.id
@@ -32,7 +33,13 @@ export default function WorkflowInstanceDetailPage({ params }: { params?: { id?:
     queryFn: async () => {
       const response = await apiFetch(`/api/workflows/instances/${id}`)
       if (!response.ok) {
-        throw new Error(t('workflows.instances.notFound') || 'Instance not found')
+        const httpErr = new Error(
+          response.status === 404
+            ? t('workflows.instances.detail.notFound', 'Workflow instance not found.')
+            : t('workflows.instances.loadFailed', 'Failed to load workflow instance.')
+        ) as Error & { status: number }
+        httpErr.status = response.status
+        throw httpErr
       }
       const data = await response.json()
       return data.data as WorkflowInstance
@@ -368,18 +375,35 @@ export default function WorkflowInstanceDetailPage({ params }: { params?: { id?:
     )
   }
 
+  const isNotFound = !isLoading && (error as (Error & { status?: number }) | null)?.status === 404
+
+  if (isNotFound) {
+    return (
+      <Page>
+        <PageBody>
+          <RecordNotFoundState
+            label={t('workflows.instances.detail.notFound', 'Workflow instance not found.')}
+            backHref="/backend/instances"
+            backLabel={t('workflows.instances.actions.backToList', 'Back to instances')}
+          />
+        </PageBody>
+        {ConfirmDialogElement}
+      </Page>
+    )
+  }
+
   if (error || !instance) {
     return (
       <Page>
         <PageBody>
-          <div className="flex h-[50vh] flex-col items-center justify-center gap-2 text-muted-foreground">
-            <p>{error ? t('workflows.instances.loadFailed') : t('workflows.instances.detail.notFound') || 'Workflow instance not found.'}</p>
-            <Button asChild variant="outline">
-              <Link href="/backend/instances">
-                {t('workflows.instances.actions.backToList') || 'Back to instances'}
-              </Link>
-            </Button>
-          </div>
+          <ErrorMessage
+            label={(error as Error | null)?.message ?? t('workflows.instances.loadFailed', 'Failed to load workflow instance.')}
+            action={
+              <Button asChild variant="outline" size="sm">
+                <Link href="/backend/instances">{t('workflows.instances.actions.backToList', 'Back to instances')}</Link>
+              </Button>
+            }
+          />
         </PageBody>
         {ConfirmDialogElement}
       </Page>

package/src/modules/workflows/backend/tasks/[id]/page.tsx

@@ -25,6 +25,7 @@ import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { MobileTaskForm } from '../../../components/mobile/MobileTaskForm'
 import { useIsMobile } from '@open-mercato/ui/hooks/useIsMobile'
 import type { UserTaskResponse, UserTaskStatus } from '../../../data/types'
+import { RecordNotFoundState, ErrorMessage } from '@open-mercato/ui/backend/detail'
 
 export default function UserTaskDetailPage({ params }: { params: { id: string } }) {
   const router = useRouter()
@@ -44,12 +45,16 @@ export default function UserTaskDetailPage({ params }: { params: { id: string }
       const result = await apiCall<{ data: UserTaskResponse }>(
         `/api/workflows/tasks/${params.id}`
       )
-
       if (!result.ok) {
-        throw new Error('Failed to fetch task')
+        const httpErr = new Error(
+          result.status === 404
+            ? t('workflows.tasks.detail.notFound', 'Task not found')
+            : t('workflows.tasks.detail.loadFailed', 'Failed to load task')
+        ) as Error & { status: number }
+        httpErr.status = result.status
+        throw httpErr
       }
-
-      return result.result?.data || null
+      return result.result?.data ?? null
     },
   })
 
@@ -347,16 +352,34 @@ export default function UserTaskDetailPage({ params }: { params: { id: string }
     )
   }
 
+  const isNotFound = !isLoading && (error as (Error & { status?: number }) | null)?.status === 404
+
+  if (isNotFound) {
+    return (
+      <Page>
+        <PageBody>
+          <RecordNotFoundState
+            label={t('workflows.tasks.detail.notFound', 'Task not found')}
+            backHref="/backend/tasks"
+            backLabel={t('workflows.tasks.detail.backToList', 'Back to Tasks')}
+          />
+        </PageBody>
+      </Page>
+    )
+  }
+
   if (error || !task) {
     return (
       <Page>
         <PageBody>
-          <div className="p-8 text-center">
-            <p className="text-status-error-text">{t('workflows.tasks.detail.notFound')}</p>
-            <Button onClick={() => router.push('/backend/tasks')} className="mt-4">
-              {t('workflows.tasks.detail.backToList')}
-            </Button>
-          </div>
+          <ErrorMessage
+            label={(error as Error | null)?.message ?? t('workflows.tasks.detail.loadFailed', 'Failed to load task')}
+            action={
+              <Button asChild variant="outline" size="sm">
+                <Link href="/backend/tasks">{t('workflows.tasks.detail.backToList', 'Back to Tasks')}</Link>
+              </Button>
+            }
+          />
         </PageBody>
       </Page>
     )

package/src/modules/workflows/cli.ts

@@ -4,6 +4,10 @@ import { getRedisUrl, getRedisUrlOrThrow } from '@open-mercato/shared/lib/redis/
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { WorkflowDefinition } from './data/entities'
 import { BusinessRule, type RuleType } from '@open-mercato/core/modules/business_rules/data/entities'
+import {
+  invalidateBusinessRuleDiscoveryCache,
+  resolveBusinessRuleDiscoveryCache,
+} from '@open-mercato/core/modules/business_rules/lib/rule-engine'
 import * as fs from 'fs'
 import * as path from 'path'
 import { fileURLToPath } from 'url'
@@ -69,6 +73,7 @@ const seedDemoWithRules: ModuleCli = {
     try {
       const { resolve } = await createRequestContainer()
       const em = resolve<EntityManager>('em')
+      const cache = resolveBusinessRuleDiscoveryCache(resolve)
 
       // Import BusinessRule entity
       const { BusinessRule } = await import('../business_rules/data/entities')
@@ -100,6 +105,7 @@ const seedDemoWithRules: ModuleCli = {
         })
 
         await em.persist(rule).flush()
+        await invalidateBusinessRuleDiscoveryCache(cache, tenantId, organizationId)
         console.log(`  ✓ Seeded guard rule: ${rule.ruleName}`)
         seededCount++
       }
@@ -211,6 +217,7 @@ const seedOrderApproval: ModuleCli = {
     try {
       const { resolve } = await createRequestContainer()
       const em = resolve<EntityManager>('em')
+      const cache = resolveBusinessRuleDiscoveryCache(resolve)
 
       // 1. Seed order approval guard rules first
       const guardRulesPath = path.join(__dirname, 'examples', 'order-approval-guard-rules.json')
@@ -252,6 +259,7 @@ const seedOrderApproval: ModuleCli = {
 
       if (rulesSeeded > 0) {
         await em.flush()
+        await invalidateBusinessRuleDiscoveryCache(cache, tenantId, organizationId)
       }
 
       console.log(`✅ Seeded order approval guard rules`)

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

@@ -1007,6 +1007,7 @@
   "workflows.tasks.detail.commentsPlaceholder": "Fügen Sie Kommentare oder Anmerkungen zu dieser Aufgabe hinzu…",
   "workflows.tasks.detail.completeTask": "Aufgabe abschließen",
   "workflows.tasks.detail.form.selectOption": "-- Option auswählen --",
+  "workflows.tasks.detail.loadFailed": "Aufgabe konnte nicht geladen werden",
   "workflows.tasks.detail.loading": "Aufgabe wird geladen…",
   "workflows.tasks.detail.noFormSchema": "Diese Aufgabe hat kein auszufüllendes Formular. Sie können optionale Kommentare hinzufügen und absenden.",
   "workflows.tasks.detail.notFound": "Aufgabe nicht gefunden",

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

@@ -1007,6 +1007,7 @@
   "workflows.tasks.detail.commentsPlaceholder": "Add any comments or notes about this task...",
   "workflows.tasks.detail.completeTask": "Complete Task",
   "workflows.tasks.detail.form.selectOption": "-- Select an option --",
+  "workflows.tasks.detail.loadFailed": "Failed to load task",
   "workflows.tasks.detail.loading": "Loading task...",
   "workflows.tasks.detail.noFormSchema": "This task has no form to complete. You can add optional comments and submit.",
   "workflows.tasks.detail.notFound": "Task not found",

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

@@ -1007,6 +1007,7 @@
   "workflows.tasks.detail.commentsPlaceholder": "Agrega comentarios o notas sobre esta tarea...",
   "workflows.tasks.detail.completeTask": "Completar tarea",
   "workflows.tasks.detail.form.selectOption": "-- Selecciona una opcion --",
+  "workflows.tasks.detail.loadFailed": "Error al cargar la tarea",
   "workflows.tasks.detail.loading": "Cargando tarea...",
   "workflows.tasks.detail.noFormSchema": "Esta tarea no tiene formulario. Puedes agregar comentarios opcionales y enviar.",
   "workflows.tasks.detail.notFound": "Tarea no encontrada",

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

@@ -1007,6 +1007,7 @@
   "workflows.tasks.detail.commentsPlaceholder": "Dodaj komentarze lub notatki dotyczące tego zadania...",
   "workflows.tasks.detail.completeTask": "Zakończ Zadanie",
   "workflows.tasks.detail.form.selectOption": "-- Wybierz opcję --",
+  "workflows.tasks.detail.loadFailed": "Nie udało się załadować zadania",
   "workflows.tasks.detail.loading": "Ładowanie zadania...",
   "workflows.tasks.detail.noFormSchema": "To zadanie nie ma formularza do wypełnienia. Możesz dodać opcjonalne komentarze i wysłać.",
   "workflows.tasks.detail.notFound": "Zadanie nie znalezione",

package/src/modules/workflows/lib/seeds.ts

@@ -4,6 +4,10 @@ import * as path from 'path'
 import { fileURLToPath } from 'node:url'
 import { WorkflowDefinition, type WorkflowDefinitionData } from '../data/entities'
 import { BusinessRule, type RuleType } from '@open-mercato/core/modules/business_rules/data/entities'
+import {
+  invalidateBusinessRuleDiscoveryCache,
+  type RuleDiscoveryCache,
+} from '@open-mercato/core/modules/business_rules/lib/rule-engine'
 
 const __esmDirname = path.dirname(fileURLToPath(import.meta.url))
 
@@ -130,6 +134,7 @@ async function seedGuardRules(
   em: EntityManager,
   scope: WorkflowSeedScope,
   fileName: string,
+  cache?: RuleDiscoveryCache | null,
 ): Promise<{ seeded: number; skipped: number; updated: number }> {
   const seeds = readExampleJson<GuardRuleSeed[]>(fileName)
   if (!Array.isArray(seeds)) {
@@ -185,16 +190,21 @@ async function seedGuardRules(
   }
   if (seeded > 0 || updated > 0) {
     await em.flush()
+    await invalidateBusinessRuleDiscoveryCache(cache, scope.tenantId, scope.organizationId)
   }
   return { seeded, skipped, updated }
 }
 
-export async function seedExampleWorkflows(em: EntityManager, scope: WorkflowSeedScope): Promise<void> {
+export async function seedExampleWorkflows(
+  em: EntityManager,
+  scope: WorkflowSeedScope,
+  options: { cache?: RuleDiscoveryCache | null } = {},
+): Promise<void> {
   // workflows.checkout-demo and workflows.simple-approval are now code-defined
   // (see packages/core/src/modules/workflows/workflows.ts). Seeding DB rows for
   // them would shadow the code definitions in the merge layer, so they are no
   // longer seeded here. Existing tenants are migrated via Migration20260428102318.
-  await seedGuardRules(em, scope, 'guard-rules-example.json')
+  await seedGuardRules(em, scope, 'guard-rules-example.json', options.cache)
   await seedWorkflowDefinition(em, scope, 'sales-pipeline-definition.json')
-  await seedGuardRules(em, scope, 'order-approval-guard-rules.json')
+  await seedGuardRules(em, scope, 'order-approval-guard-rules.json', options.cache)
 }

package/src/modules/workflows/setup.ts

@@ -1,10 +1,12 @@
 import type { ModuleSetupConfig } from '@open-mercato/shared/modules/setup'
+import { resolveBusinessRuleDiscoveryCache } from '@open-mercato/core/modules/business_rules/lib/rule-engine'
 import { seedExampleWorkflows } from './lib/seeds'
 
 export const setup: ModuleSetupConfig = {
   seedDefaults: async (ctx) => {
     const scope = { tenantId: ctx.tenantId, organizationId: ctx.organizationId }
-    await seedExampleWorkflows(ctx.em, scope)
+    const cache = resolveBusinessRuleDiscoveryCache(ctx.container.resolve.bind(ctx.container))
+    await seedExampleWorkflows(ctx.em, scope, { cache })
   },
 
   defaultRoleFeatures: {