@open-mercato/core 0.10.1-develop.7883.1.44ac2125f5 → 0.10.1-develop.7888.1.96c8c2bd5f

package/src/modules/warranty_claims/backend/warranty_claims/[id]/page.tsx

@@ -9,6 +9,7 @@ import { hasFeature } from '@open-mercato/shared/security/features'
 import { parseBooleanFromUnknown } from '@open-mercato/shared/lib/boolean'
 import type { TranslateFn, TranslateParams } from '@open-mercato/shared/lib/i18n/context'
 import { useLocale, useT } from '@open-mercato/shared/lib/i18n/context'
+import { getTelemetryRuntime } from '@open-mercato/shared/lib/telemetry/runtime'
 import { formatDateTime, formatRelativeTime } from '@open-mercato/shared/lib/time'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { DataTable } from '@open-mercato/ui/backend/DataTable'
@@ -67,6 +68,7 @@ import {
 import { AiAssessButtons } from '../../components/AiAssessButtons'
 import { useUserDisplayNames } from '../../components/useUserDisplayNames'
 import { ReceivingPanel } from '../../components/ReceivingPanel'
+import { loadClaimLines } from '../../../lib/claimLines'
 import { ReturnLabelPanel } from '../../components/ReturnLabelPanel'
 import { VendorRecoverySuggestionsPanel } from '../../components/VendorRecoverySuggestionsPanel'
 import { ClaimStageProgress } from '../../components/ClaimStageProgress'
@@ -929,11 +931,7 @@ export default function WarrantyClaimDetailPage({ params }: { params?: { id?: st
           undefined,
           { fallback: { items: [] }, errorMessage: t('warranty_claims.detail.error.load') },
         ),
-        readApiResultOrThrow<{ items?: unknown[] }>(
-          `/api/warranty_claims/lines?claimId=${encodeURIComponent(id)}&page=1&pageSize=100`,
-          undefined,
-          { fallback: { items: [] }, errorMessage: t('warranty_claims.detail.error.loadLines') },
-        ),
+        loadClaimLines(id, t('warranty_claims.detail.error.loadLines')),
         readApiResultOrThrow<{ items?: unknown[] }>(
           `/api/warranty_claims/events?claimId=${encodeURIComponent(id)}`,
           undefined,
@@ -1427,6 +1425,39 @@ export default function WarrantyClaimDetailPage({ params }: { params?: { id?: st
     }
   }, [claim, confirm, currentStatus, featureAccess.claimDelete, loadData, mutationContext, router, runMutation, t])
 
+  const deleteLine = React.useCallback(async (line: ClaimLine) => {
+    if (!claim || !linesInlineEditable) return
+    const confirmed = await confirm({
+      title: t('warranty_claims.form.lines.remove'),
+      variant: 'destructive',
+    })
+    if (!confirmed) return
+    const payload = { id: line.id, claimId: claim.id }
+    try {
+      await runMutation({
+        operation: () => withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(line.updatedAt),
+          () => deleteCrud('warranty_claims/lines', {
+            body: payload,
+            errorMessage: t('warranty_claims.detail.lines.error.delete'),
+          }),
+        ),
+        context: { ...mutationContext, resourceKind: 'warranty_claims.claim_line', resourceId: line.id },
+        mutationPayload: payload,
+      })
+      flash(t('warranty_claims.detail.lines.flash.deleted'), 'success')
+      await loadData()
+    } catch (err) {
+      if (surfaceRecordConflict(err, t, { onRefresh: loadData })) return
+      getTelemetryRuntime()?.reportError(err, {
+        module: 'warranty_claims',
+        code: 'warranty_claims.line_delete_failed',
+        attributes: { claimId: claim.id, lineId: line.id },
+      })
+      flash(translateErrorMessage(err, t, 'warranty_claims.detail.lines.error.delete'), 'error')
+    }
+  }, [claim, confirm, linesInlineEditable, loadData, mutationContext, runMutation, t])
+
   const headerMoreActions = React.useMemo(() => {
     if (!claim) return []
     const items = [
@@ -2090,6 +2121,12 @@ export default function WarrantyClaimDetailPage({ params }: { params?: { id?: st
                             label: t('warranty_claims.detail.lines.edit'),
                             onSelect: () => setLineDialog({ mode: 'edit', line }),
                           },
+                          {
+                            id: 'delete',
+                            label: t('warranty_claims.form.lines.remove'),
+                            destructive: true,
+                            onSelect: () => { void deleteLine(line) },
+                          },
                         ]}
                       />
                     ) : undefined}
@@ -2533,17 +2570,6 @@ export default function WarrantyClaimDetailPage({ params }: { params?: { id?: st
               setLineDialog(null)
               await loadData()
             }}
-            onDelete={lineDialog?.mode === 'edit'
-              ? async () => {
-                await deleteCrud('warranty_claims/lines', {
-                  body: { id: lineDialog.line.id, claimId: claim.id },
-                  errorMessage: t('warranty_claims.detail.lines.error.delete'),
-                })
-                flash(t('warranty_claims.detail.lines.flash.deleted'), 'success')
-                setLineDialog(null)
-                await loadData()
-              }
-              : undefined}
           />
         </DialogContent>
       </Dialog>

package/src/modules/warranty_claims/frontend/[orgSlug]/portal/claims/[id]/page.tsx

@@ -5,6 +5,7 @@ import Link from 'next/link'
 import { ArrowLeft, Check, CircleAlert, Info, Paperclip, RefreshCw, ShieldCheck, Trash2, TriangleAlert } from 'lucide-react'
 import { replaceWithPageReload } from '@open-mercato/core/modules/portal/lib/navigation'
 import { useLocale, useT, type TranslateFn } from '@open-mercato/shared/lib/i18n/context'
+import { getTelemetryRuntime } from '@open-mercato/shared/lib/telemetry/runtime'
 import { localizeDictionaryLabel } from '@open-mercato/core/modules/warranty_claims/lib/dictionaryLabels'
 import { formatQuantity } from '@open-mercato/core/modules/warranty_claims/lib/quantity'
 import {
@@ -30,6 +31,7 @@ import { apiCall, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/u
 import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { usePortalContext } from '@open-mercato/ui/portal/PortalContext'
 import { PortalEmptyState } from '@open-mercato/ui/portal/components/PortalEmptyState'
+import { usePortalAppEvent } from '@open-mercato/ui/portal/hooks/usePortalAppEvent'
 
 type Props = { params: { orgSlug: string; id: string } }
 
@@ -357,6 +359,8 @@ export default function WarrantyClaimPortalDetailPage({ params }: Props) {
   const [actionSubmitting, setActionSubmitting] = React.useState(false)
   const replacementInputRef = React.useRef<HTMLInputElement | null>(null)
   const replacementTargetRef = React.useRef<PortalAttachment | null>(null)
+  const claimRequestSequenceRef = React.useRef(0)
+  const eventsRequestSequenceRef = React.useRef(0)
 
   // Leaving an authenticated page for the login page crosses the public/authenticated
   // boundary, so it must be a full page load — see `replaceWithPageReload`.
@@ -367,8 +371,11 @@ export default function WarrantyClaimPortalDetailPage({ params }: Props) {
   }, [loading, user, params.orgSlug])
 
   const refreshEvents = React.useCallback(async (claimId: string) => {
+    const requestSequence = ++eventsRequestSequenceRef.current
     const result = await apiCall<EventResponse>(`/api/warranty_claims/portal/events?claimId=${encodeURIComponent(claimId)}`)
-    if (result.ok && result.result) setEvents(result.result.items)
+    if (requestSequence === eventsRequestSequenceRef.current && result.ok && result.result) {
+      setEvents(result.result.items)
+    }
   }, [])
 
   const refreshAttachments = React.useCallback(async (claimId: string) => {
@@ -376,12 +383,14 @@ export default function WarrantyClaimPortalDetailPage({ params }: Props) {
     if (result.ok && result.result) setAttachments(result.result.items)
   }, [])
 
-  const loadClaim = React.useCallback(async () => {
-    setIsLoading(true)
+  const loadClaim = React.useCallback(async (showLoading = true) => {
+    const requestSequence = ++claimRequestSequenceRef.current
+    if (showLoading) setIsLoading(true)
     setError(null)
     setNotFound(false)
     try {
       const detail = await apiCall<ClaimResponse>(`/api/warranty_claims/portal/claims/${encodeURIComponent(params.id)}`)
+      if (requestSequence !== claimRequestSequenceRef.current) return
       if (detail.status === 404) {
         setClaim(null)
         setNotFound(true)
@@ -397,9 +406,11 @@ export default function WarrantyClaimPortalDetailPage({ params }: Props) {
         refreshAttachments(detail.result.item.id),
       ])
     } catch {
-      setError(t('warranty_claims.portal.detail.loadError'))
+      if (requestSequence === claimRequestSequenceRef.current) {
+        setError(t('warranty_claims.portal.detail.loadError'))
+      }
     } finally {
-      setIsLoading(false)
+      if (requestSequence === claimRequestSequenceRef.current) setIsLoading(false)
     }
   }, [params.id, refreshAttachments, refreshEvents, t])
 
@@ -407,6 +418,23 @@ export default function WarrantyClaimPortalDetailPage({ params }: Props) {
     if (user) void loadClaim()
   }, [loadClaim, user])
 
+  usePortalAppEvent('warranty_claims.claim.portal_status_changed', (event) => {
+    if (!user || event.payload.claimId !== params.id) return
+    void loadClaim(false)
+  })
+
+  usePortalAppEvent('warranty_claims.claim.comment_added', (event) => {
+    if (!user || event.payload.claimId !== params.id) return
+    void refreshEvents(params.id).catch((error) => {
+      getTelemetryRuntime()?.reportError(error, {
+        module: 'warranty_claims',
+        code: 'warranty_claims.portal_timeline_refresh_failed',
+        attributes: { claimId: params.id },
+      })
+      setError(t('warranty_claims.portal.detail.loadError'))
+    })
+  })
+
   React.useEffect(() => {
     if (!user) return
     let cancelled = false

package/src/modules/warranty_claims/lib/claimLines.ts

@@ -0,0 +1,22 @@
+import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+
+type ClaimLinesPage = {
+  items?: unknown[]
+  totalPages?: number
+}
+
+export async function loadClaimLines(claimId: string, errorMessage: string): Promise<{ items: unknown[] }> {
+  const readPage = (page: number) => readApiResultOrThrow<ClaimLinesPage>(
+    `/api/warranty_claims/lines?claimId=${encodeURIComponent(claimId)}&page=${page}&pageSize=100&sortField=lineNo&sortDir=asc`,
+    undefined,
+    { fallback: { items: [] }, errorMessage },
+  )
+  const firstPage = await readPage(1)
+  const items = [...(firstPage.items ?? [])]
+  const totalPages = firstPage.totalPages ?? 1
+  for (let page = 2; page <= totalPages; page += 1) {
+    const payload = await readPage(page)
+    items.push(...(payload.items ?? []))
+  }
+  return { items }
+}