@open-mercato/core 0.6.6-develop.6314.1.c7b8291aa2 → 0.6.6-develop.6330.1.a261878aa8

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

@@ -70,5 +70,15 @@
   "shipping_carriers.create.summary.to": "Nach",
   "shipping_carriers.create.title": "Sendung beim Transporteur erstellen",
   "shipping_carriers.feature.manage": "Versanddienstleister-Vorgaenge verwalten",
-  "shipping_carriers.feature.view": "Sendungen der Versanddienstleister anzeigen"
+  "shipping_carriers.feature.view": "Sendungen der Versanddienstleister anzeigen",
+  "shipping_carriers.status.cancelled": "Storniert",
+  "shipping_carriers.status.delivered": "Zugestellt",
+  "shipping_carriers.status.failed_delivery": "Zustellung fehlgeschlagen",
+  "shipping_carriers.status.in_transit": "Unterwegs",
+  "shipping_carriers.status.label_created": "Label erstellt",
+  "shipping_carriers.status.out_for_delivery": "In Zustellung",
+  "shipping_carriers.status.pending": "Ausstehend",
+  "shipping_carriers.status.picked_up": "Abgeholt",
+  "shipping_carriers.status.returned": "Zuruckgesendet",
+  "shipping_carriers.status.unknown": "Unbekannt"
 }

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

@@ -70,5 +70,15 @@
   "shipping_carriers.create.summary.to": "To",
   "shipping_carriers.create.title": "Create carrier shipment",
   "shipping_carriers.feature.manage": "Manage shipping carrier operations",
-  "shipping_carriers.feature.view": "View shipping carrier shipments"
+  "shipping_carriers.feature.view": "View shipping carrier shipments",
+  "shipping_carriers.status.cancelled": "Cancelled",
+  "shipping_carriers.status.delivered": "Delivered",
+  "shipping_carriers.status.failed_delivery": "Delivery failed",
+  "shipping_carriers.status.in_transit": "In transit",
+  "shipping_carriers.status.label_created": "Label created",
+  "shipping_carriers.status.out_for_delivery": "Out for delivery",
+  "shipping_carriers.status.pending": "Pending",
+  "shipping_carriers.status.picked_up": "Picked up",
+  "shipping_carriers.status.returned": "Returned",
+  "shipping_carriers.status.unknown": "Unknown"
 }

package/src/modules/shipping_carriers/i18n/en.ts

@@ -4,4 +4,14 @@ export default {
   'shipping_carriers.column.trackingStatus': 'Tracking status',
   'shipping_carriers.column.shippingStatus': 'Shipping status',
   'shipping_carriers.action.createShipment': 'Create shipment',
+  'shipping_carriers.status.cancelled': 'Cancelled',
+  'shipping_carriers.status.delivered': 'Delivered',
+  'shipping_carriers.status.failed_delivery': 'Delivery failed',
+  'shipping_carriers.status.in_transit': 'In transit',
+  'shipping_carriers.status.label_created': 'Label created',
+  'shipping_carriers.status.out_for_delivery': 'Out for delivery',
+  'shipping_carriers.status.pending': 'Pending',
+  'shipping_carriers.status.picked_up': 'Picked up',
+  'shipping_carriers.status.returned': 'Returned',
+  'shipping_carriers.status.unknown': 'Unknown',
 }

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

@@ -70,5 +70,15 @@
   "shipping_carriers.create.summary.to": "Hasta",
   "shipping_carriers.create.title": "Crear envio con transportista",
   "shipping_carriers.feature.manage": "Gestionar operaciones de transportistas",
-  "shipping_carriers.feature.view": "Ver envios de transportistas"
+  "shipping_carriers.feature.view": "Ver envios de transportistas",
+  "shipping_carriers.status.cancelled": "Cancelado",
+  "shipping_carriers.status.delivered": "Entregado",
+  "shipping_carriers.status.failed_delivery": "Entrega fallida",
+  "shipping_carriers.status.in_transit": "En transito",
+  "shipping_carriers.status.label_created": "Etiqueta creada",
+  "shipping_carriers.status.out_for_delivery": "En reparto",
+  "shipping_carriers.status.pending": "Pendiente",
+  "shipping_carriers.status.picked_up": "Recogido",
+  "shipping_carriers.status.returned": "Devuelto",
+  "shipping_carriers.status.unknown": "Desconocido"
 }

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

