@open-mercato/core 0.10.1-develop.7879.1.80d3740285 → 0.10.1-develop.7888.1.96c8c2bd5f

package/src/modules/catalog/backend/catalog/products/[productId]/variants/create/page.tsx

@@ -35,10 +35,10 @@ import {
   VariantPricesSection,
   VariantMediaSection,
 } from '@open-mercato/core/modules/catalog/components/products/VariantBuilder'
-import type { ProductMediaItem } from '@open-mercato/core/modules/catalog/components/products/ProductMediaManager'
 import { buildAttachmentImageUrl, slugifyAttachmentFileName } from '@open-mercato/core/modules/attachments/lib/imageUrls'
 import { fetchOptionSchemaTemplate } from '../../../optionSchemaClient'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { transferDraftMedia } from '@open-mercato/core/modules/catalog/components/products/mediaTransfer'
 
 const logger = createLogger('catalog')
 
@@ -393,11 +393,19 @@ export default function CreateVariantPage({ params }: { params?: { productId?: s
             if (!variantId) {
               throw createCrudFormError(t('catalog.variants.form.errors.idMissing', 'Variant id missing after create.'))
             }
-            await transferVariantMedia({
+            const mediaTransfer = await transferDraftMedia({
+              entityId: E.catalog.catalog_product_variant,
               draftId: values.mediaDraftId,
-              variantId,
+              recordId: variantId,
               mediaItems: Array.isArray(values.mediaItems) ? values.mediaItems : [],
             })
+            if (mediaTransfer.failedCount > 0) {
+              logger.error('attachments.transfer.failed', {
+                failed: mediaTransfer.failedCount,
+                requested: mediaTransfer.requestedCount,
+                errors: mediaTransfer.errors,
+              })
+            }
             await syncVariantPrices({
               priceKinds,
               priceDrafts: values.prices ?? {},
@@ -408,7 +416,18 @@ export default function CreateVariantPage({ params }: { params?: { productId?: s
               productTaxRateId,
               productTaxRate,
             })
-            flash(t('catalog.variants.form.createSuccess', 'Variant created.'), 'success')
+            if (mediaTransfer.failedCount > 0) {
+              flash(
+                t(
+                  'catalog.variants.form.mediaTransferIncomplete',
+                  'Variant created, but {failed} of {total} media files could not be attached.',
+                  { failed: mediaTransfer.failedCount, total: mediaTransfer.requestedCount },
+                ),
+                'warning',
+              )
+            } else {
+              flash(t('catalog.variants.form.createSuccess', 'Variant created.'), 'success')
+            }
             router.push(`/backend/catalog/products/${productId}#variants`)
           }}
         />
@@ -417,34 +436,6 @@ export default function CreateVariantPage({ params }: { params?: { productId?: s
   )
 }
 
-async function transferVariantMedia({
-  draftId,
-  variantId,
-  mediaItems,
-}: {
-  draftId?: string | null
-  variantId: string
-  mediaItems: ProductMediaItem[]
-}): Promise<void> {
-  if (!draftId || !variantId) return
-  const attachmentIds = mediaItems.map((item) => item.id).filter((id): id is string => typeof id === 'string' && id.length > 0)
-  if (!attachmentIds.length) return
-  await apiCall(
-    '/api/attachments/transfer',
-    {
-      method: 'POST',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({
-        entityId: E.catalog.catalog_product_variant,
-        attachmentIds,
-        fromRecordId: draftId,
-        toRecordId: variantId,
-      }),
-    },
-    { fallback: null },
-  )
-}
-
 async function syncVariantPrices({
   priceKinds,
   priceDrafts,

package/src/modules/catalog/backend/catalog/products/create/page.tsx

@@ -98,6 +98,7 @@ import {
   type ProductUnitConversionInput,
 } from "@open-mercato/core/modules/catalog/components/products/productFormUtils";
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { transferDraftMedia } from "@open-mercato/core/modules/catalog/components/products/mediaTransfer";
 
 const logger = createLogger('catalog')
 
@@ -419,9 +420,6 @@ export default function CreateCatalogProductPage() {
             const mediaItems = Array.isArray(formValues.mediaItems)
               ? formValues.mediaItems
               : [];
-            const attachmentIds = mediaItems
-              .map((item) => (typeof item.id === "string" ? item.id : null))
-              .filter((value): value is string => !!value);
             const mediaDraftId =
               typeof formValues.mediaDraftId === "string"
                 ? formValues.mediaDraftId
@@ -768,27 +766,18 @@ export default function CreateCatalogProductPage() {
                 await createCrud("catalog/prices", pricePayload);
               }
 
-              if (mediaDraftId && attachmentIds.length) {
-                const transfer = await apiCall<{
-                  ok?: boolean;
-                  error?: string;
-                }>(
-                  "/api/attachments/transfer",
-                  {
-                    method: "POST",
-                    headers: { "content-type": "application/json" },
-                    body: JSON.stringify({
-                      entityId: E.catalog.catalog_product,
-                      attachmentIds,
-                      fromRecordId: mediaDraftId,
-                      toRecordId: productId,
-                    }),
-                  },
-                  { fallback: null },
-                );
-                if (!transfer.ok) {
-                  logger.error("attachments.transfer.failed", { err: transfer.result?.error });
-                }
+              const mediaTransfer = await transferDraftMedia({
+                entityId: E.catalog.catalog_product,
+                draftId: mediaDraftId,
+                recordId: productId,
+                mediaItems,
+              });
+              if (mediaTransfer.failedCount > 0) {
+                logger.error("attachments.transfer.failed", {
+                  failed: mediaTransfer.failedCount,
+                  requested: mediaTransfer.requestedCount,
+                  errors: mediaTransfer.errors,
+                });
               }
 
               if (inboxDraft) {
@@ -817,10 +806,24 @@ export default function CreateCatalogProductPage() {
                 }
               }
 
-              flash(
-                t("catalog.products.create.success", "Product created."),
-                "success",
-              );
+              if (mediaTransfer.failedCount > 0) {
+                flash(
+                  t(
+                    "catalog.products.create.mediaTransferIncomplete",
+                    "Product created, but {failed} of {total} media files could not be attached.",
+                    {
+                      failed: mediaTransfer.failedCount,
+                      total: mediaTransfer.requestedCount,
+                    },
+                  ),
+                  "warning",
+                );
+              } else {
+                flash(
+                  t("catalog.products.create.success", "Product created."),
+                  "success",
+                );
+              }
               if (inboxDraft) {
                 router.push(
                   `/backend/inbox-ops/proposals/${encodeURIComponent(inboxDraft.proposalId)}`,

package/src/modules/catalog/components/products/mediaTransfer.ts

@@ -0,0 +1,40 @@
+import { transferAttachmentsInChunks } from '@open-mercato/core/modules/attachments/lib/transferClient'
+import type { ProductMediaItem } from './ProductMediaManager'
+
+export type DraftMediaTransferInput = {
+  entityId: string
+  draftId?: string | null
+  recordId: string
+  mediaItems: ProductMediaItem[]
+}
+
+export type DraftMediaTransferResult = {
+  requestedCount: number
+  failedCount: number
+  errors: string[]
+}
+
+export async function transferDraftMedia({
+  entityId,
+  draftId,
+  recordId,
+  mediaItems,
+}: DraftMediaTransferInput): Promise<DraftMediaTransferResult> {
+  const attachmentIds = mediaItems
+    .map((item) => item.id)
+    .filter((id): id is string => typeof id === 'string' && id.length > 0)
+  if (!draftId || !recordId || !attachmentIds.length) {
+    return { requestedCount: 0, failedCount: 0, errors: [] }
+  }
+  const result = await transferAttachmentsInChunks({
+    entityId,
+    attachmentIds,
+    fromRecordId: draftId,
+    toRecordId: recordId,
+  })
+  return {
+    requestedCount: attachmentIds.length,
+    failedCount: result.failedIds.length + result.unconfirmedCount,
+    errors: result.errors,
+  }
+}

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

@@ -416,6 +416,7 @@
   "catalog.products.create.errors.variant": "Variante konnte nicht erstellt werden.",
   "catalog.products.create.fields.currency": "Hauptwährung",
   "catalog.products.create.handleHelp": "Handle wird für URLs verwendet und muss eindeutig sein.",
+  "catalog.products.create.mediaTransferIncomplete": "Produkt erstellt, aber {failed} von {total} Mediendateien konnten nicht angehängt werden.",
   "catalog.products.create.meta.description": "Verwalte Untertitel, Handle und Währung für deine Storefronts.",
   "catalog.products.create.meta.handleLabel": "Handle",
   "catalog.products.create.meta.title": "Produkt-Metadaten",
@@ -882,6 +883,7 @@
   "catalog.variants.form.isDefaultLabel": "Standardvariante",
   "catalog.variants.form.loading": "Formular wird geladen...",
   "catalog.variants.form.media": "Medien",
+  "catalog.variants.form.mediaTransferIncomplete": "Variante erstellt, aber {failed} von {total} Mediendateien konnten nicht angehängt werden.",
   "catalog.variants.form.nameLabel": "Name",
   "catalog.variants.form.namePlaceholder": "z. B. Blau / Klein",
   "catalog.variants.form.nameRequired": "Geben Sie den Variantennamen an.",

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

@@ -416,6 +416,7 @@
   "catalog.products.create.errors.variant": "Failed to create variant.",
   "catalog.products.create.fields.currency": "Primary currency",
   "catalog.products.create.handleHelp": "Handle is used for URLs and must be unique.",
+  "catalog.products.create.mediaTransferIncomplete": "Product created, but {failed} of {total} media files could not be attached.",
   "catalog.products.create.meta.description": "Manage subtitle, handle, and currency for storefronts.",
   "catalog.products.create.meta.handleLabel": "Handle",
   "catalog.products.create.meta.title": "Product meta",
@@ -882,6 +883,7 @@
   "catalog.variants.form.isDefaultLabel": "Default variant",
   "catalog.variants.form.loading": "Loading form...",
   "catalog.variants.form.media": "Media",
+  "catalog.variants.form.mediaTransferIncomplete": "Variant created, but {failed} of {total} media files could not be attached.",
   "catalog.variants.form.nameLabel": "Name",
   "catalog.variants.form.namePlaceholder": "e.g., Blue / Small",
   "catalog.variants.form.nameRequired": "Provide the variant name.",

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

@@ -416,6 +416,7 @@
   "catalog.products.create.errors.variant": "No se pudo crear la variante.",
   "catalog.products.create.fields.currency": "Moneda principal",
   "catalog.products.create.handleHelp": "El identificador se usa en URLs y debe ser único.",
+  "catalog.products.create.mediaTransferIncomplete": "Producto creado, pero no se pudieron adjuntar {failed} de {total} archivos multimedia.",
   "catalog.products.create.meta.description": "Administra el subtítulo, el identificador y la moneda para las vitrinas.",
   "catalog.products.create.meta.handleLabel": "Identificador",
   "catalog.products.create.meta.title": "Metadatos del producto",
@@ -882,6 +883,7 @@
   "catalog.variants.form.isDefaultLabel": "Variante predeterminada",
   "catalog.variants.form.loading": "Cargando formulario...",
   "catalog.variants.form.media": "Medios",
+  "catalog.variants.form.mediaTransferIncomplete": "Variante creada, pero no se pudieron adjuntar {failed} de {total} archivos multimedia.",
   "catalog.variants.form.nameLabel": "Nombre",
   "catalog.variants.form.namePlaceholder": "ej., Azul / Pequeño",
   "catalog.variants.form.nameRequired": "Ingrese el nombre de la variante.",

package/src/modules/catalog/i18n/ko.json

@@ -416,6 +416,7 @@
   "catalog.products.create.errors.variant": "변형 생성에 실패했습니다.",
   "catalog.products.create.fields.currency": "기본 통화",
   "catalog.products.create.handleHelp": "핸들은 URL에 사용되며 고유해야 합니다.",
+  "catalog.products.create.mediaTransferIncomplete": "상품이 생성되었지만 미디어 파일 {total}개 중 {failed}개를 첨부하지 못했습니다.",
   "catalog.products.create.meta.description": "스토어프론트에 사용할 부제목, 핸들, 통화를 관리합니다.",
   "catalog.products.create.meta.handleLabel": "핸들",
   "catalog.products.create.meta.title": "상품 메타 정보",
@@ -882,6 +883,7 @@
   "catalog.variants.form.isDefaultLabel": "기본 변형",
   "catalog.variants.form.loading": "폼을 불러오는 중...",
   "catalog.variants.form.media": "미디어",
+  "catalog.variants.form.mediaTransferIncomplete": "변형이 생성되었지만 미디어 파일 {total}개 중 {failed}개를 첨부하지 못했습니다.",
   "catalog.variants.form.nameLabel": "이름",
   "catalog.variants.form.namePlaceholder": "예: 블루 / 스몰",
   "catalog.variants.form.nameRequired": "변형 이름을 입력하세요.",

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

@@ -416,6 +416,7 @@
   "catalog.products.create.errors.variant": "Nie udało się utworzyć wariantu.",
   "catalog.products.create.fields.currency": "Główna waluta",
   "catalog.products.create.handleHelp": "Identyfikator jest używany w adresach URL i musi być unikalny.",
+  "catalog.products.create.mediaTransferIncomplete": "Produkt utworzony, ale nie udało się dołączyć {failed} z {total} plików multimedialnych.",
   "catalog.products.create.meta.description": "Zarządzaj podtytułem, identyfikatorem i walutą dla witryn.",
   "catalog.products.create.meta.handleLabel": "Identyfikator",
   "catalog.products.create.meta.title": "Metadane produktu",
@@ -882,6 +883,7 @@
   "catalog.variants.form.isDefaultLabel": "Domyślny wariant",
   "catalog.variants.form.loading": "Ładowanie formularza...",
   "catalog.variants.form.media": "Multimedia",
+  "catalog.variants.form.mediaTransferIncomplete": "Wariant utworzony, ale nie udało się dołączyć {failed} z {total} plików multimedialnych.",
   "catalog.variants.form.nameLabel": "Nazwa",
   "catalog.variants.form.namePlaceholder": "np. Niebieski / Mały",
   "catalog.variants.form.nameRequired": "Podaj nazwę wariantu.",

package/src/modules/customers/backend/customers/deals/pipeline/components/Lane.tsx

@@ -36,6 +36,7 @@ type LaneProps = {
   deals: DealCardData[]
   /** Server-side aggregate for accurate counts/totals across all deals in this stage, not just loaded ones */
   aggregate?: LaneAggregateProp | null
+  paginationTotal?: number
   selectedDealIds: Set<string>
   buildMenuItems: (deal: DealCardData) => RowActionItem[]
   activeDragDealId?: string | null
@@ -176,6 +177,7 @@ function LaneImpl({
   stage,
   deals,
   aggregate,
+  paginationTotal,
   selectedDealIds,
   buildMenuItems,
   activeDragDealId,
@@ -212,7 +214,8 @@ function LaneImpl({
     : null
   const visibleCount = deals.length
   const totalCount = stats.count
-  const hasMoreDeals = totalCount > visibleCount
+  const remainingCount = (paginationTotal ?? totalCount) - visibleCount
+  const hasMoreDeals = remainingCount > 0
   const accentClass = getAccentClass(stage.tone)
   const countBadgeClass = getCountBadgeClass(stage.tone)
 
@@ -336,7 +339,7 @@ function LaneImpl({
                   t,
                   'customers.deals.kanban.lane.loadMore',
                   'Show more ({remaining})',
-                  { remaining: totalCount - visibleCount },
+                  { remaining: remainingCount },
                 )}
           </DashedTileButton>
         ) : null}
@@ -358,6 +361,7 @@ export const Lane = React.memo(LaneImpl, (prev, next) => {
   if (prev.stage !== next.stage) return false
   if (prev.deals !== next.deals) return false
   if (prev.aggregate !== next.aggregate) return false
+  if (prev.paginationTotal !== next.paginationTotal) return false
   if (prev.selectedDealIds !== next.selectedDealIds) return false
   if (prev.buildMenuItems !== next.buildMenuItems) return false
   if (prev.activeDragDealId !== next.activeDragDealId) return false

package/src/modules/customers/backend/customers/deals/pipeline/page.tsx

@@ -631,7 +631,7 @@ export default function DealsKanbanPage(): React.ReactElement {
   )
 
   // Aggregate query — gives accurate per-stage counts + totals (in base currency) across the entire pipeline,
-  // not just the loaded slice. Drives both lane headers and pagination decisions.
+  // not just the loaded slice. Drives lane headers and currency breakdowns.
   const aggregateQuery = useQuery<StageAggregateResponse | null>({
     queryKey: [
       'customers',
@@ -2853,7 +2853,7 @@ export default function DealsKanbanPage(): React.ReactElement {
                 />
               ) : (
                 <>
-                  {lanes.map((stage) => {
+                  {lanes.map((stage, stageIndex) => {
                     const laneDeals = sortedDealsByStage.get(stage.id) ?? EMPTY_DEAL_ARRAY
                     return (
                       <Lane
@@ -2861,6 +2861,7 @@ export default function DealsKanbanPage(): React.ReactElement {
                         stage={stage}
                         deals={laneDeals}
                         aggregate={aggregateByStage.get(stage.id) ?? null}
+                        paginationTotal={laneQueries[stageIndex]?.data?.total ?? 0}
                         selectedDealIds={selectedDealIds}
                         buildMenuItems={buildMenuItems}
                         activeDragDealId={activeDragDealId}

package/src/modules/warranty_claims/backend/components/ReceivingPanel.tsx

@@ -56,9 +56,9 @@ function readErrorKey(value: unknown): string | null {
   return typeof value.error === 'string' && value.error.trim().length ? value.error.trim() : null
 }
 
-function toApiError(status: number, result: unknown, fallbackKey: string, t: TranslateFn): Error & { status?: number } {
+function toApiError(status: number, result: unknown, fallbackKey: string, t: TranslateFn): Error & { status: number; body: unknown } {
   const key = readErrorKey(result) ?? fallbackKey
-  return Object.assign(new Error(t(key, key)), { status })
+  return Object.assign(new Error(t(key, key)), { status, body: result })
 }
 
 function formatLineTitle(line: ReceivingLine, t: TranslateFn): string {
@@ -142,7 +142,10 @@ export function ReceivingPanel({
       setDialogLine(null)
       await onRefresh()
     } catch (err) {
-      if (surfaceRecordConflict(err, t, { onRefresh })) return
+      if (surfaceRecordConflict(err, t, { onRefresh })) {
+        setDialogLine(null)
+        return
+      }
       const message = err instanceof Error && err.message
         ? err.message
         : t('warranty_claims.receiving.error.save', 'Failed to save receiving details.')

package/src/modules/warranty_claims/backend/components/ReturnLabelPanel.tsx

@@ -55,9 +55,9 @@ function readErrorKey(value: unknown): string | null {
   return typeof value.error === 'string' && value.error.trim().length ? value.error.trim() : null
 }
 
-function toApiError(status: number, result: unknown, fallbackKey: string, t: TranslateFn): Error & { status?: number } {
+function toApiError(status: number, result: unknown, fallbackKey: string, t: TranslateFn): Error & { status: number; body: unknown } {
   const key = readErrorKey(result) ?? fallbackKey
-  return Object.assign(new Error(t(key, key)), { status })
+  return Object.assign(new Error(t(key, key)), { status, body: result })
 }
 
 function isReturnLabelStatus(value: unknown): value is ReturnLabelResponse {

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 }
+}