@open-mercato/core 0.6.6-develop.6551.1.1511bfa890 → 0.6.6

package/src/modules/sales/components/documents/ShipmentDialog.tsx

@@ -296,13 +296,6 @@ export function ShipmentDialog({
   const [addressOptions, setAddressOptions] = React.useState<ShipmentAddressOption[]>([])
   const [addressLoading, setAddressLoading] = React.useState(false)
   const [addressError, setAddressError] = React.useState<string | null>(null)
-  const addressLoadPromiseRef = React.useRef<{
-    orderId: string
-    promise: Promise<ShipmentAddressOption[]>
-  } | null>(null)
-  const currentAddressOrderIdRef = React.useRef(orderId)
-  currentAddressOrderIdRef.current = orderId
-  const initializedDialogKeyRef = React.useRef<string | null>(null)
   const [documentStatuses, setDocumentStatuses] = React.useState<StatusOption[]>([])
   const [lineStatuses, setLineStatuses] = React.useState<StatusOption[]>([])
   const [shipmentStatuses, setShipmentStatuses] = React.useState<StatusOption[]>([])
@@ -486,52 +479,37 @@ export function ShipmentDialog({
     [],
   )
 
-  const loadAddressOptions = React.useCallback((): Promise<ShipmentAddressOption[]> => {
-    const activeRequest = addressLoadPromiseRef.current
-    if (activeRequest?.orderId === orderId) return activeRequest.promise
-
+  const loadAddressOptions = React.useCallback(async () => {
     setAddressLoading(true)
-    const request = (async () => {
-      try {
-        const params = new URLSearchParams({
-          page: '1',
-          pageSize: '100',
-          documentId: orderId,
-          documentKind: 'order',
-        })
-        const response = await apiCall<{ items?: Array<Record<string, unknown>> }>(
-          `/api/sales/document-addresses?${params.toString()}`,
-          undefined,
-          { fallback: { items: [] } },
-        )
-        const items = Array.isArray(response.result?.items) ? response.result.items : []
-        const mapped = items
-          .map((item) => mapDocumentAddressOption(item))
-          .filter((entry): entry is ShipmentAddressOption => Boolean(entry))
-        const loadedOptions = dedupeAddressOptions([...baseAddressOptions, ...mapped])
-        if (currentAddressOrderIdRef.current !== orderId) return baseAddressOptions
-        mergeAddressOptions(loadedOptions)
-        setAddressError(null)
-        return loadedOptions
-      } catch (err) {
-        logger.error('sales.shipments.addresses.load', { err })
-        if (currentAddressOrderIdRef.current === orderId) {
-          setAddressError(
-            t('sales.documents.shipments.addressLoadError', 'Failed to load addresses.'),
-          )
-        }
-        return baseAddressOptions
-      }
-    })()
-    addressLoadPromiseRef.current = { orderId, promise: request }
-    void request.then(() => {
-      if (addressLoadPromiseRef.current?.promise === request) {
-        addressLoadPromiseRef.current = null
-        setAddressLoading(false)
-      }
-    })
-    return request
-  }, [baseAddressOptions, mapDocumentAddressOption, mergeAddressOptions, orderId, t])
+    try {
+      const params = new URLSearchParams({
+        page: '1',
+        pageSize: '100',
+        documentId: orderId,
+        documentKind: 'order',
+      })
+      const response = await apiCall<{ items?: Array<Record<string, unknown>> }>(
+        `/api/sales/document-addresses?${params.toString()}`,
+        undefined,
+        { fallback: { items: [] } },
+      )
+      const items = Array.isArray(response.result?.items) ? response.result.items : []
+      const mapped = items
+        .map((item) => mapDocumentAddressOption(item))
+        .filter((entry): entry is ShipmentAddressOption => Boolean(entry))
+      mergeAddressOptions(mapped)
+      setAddressError(null)
+      return mapped
+    } catch (err) {
+      logger.error('sales.shipments.addresses.load', { err })
+      setAddressError(
+        t('sales.documents.shipments.addressLoadError', 'Failed to load addresses.'),
+      )
+      return []
+    } finally {
+      setAddressLoading(false)
+    }
+  }, [mapDocumentAddressOption, mergeAddressOptions, orderId, t])
 
   const buildPriceSubtitle = React.useCallback(
     (option: ShippingMethodOption): string | undefined => {
@@ -873,20 +851,16 @@ export function ShipmentDialog({
   )
 
   React.useEffect(() => {
-    if (!open) {
-      initializedDialogKeyRef.current = null
-      return
-    }
-    const dialogKey = `${orderId}:${mode}:${shipment?.id ?? 'new'}`
-    if (initializedDialogKeyRef.current === dialogKey) return
-    initializedDialogKeyRef.current = dialogKey
+    if (!open) return
     setFormResetKey((prev) => prev + 1)
     if (!shippingMethods.length) {
       void loadShippingMethods()
     }
     setAddressOptions(baseAddressOptions)
     setAddressError(null)
-    void loadAddressOptions()
+    if (!addressOptions.length) {
+      void loadAddressOptions()
+    }
     if (!shipmentStatuses.length) {
       void loadShipmentStatuses()
     }
@@ -897,6 +871,7 @@ export function ShipmentDialog({
       void loadLineStatuses()
     }
   }, [
+    addressOptions.length,
     baseAddressOptions,
     documentStatuses.length,
     loadAddressOptions,
@@ -906,8 +881,6 @@ export function ShipmentDialog({
     loadShippingMethods,
     mode,
     open,
-    orderId,
-    shipment?.id,
     lineStatuses.length,
     shipmentStatuses.length,
     shippingMethods.length,
@@ -966,9 +939,11 @@ export function ShipmentDialog({
 
   const fetchAddressItems = React.useCallback(
     async (query?: string): Promise<LookupSelectItem[]> => {
-      const options = addressOptions.length ? addressOptions : await loadAddressOptions()
+      if (!addressOptions.length && !addressLoading) {
+        await loadAddressOptions()
+      }
       const needle = query?.trim().toLowerCase() ?? ''
-      return options
+      return addressOptions
         .filter((option) => {
           if (!needle) return true
           return (
@@ -987,7 +962,7 @@ export function ShipmentDialog({
           ),
         }))
     },
-    [addressOptions, loadAddressOptions],
+    [addressLoading, addressOptions, loadAddressOptions],
   )
 
   const validateItems = React.useCallback(

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

@@ -60,7 +60,6 @@
   "sales.channels.actions.backToList": "Zurück zu Kanälen",
   "sales.channels.actions.create": "Kanal hinzufügen",
   "sales.channels.create": "Vertriebskanal erstellen",
-  "sales.channels.disabledNotice": "Vertriebskanäle sind für diesen Mandanten deaktiviert. Aktivieren Sie das Feature-Toggle \"Sales Channels\", um sie zu verwalten.",
   "sales.channels.form.address1": "Adresszeile 1",
   "sales.channels.form.address2": "Adresszeile 2",
   "sales.channels.form.city": "Stadt",
@@ -639,10 +638,8 @@
   "sales.documents.detail.items.errorDelete": "Position konnte nicht gelöscht werden.",
   "sales.documents.detail.items.errorDeleteShipped": "Positionen mit versandten Artikeln können nicht gelöscht werden.",
   "sales.documents.detail.items.errorLoad": "Positionen konnten nicht geladen werden.",
-  "sales.documents.detail.items.errorPriceShipped": "Preis oder Einheit einer Position mit versandten Artikeln können nicht geändert werden.",
   "sales.documents.detail.items.errorProductRequired": "Wähle ein Produkt aus, um fortzufahren.",
   "sales.documents.detail.items.errorQuantity": "Die Menge muss größer als 0 sein.",
-  "sales.documents.detail.items.errorQuantityBelowShipped": "Die Menge kann nicht unter die bereits versandten {{shipped}} gesenkt werden.",
   "sales.documents.detail.items.errorSave": "Position konnte nicht gespeichert werden.",
   "sales.documents.detail.items.errorUnitPrice": "Der Stückpreis muss größer als 0 sein.",
   "sales.documents.detail.items.errorVariantRequired": "Wähle eine Variante aus, um fortzufahren.",
@@ -953,10 +950,8 @@
   "sales.documents.items.errorDeleteShipped": "Positionen mit versandten Artikeln können nicht gelöscht werden.",
   "sales.documents.items.errorLoad": "Positionen konnten nicht geladen werden.",
   "sales.documents.items.errorNameRequired": "Name ist für benutzerdefinierte Positionen erforderlich.",
-  "sales.documents.items.errorPriceShipped": "Preis oder Einheit einer Position mit versandten Artikeln können nicht geändert werden.",
   "sales.documents.items.errorProductRequired": "Wähle ein Produkt aus, um fortzufahren.",
   "sales.documents.items.errorQuantity": "Die Menge muss größer als 0 sein.",
-  "sales.documents.items.errorQuantityBelowShipped": "Die Menge kann nicht unter die bereits versandten {{shipped}} gesenkt werden.",
   "sales.documents.items.errorSave": "Position konnte nicht gespeichert werden.",
   "sales.documents.items.errorScope": "Organisation und Mandant sind erforderlich.",
   "sales.documents.items.errorUnitPrice": "Der Stückpreis muss größer als 0 sein.",

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

@@ -60,7 +60,6 @@
   "sales.channels.actions.backToList": "Back to channels",
   "sales.channels.actions.create": "Add channel",
   "sales.channels.create": "Create sales channel",
-  "sales.channels.disabledNotice": "Sales channels are disabled for this tenant. Enable the \"Sales Channels\" feature toggle to manage them.",
   "sales.channels.form.address1": "Address line 1",
   "sales.channels.form.address2": "Address line 2",
   "sales.channels.form.city": "City",
@@ -639,10 +638,8 @@
   "sales.documents.detail.items.errorDelete": "Failed to delete line.",
   "sales.documents.detail.items.errorDeleteShipped": "You cannot delete a line that has shipped items.",
   "sales.documents.detail.items.errorLoad": "Failed to load items.",
-  "sales.documents.detail.items.errorPriceShipped": "You cannot change the price or unit of a line that has shipped items.",
   "sales.documents.detail.items.errorProductRequired": "Select a product to continue.",
   "sales.documents.detail.items.errorQuantity": "Quantity must be greater than 0.",
-  "sales.documents.detail.items.errorQuantityBelowShipped": "You cannot lower the quantity below the {{shipped}} already shipped.",
   "sales.documents.detail.items.errorSave": "Failed to save line.",
   "sales.documents.detail.items.errorUnitPrice": "Unit price must be greater than 0.",
   "sales.documents.detail.items.errorVariantRequired": "Select a variant to continue.",
@@ -953,10 +950,8 @@
   "sales.documents.items.errorDeleteShipped": "You cannot delete a line that has shipped items.",
   "sales.documents.items.errorLoad": "Failed to load items.",
   "sales.documents.items.errorNameRequired": "Name is required for custom lines.",
-  "sales.documents.items.errorPriceShipped": "You cannot change the price or unit of a line that has shipped items.",
   "sales.documents.items.errorProductRequired": "Select a product to continue.",
   "sales.documents.items.errorQuantity": "Quantity must be greater than 0.",
-  "sales.documents.items.errorQuantityBelowShipped": "You cannot lower the quantity below the {{shipped}} already shipped.",
   "sales.documents.items.errorSave": "Failed to save line.",
   "sales.documents.items.errorScope": "Organization and tenant are required.",
   "sales.documents.items.errorUnitPrice": "Unit price must be greater than 0.",

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

@@ -60,7 +60,6 @@
   "sales.channels.actions.backToList": "Volver a canales",
   "sales.channels.actions.create": "Añadir canal",
   "sales.channels.create": "Crear canal de ventas",
-  "sales.channels.disabledNotice": "Los canales de venta están desactivados para este inquilino. Active el conmutador de función \"Sales Channels\" para gestionarlos.",
   "sales.channels.form.address1": "Línea de dirección 1",
   "sales.channels.form.address2": "Línea de dirección 2",
   "sales.channels.form.city": "Ciudad",
@@ -639,10 +638,8 @@
   "sales.documents.detail.items.errorDelete": "No se pudo eliminar la línea.",
   "sales.documents.detail.items.errorDeleteShipped": "No puedes eliminar una línea que ya tiene envíos.",
   "sales.documents.detail.items.errorLoad": "No se pudieron cargar los artículos.",
-  "sales.documents.detail.items.errorPriceShipped": "No puedes cambiar el precio ni la unidad de una línea que ya tiene envíos.",
   "sales.documents.detail.items.errorProductRequired": "Selecciona un producto para continuar.",
   "sales.documents.detail.items.errorQuantity": "La cantidad debe ser mayor que 0.",
-  "sales.documents.detail.items.errorQuantityBelowShipped": "No puedes reducir la cantidad por debajo de las {{shipped}} ya enviadas.",
   "sales.documents.detail.items.errorSave": "No se pudo guardar la línea.",
   "sales.documents.detail.items.errorUnitPrice": "El precio unitario debe ser mayor que 0.",
   "sales.documents.detail.items.errorVariantRequired": "Selecciona una variante para continuar.",
@@ -953,10 +950,8 @@
   "sales.documents.items.errorDeleteShipped": "No puedes eliminar una línea que ya tiene envíos.",
   "sales.documents.items.errorLoad": "No se pudieron cargar los artículos.",
   "sales.documents.items.errorNameRequired": "El nombre es obligatorio para líneas personalizadas.",
-  "sales.documents.items.errorPriceShipped": "No puedes cambiar el precio ni la unidad de una línea que ya tiene envíos.",
   "sales.documents.items.errorProductRequired": "Selecciona un producto para continuar.",
   "sales.documents.items.errorQuantity": "La cantidad debe ser mayor que 0.",
-  "sales.documents.items.errorQuantityBelowShipped": "No puedes reducir la cantidad por debajo de las {{shipped}} ya enviadas.",
   "sales.documents.items.errorSave": "No se pudo guardar la línea.",
   "sales.documents.items.errorScope": "Se requieren organización e inquilino.",
   "sales.documents.items.errorUnitPrice": "El precio unitario debe ser mayor que 0.",

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

@@ -60,7 +60,6 @@
   "sales.channels.actions.backToList": "Powrót do kanałów",
   "sales.channels.actions.create": "Dodaj kanał",
   "sales.channels.create": "Utwórz kanał sprzedaży",
-  "sales.channels.disabledNotice": "Kanały sprzedaży są wyłączone dla tego najemcy. Włącz przełącznik funkcji \"Sales Channels\", aby nimi zarządzać.",
   "sales.channels.form.address1": "Adres linia 1",
   "sales.channels.form.address2": "Adres linia 2",
   "sales.channels.form.city": "Miasto",
@@ -639,10 +638,8 @@
   "sales.documents.detail.items.errorDelete": "Nie udało się usunąć pozycji.",
   "sales.documents.detail.items.errorDeleteShipped": "Nie można usunąć pozycji, która ma wysłane sztuki.",
   "sales.documents.detail.items.errorLoad": "Nie udało się wczytać pozycji.",
-  "sales.documents.detail.items.errorPriceShipped": "Nie można zmienić ceny ani jednostki pozycji, która ma wysłane sztuki.",
   "sales.documents.detail.items.errorProductRequired": "Wybierz produkt, aby kontynuować.",
   "sales.documents.detail.items.errorQuantity": "Ilość musi być większa niż 0.",
-  "sales.documents.detail.items.errorQuantityBelowShipped": "Nie można obniżyć ilości poniżej {{shipped}} już wysłanych.",
   "sales.documents.detail.items.errorSave": "Nie udało się zapisać pozycji.",
   "sales.documents.detail.items.errorUnitPrice": "Cena jednostkowa musi być większa niż 0.",
   "sales.documents.detail.items.errorVariantRequired": "Wybierz wariant, aby kontynuować.",
@@ -953,10 +950,8 @@
   "sales.documents.items.errorDeleteShipped": "Nie można usunąć pozycji, która ma wysłane sztuki.",
   "sales.documents.items.errorLoad": "Nie udało się załadować pozycji.",
   "sales.documents.items.errorNameRequired": "Nazwa jest wymagana dla niestandardowych pozycji.",
-  "sales.documents.items.errorPriceShipped": "Nie można zmienić ceny ani jednostki pozycji, która ma wysłane sztuki.",
   "sales.documents.items.errorProductRequired": "Wybierz produkt, aby kontynuować.",
   "sales.documents.items.errorQuantity": "Ilość musi być większa niż 0.",
-  "sales.documents.items.errorQuantityBelowShipped": "Nie można obniżyć ilości poniżej {{shipped}} już wysłanych.",
   "sales.documents.items.errorSave": "Nie udało się zapisać pozycji.",
   "sales.documents.items.errorScope": "Wymagane są organizacja i najemca.",
   "sales.documents.items.errorUnitPrice": "Cena jednostkowa musi być większa niż 0.",

package/src/modules/sales/lib/shipments/snapshots.ts

@@ -136,34 +136,4 @@ export const refreshShipmentItemsSnapshot = async (
   return snapshot
 }
 
-export const loadShippedQuantityByLine = async (
-  em: EntityManager,
-  orderId: string,
-  scope: { tenantId: string; organizationId: string },
-): Promise<Map<string, number>> => {
-  const shipments = await findWithDecryption(
-    em,
-    SalesShipment,
-    { order: orderId, deletedAt: null },
-    {},
-    scope,
-  )
-  const shippedByLine = new Map<string, number>()
-  if (!shipments.length) return shippedByLine
-  const items = await findWithDecryption(
-    em,
-    SalesShipmentItem,
-    { shipment: { $in: shipments.map((shipment) => shipment.id) } },
-    {},
-    scope,
-  )
-  items.forEach((item) => {
-    const orderLineId = typeof item.orderLine === 'string' ? item.orderLine : (item.orderLine?.id ?? null)
-    if (!orderLineId) return
-    const next = (shippedByLine.get(orderLineId) ?? 0) + coerceShipmentQuantity(item.quantity)
-    shippedByLine.set(orderLineId, next)
-  })
-  return shippedByLine
-}
-
 export type { ShipmentItemSnapshot } from './types'

package/src/modules/staff/backend/staff/team-members/[id]/page.tsx

@@ -5,7 +5,6 @@ import Link from 'next/link'
 import { usePathname, useRouter, useSearchParams } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { Button } from '@open-mercato/ui/primitives/button'
-import { Tabs, TabsList, TabsTrigger } from '@open-mercato/ui/primitives/tabs'
 import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields-client'
 import { updateCrud, deleteCrud } from '@open-mercato/ui/backend/utils/crud'
@@ -433,22 +432,29 @@ export default function StaffTeamMemberDetailPage({ params }: { params?: { id?:
             </div>
           </div>
 
-          <Tabs
-            value={activePanel}
-            onValueChange={(value) => setActivePanel(value as 'details' | 'availability' | 'jobHistory')}
-            variant="underline"
-          >
-            <TabsList
-              className="w-full flex-wrap"
+          <div className="border-b">
+            <nav
+              className="flex flex-wrap items-center gap-5 text-sm"
               aria-label={t('staff.teamMembers.detail.tabs.label', 'Team member sections')}
             >
               {panelTabs.map((tab) => (
-                <TabsTrigger key={tab.id} value={tab.id}>
+                <button
+                  key={tab.id}
+                  type="button"
+                  role="tab"
+                  aria-selected={activePanel === tab.id}
+                  onClick={() => setActivePanel(tab.id)}
+                  className={`relative -mb-px border-b-2 px-0 py-2 text-sm font-medium transition-colors ${
+                    activePanel === tab.id
+                      ? 'border-accent-indigo text-foreground'
+                      : 'border-transparent text-muted-foreground hover:text-foreground'
+                  }`}
+                >
                   {tab.label}
-                </TabsTrigger>
+                </button>
               ))}
-            </TabsList>
-          </Tabs>
+            </nav>
+          </div>
 
           {activePanel === 'details' ? (
             <>
@@ -494,19 +500,22 @@ export default function StaffTeamMemberDetailPage({ params }: { params?: { id?:
 
                   <div className="rounded-lg border bg-card p-4">
                     <div className="flex flex-wrap items-center justify-between gap-3">
-                      <Tabs
-                        value={activeTab}
-                        onValueChange={(value) => setActiveTab(value as 'notes' | 'activities' | 'addresses')}
-                        variant="underline"
-                      >
-                        <TabsList className="h-auto flex-wrap border-b-0">
-                          {tabs.map((tab) => (
-                            <TabsTrigger key={tab.id} value={tab.id}>
-                              {tab.label}
-                            </TabsTrigger>
-                          ))}
-                        </TabsList>
-                      </Tabs>
+                      <div className="flex gap-2">
+                        {tabs.map((tab) => (
+                          <button
+                            key={tab.id}
+                            type="button"
+                            onClick={() => setActiveTab(tab.id)}
+                            className={`relative -mb-px border-b-2 px-0 py-1 text-sm font-medium transition-colors ${
+                              activeTab === tab.id
+                                ? 'border-accent-indigo text-foreground'
+                                : 'border-transparent text-muted-foreground hover:text-foreground'
+                            }`}
+                          >
+                            {tab.label}
+                          </button>
+                        ))}
+                      </div>
                       {sectionAction ? (
                         <Button
                           type="button"

package/src/modules/staff/backend/staff/teams/[id]/edit/page.tsx

@@ -12,7 +12,6 @@ import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimi
 import { DataTable, withDataTableNamespaces } from '@open-mercato/ui/backend/DataTable'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { Button } from '@open-mercato/ui/primitives/button'
-import { Tabs, TabsList, TabsTrigger } from '@open-mercato/ui/primitives/tabs'
 import { BooleanIcon } from '@open-mercato/ui/backend/ValueIcons'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -363,22 +362,29 @@ export default function StaffTeamEditPage({ params }: { params?: { id?: string }
     <Page>
       <PageBody>
         <div className="space-y-6">
-          <Tabs
-            value={activeTab}
-            onValueChange={(value) => setActiveTab(value as 'details' | 'members')}
-            variant="underline"
-          >
-            <TabsList className="w-full flex-wrap" aria-label={memberLabels.tabs.label}>
+          <div className="border-b">
+            <nav className="flex flex-wrap items-center gap-5 text-sm" aria-label={memberLabels.tabs.label}>
               {[
                 { id: 'details', label: memberLabels.tabs.details },
                 { id: 'members', label: memberLabels.tabs.members },
               ].map((tab) => (
-                <TabsTrigger key={tab.id} value={tab.id}>
+                <button
+                  key={tab.id}
+                  type="button"
+                  role="tab"
+                  aria-selected={activeTab === tab.id}
+                  onClick={() => setActiveTab(tab.id as 'details' | 'members')}
+                  className={`relative -mb-px border-b-2 px-0 py-2 text-sm font-medium transition-colors ${
+                    activeTab === tab.id
+                      ? 'border-accent-indigo text-foreground'
+                      : 'border-transparent text-muted-foreground hover:text-foreground'
+                  }`}
+                >
                   {tab.label}
-                </TabsTrigger>
+                </button>
               ))}
-            </TabsList>
-          </Tabs>
+            </nav>
+          </div>
 
           {activeTab === 'details' ? (
             <TeamForm

package/src/modules/staff/lib/timesheets-projects-ui/SavedViewTabs.tsx

@@ -1,7 +1,7 @@
 "use client"
 
 import * as React from 'react'
-import { Tabs, TabsList, TabsTrigger } from '@open-mercato/ui/primitives/tabs'
+import { Button } from '@open-mercato/ui/primitives/button'
 
 export type SavedViewTab = {
   id: string
@@ -19,18 +19,35 @@ export type SavedViewTabsProps = {
 
 export function SavedViewTabs({ tabs, activeId, onSelect, className, ariaLabel }: SavedViewTabsProps) {
   return (
-    <Tabs value={activeId} onValueChange={onSelect} variant="underline" className={className}>
-      <TabsList className="w-full flex-wrap" aria-label={ariaLabel ?? 'Saved views'}>
-        {tabs.map((tab) => (
-          <TabsTrigger
+    <div
+      role="tablist"
+      aria-label={ariaLabel ?? 'Saved views'}
+      className={`flex items-center gap-1 border-b border-border ${className ?? ''}`}
+    >
+      {tabs.map((tab) => {
+        const isActive = tab.id === activeId
+        return (
+          <Button
             key={tab.id}
-            value={tab.id}
-            count={typeof tab.count === 'number' ? tab.count : undefined}
+            type="button"
+            variant="ghost"
+            size="sm"
+            role="tab"
+            aria-selected={isActive}
+            className={`h-auto rounded-none px-3 py-2 text-sm hover:bg-transparent ${
+              isActive
+                ? 'border-b-2 border-foreground font-medium text-foreground'
+                : 'border-b-2 border-transparent text-muted-foreground hover:text-foreground'
+            }`}
+            onClick={() => onSelect(tab.id)}
           >
             {tab.label}
-          </TabsTrigger>
-        ))}
-      </TabsList>
-    </Tabs>
+            {typeof tab.count === 'number' ? (
+              <span className="ml-1.5 text-xs text-muted-foreground/70 tabular-nums">{tab.count}</span>
+            ) : null}
+          </Button>
+        )
+      })}
+    </div>
   )
 }

package/src/modules/sync_excel/lib/adapters/customers.ts

@@ -17,8 +17,8 @@ import { CustomerAddress, CustomerEntity } from '../../../customers/data/entitie
 import { Attachment } from '../../../attachments/data/entities'
 import { CustomFieldDef } from '../../../entities/data/entities'
 import { SyncExcelUpload } from '../../data/entities'
-import { parseCsvDocumentBatches, parseCsvStreamMetadata, type CsvPreviewRow } from '../parser'
-import { createSyncExcelUploadReadStream } from '../upload-storage'
+import { parseCsvDocument, type CsvPreviewRow } from '../parser'
+import { readSyncExcelUploadBuffer } from '../upload-storage'
 import { E } from '#generated/entities.ids.generated'
 
 type SyncExcelCursor = {
@@ -785,16 +785,20 @@ async function resolveExistingPersonId(params: {
   return params.emailDedupeIndex.get(params.email) ?? null
 }
 
-function mappingHasEmailField(mapping: DataMapping): boolean {
-  return mapping.fields.some((field) => field.localField === 'person.primaryEmail')
-}
-
 async function buildEmailDedupeIndex(params: {
   em: EntityManager
+  rows: CsvPreviewRow[]
   mapping: DataMapping
   scope: TenantScope
 }): Promise<EmailDedupeIndex> {
-  if (!mappingHasEmailField(params.mapping)) return new Map()
+  const emails = new Set<string>()
+  for (const row of params.rows) {
+    const rowValues = mapRowValues(row, params.mapping.fields)
+    const email = rowValues.values.primaryEmail
+    if (email) emails.add(email)
+  }
+
+  if (emails.size === 0) return new Map()
 
   const candidates = await findWithDecryption(
     params.em,
@@ -817,7 +821,7 @@ async function buildEmailDedupeIndex(params: {
   const index: EmailDedupeIndex = new Map()
   for (const candidate of candidates) {
     const email = normalizeEmail(candidate.primaryEmail)
-    if (!email || index.has(email)) continue
+    if (!email || !emails.has(email) || index.has(email)) continue
     index.set(email, candidate.id)
   }
   return index
@@ -1039,28 +1043,26 @@ export const syncExcelCustomersAdapter: DataSyncAdapter = {
         throw new Error('CSV upload attachment could not be found.')
       }
 
-      const document = await parseCsvStreamMetadata(await createSyncExcelUploadReadStream(attachment))
+      const fileBuffer = await readSyncExcelUploadBuffer(attachment)
+      const document = parseCsvDocument(fileBuffer)
       const startOffset = cursor?.uploadId === upload.id ? cursor.offset : 0
       const commandContext = buildCommandContext(container, input.scope)
       const customFieldDefinitions = await loadImportCustomFieldDefinitions(em, input.scope)
       const emailDedupeIndex = await buildEmailDedupeIndex({
         em,
+        rows: document.rows.slice(startOffset),
         mapping: input.mapping,
         scope: input.scope,
       })
-      let batchIndex = 0
 
-      for await (const batch of parseCsvDocumentBatches(await createSyncExcelUploadReadStream(attachment), {
-        batchSize: input.batchSize,
-        startOffset,
-      })) {
-        const batchRows = batch.rows
+      for (let offset = startOffset, batchIndex = 0; offset < document.rows.length; offset += input.batchSize, batchIndex += 1) {
+        const batchRows = document.rows.slice(offset, offset + input.batchSize)
         const items: ImportItem[] = []
 
         for (let index = 0; index < batchRows.length; index += 1) {
           items.push(await processRow({
             row: batchRows[index],
-            rowNumber: batch.rowStart + index + 1,
+            rowNumber: offset + index + 1,
             mapping: input.mapping,
             scope: input.scope,
             commandBus,
@@ -1072,17 +1074,17 @@ export const syncExcelCustomersAdapter: DataSyncAdapter = {
           }))
         }
 
+        const nextOffset = offset + batchRows.length
         yield {
           items,
-          cursor: createCursor(upload.id, batch.nextOffset),
-          hasMore: batch.nextOffset < document.totalRows,
+          cursor: createCursor(upload.id, nextOffset),
+          hasMore: nextOffset < document.rows.length,
           totalEstimate: document.totalRows,
           processedCount: batchRows.length,
           refreshCoverageEntityTypes: CUSTOMER_IMPORT_COVERAGE_ENTITY_TYPES,
           batchIndex,
-          message: `Processed ${batch.nextOffset} of ${document.totalRows} CSV rows`,
+          message: `Processed ${nextOffset} of ${document.totalRows} CSV rows`,
         }
-        batchIndex += 1
       }
 
       upload.status = 'completed'