@@ -70,5 +70,15 @@
   "shipping_carriers.create.summary.to": "Odbiór",
   "shipping_carriers.create.title": "Utwórz przesyłkę u przewoźnika",
   "shipping_carriers.feature.manage": "Zarzadzanie operacjami przewoznikow",
-  "shipping_carriers.feature.view": "Podglad przesylek przewoznikow"
+  "shipping_carriers.feature.view": "Podglad przesylek przewoznikow",
+  "shipping_carriers.status.cancelled": "Anulowano",
+  "shipping_carriers.status.delivered": "Doreczono",
+  "shipping_carriers.status.failed_delivery": "Doreczenie nieudane",
+  "shipping_carriers.status.in_transit": "W transporcie",
+  "shipping_carriers.status.label_created": "Etykieta utworzona",
+  "shipping_carriers.status.out_for_delivery": "W doreczeniu",
+  "shipping_carriers.status.pending": "Oczekuje",
+  "shipping_carriers.status.picked_up": "Odebrano",
+  "shipping_carriers.status.returned": "Zwrocono",
+  "shipping_carriers.status.unknown": "Nieznany"
 }

package/src/modules/shipping_carriers/i18n/pl.ts

@@ -4,4 +4,14 @@ export default {
   'shipping_carriers.column.trackingStatus': 'Status śledzenia',
   'shipping_carriers.column.shippingStatus': 'Status wysyłki',
   'shipping_carriers.action.createShipment': 'Utwórz przesyłkę',
+  'shipping_carriers.status.cancelled': 'Anulowano',
+  'shipping_carriers.status.delivered': 'Doręczono',
+  'shipping_carriers.status.failed_delivery': 'Doręczenie nieudane',
+  'shipping_carriers.status.in_transit': 'W transporcie',
+  'shipping_carriers.status.label_created': 'Etykieta utworzona',
+  'shipping_carriers.status.out_for_delivery': 'W doręczeniu',
+  'shipping_carriers.status.pending': 'Oczekuje',
+  'shipping_carriers.status.picked_up': 'Odebrano',
+  'shipping_carriers.status.returned': 'Zwrócono',
+  'shipping_carriers.status.unknown': 'Nieznany',
 }

package/src/modules/shipping_carriers/widgets/injection/tracking-status-badge/widget.client.tsx

@@ -0,0 +1,35 @@
+'use client'
+
+import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { StatusBadge, type StatusMap } from '@open-mercato/ui/primitives/status-badge'
+import type { UnifiedShipmentStatus } from '../../../lib/adapter'
+
+type ShippingStatus = UnifiedShipmentStatus | 'pending'
+
+const shippingStatusVariantMap: StatusMap<ShippingStatus> = {
+  pending: 'neutral',
+  label_created: 'info',
+  picked_up: 'info',
+  in_transit: 'info',
+  out_for_delivery: 'info',
+  delivered: 'success',
+  failed_delivery: 'error',
+  returned: 'warning',
+  cancelled: 'error',
+  unknown: 'neutral',
+}
+
+export type ShippingStatusBadgeWidgetProps = {
+  status: string
+}
+
+export default function ShippingStatusBadgeWidget({ status }: ShippingStatusBadgeWidgetProps) {
+  const t = useT()
+  const variant = shippingStatusVariantMap[status as ShippingStatus] ?? 'neutral'
+
+  return (
+    <StatusBadge variant={variant} dot>
+      {t(`shipping_carriers.status.${status}`, status)}
+    </StatusBadge>
+  )
+}

package/src/modules/shipping_carriers/widgets/injection/tracking-status-badge/widget.tsx

@@ -1,20 +1,6 @@
+import * as React from 'react'
 import type { InjectionColumnWidget } from '@open-mercato/shared/modules/widgets/injection'
-
-const SHIPPING_STATUS_COLORS: Record<string, string> = {
-  pending: 'bg-gray-100 text-gray-700',
-  label_created: 'bg-slate-100 text-slate-700',
-  picked_up: 'bg-sky-100 text-sky-700',
-  in_transit: 'bg-blue-100 text-blue-700',
-  out_for_delivery: 'bg-indigo-100 text-indigo-700',
-  delivered: 'bg-green-100 text-green-700',
-  returned: 'bg-amber-100 text-amber-700',
-  cancelled: 'bg-red-100 text-red-700',
-  failed_delivery: 'bg-orange-100 text-orange-700',
-}
-
-function formatShippingStatusLabel(value: string): string {
-  return value.replace(/_/g, ' ')
-}
+import ShippingStatusBadgeWidget from './widget.client'
 
 const widget: InjectionColumnWidget = {
   metadata: {
@@ -30,12 +16,7 @@ const widget: InjectionColumnWidget = {
       cell: ({ getValue }) => {
         const value = getValue()
         if (typeof value !== 'string' || value.length === 0) return null
-        const colors = SHIPPING_STATUS_COLORS[value] ?? 'bg-gray-100 text-gray-700'
-        return (
-          <span className={`inline-flex items-center rounded-full px-2 py-0.5 text-xs font-medium ${colors}`}>
-            {formatShippingStatusLabel(value)}
-          </span>
-        )
+        return React.createElement(ShippingStatusBadgeWidget, { status: value })
       },
     },
   ],

package/src/modules/translations/widgets/injection/translation-manager/widget.client.tsx

@@ -3,9 +3,12 @@
 import * as React from 'react'
 import { useParams } from 'next/navigation'
 import Link from 'next/link'
+import { useQuery } from '@tanstack/react-query'
 import { ExternalLink, Languages } from 'lucide-react'
 import type { InjectionWidgetComponentProps } from '@open-mercato/shared/modules/widgets/injection'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { hasAllFeatures } from '@open-mercato/shared/lib/auth/featureMatch'
+import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
 import { Button } from '@open-mercato/ui/primitives/button'
 import {
   Drawer,
@@ -21,20 +24,34 @@ import { extractRecordId } from '../../../lib/extract-record-id'
 type WidgetContext = { entityId?: string; recordId?: string }
 type WidgetData = Record<string, unknown> & { id?: string | number }
 
+type FeatureCheckResponse = {
+  ok: boolean
+  granted: string[]
+  userId: string
+}
+
+const TRANSLATION_ACCESS_FEATURES = ['translations.view']
+
+// Probe access through the shared apiCall/React Query path so multiple injected
+// widget instances dedupe a single request via the query key. feature-check
+// always answers 200 with the granted feature list, so a user without
+// translations.view is hidden gracefully — no login redirect, no forbidden flash.
 function useTranslationAccess(): boolean {
-  const [hasAccess, setHasAccess] = React.useState(false)
-  React.useEffect(() => {
-    let mounted = true
-    // Use the original fetch to bypass the global apiFetch wrapper
-    // that redirects to login on 403. This lets us gracefully hide the widget
-    // when the user lacks translations.view instead of crashing the page.
-    const nativeFetch = ((window as any).__omOriginalFetch as typeof fetch) || fetch
-    nativeFetch('/api/translations/locales', { credentials: 'include' })
-      .then((res) => { if (mounted) setHasAccess(res.ok) })
-      .catch(() => { if (mounted) setHasAccess(false) })
-    return () => { mounted = false }
-  }, [])
-  return hasAccess
+  const { data } = useQuery<boolean>({
+    queryKey: ['translations', 'widget-access', ...TRANSLATION_ACCESS_FEATURES],
+    queryFn: async () => {
+      const res = await apiCall<FeatureCheckResponse>('/api/auth/feature-check', {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ features: TRANSLATION_ACCESS_FEATURES }),
+      })
+      if (!res.ok) return false
+      return hasAllFeatures(TRANSLATION_ACCESS_FEATURES, res.result?.granted ?? [])
+    },
+    staleTime: 5 * 60 * 1000,
+    retry: false,
+  })
+  return data === true
 }
 
 export default function TranslationWidget({ context, data }: InjectionWidgetComponentProps<WidgetContext, WidgetData>) {