@open-mercato/core 0.6.6-develop.6257.1.6d0af84d26 → 0.6.6-develop.6286.1.d985c5c374

package/src/modules/shipping_carriers/migrations/.snapshot-open-mercato.json

@@ -4,6 +4,177 @@
     "public"
   ],
   "tables": [
+    {
+      "name": "carrier_shipment_idempotency_keys",
+      "schema": "public",
+      "columns": {
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamptz(6)",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "unique": false,
+          "length": 6,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "datetime"
+        },
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": true,
+          "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": "gen_random_uuid()",
+          "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "uuid"
+        },
+        "idempotency_key": {
+          "name": "idempotency_key",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "unique": true,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "text"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "uuid"
+        },
+        "provider_key": {
+          "name": "provider_key",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "text"
+        },
+        "request_hash": {
+          "name": "request_hash",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "text"
+        },
+        "shipment_id": {
+          "name": "shipment_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "uuid"
+        },
+        "tenant_id": {
+          "name": "tenant_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "uuid"
+        }
+      },
+      "indexes": [
+        {
+          "columnNames": [
+            "id"
+          ],
+          "composite": false,
+          "constraint": true,
+          "keyName": "carrier_shipment_idempotency_keys_pkey",
+          "primary": true,
+          "unique": true
+        },
+        {
+          "columnNames": [
+            "idempotency_key",
+            "provider_key",
+            "organization_id",
+            "tenant_id"
+          ],
+          "composite": true,
+          "constraint": true,
+          "keyName": "carrier_shipment_idempotency_keys_unique",
+          "primary": false,
+          "unique": true
+        }
+      ],
+      "checks": [],
+      "triggers": [],
+      "foreignKeys": {},
+      "comment": null
+    },
     {
       "name": "carrier_shipments",
       "schema": "public",
@@ -21,6 +192,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -37,6 +209,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -53,6 +226,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -69,6 +243,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -85,6 +260,7 @@
           "scale": null,
           "default": "gen_random_uuid()",
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -101,6 +277,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -117,6 +294,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -133,6 +311,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -149,6 +328,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -165,6 +345,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -181,6 +362,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -197,6 +379,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -213,6 +396,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -229,6 +413,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "json"
         },
@@ -245,6 +430,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -261,6 +447,7 @@
           "scale": null,
           "default": "'label_created'",
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -277,6 +464,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         }
@@ -330,6 +518,7 @@
         }
       ],
       "checks": [],
+      "triggers": [],
       "foreignKeys": {},
       "comment": null
     },
@@ -350,6 +539,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -366,6 +556,7 @@
           "scale": null,
           "default": "gen_random_uuid()",
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -382,6 +573,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -398,6 +590,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -414,6 +607,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -430,6 +624,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -446,6 +641,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         }
@@ -476,6 +672,7 @@
         }
       ],
       "checks": [],
+      "triggers": [],
       "foreignKeys": {},
       "comment": null
     }

package/src/modules/shipping_carriers/migrations/Migration20260618173616_shipping_carriers.ts

@@ -0,0 +1,14 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260618173616_shipping_carriers extends Migration {
+
+  override up(): void | Promise<void> {
+    this.addSql(`create table "carrier_shipment_idempotency_keys" ("id" uuid not null default gen_random_uuid(), "provider_key" text not null, "idempotency_key" text not null, "request_hash" text not null, "shipment_id" uuid null, "organization_id" uuid not null, "tenant_id" uuid not null, "created_at" timestamptz not null, primary key ("id"));`);
+    this.addSql(`alter table "carrier_shipment_idempotency_keys" add constraint "carrier_shipment_idempotency_keys_unique" unique ("idempotency_key", "provider_key", "organization_id", "tenant_id");`);
+  }
+
+  override down(): void | Promise<void> {
+    this.addSql(`drop table if exists "carrier_shipment_idempotency_keys";`);
+  }
+
+}

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

@@ -977,6 +977,7 @@
   "staff.timesheets.my.errors.updateAssignment": "Failed to update projects.",
   "staff.timesheets.my.list.addDescription": "Add description",
   "staff.timesheets.my.list.noEntries": "No entries for this period.",
+  "staff.timesheets.my.list.saveError": "Beschreibung konnte nicht gespeichert werden. Bitte versuchen Sie es erneut.",
   "staff.timesheets.my.list.today": "Today",
   "staff.timesheets.my.list.yesterday": "Yesterday",
   "staff.timesheets.my.loading": "Loading timesheets...",

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

@@ -977,6 +977,7 @@
   "staff.timesheets.my.errors.updateAssignment": "Failed to update projects.",
   "staff.timesheets.my.list.addDescription": "Add description",
   "staff.timesheets.my.list.noEntries": "No entries for this period.",
+  "staff.timesheets.my.list.saveError": "Failed to save description. Please try again.",
   "staff.timesheets.my.list.today": "Today",
   "staff.timesheets.my.list.yesterday": "Yesterday",
   "staff.timesheets.my.loading": "Loading timesheets...",

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

@@ -977,6 +977,7 @@
   "staff.timesheets.my.errors.updateAssignment": "Failed to update projects.",
   "staff.timesheets.my.list.addDescription": "Add description",
   "staff.timesheets.my.list.noEntries": "No entries for this period.",
+  "staff.timesheets.my.list.saveError": "No se pudo guardar la descripción. Inténtalo de nuevo.",
   "staff.timesheets.my.list.today": "Today",
   "staff.timesheets.my.list.yesterday": "Yesterday",
   "staff.timesheets.my.loading": "Loading timesheets...",

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

@@ -977,6 +977,7 @@
   "staff.timesheets.my.errors.updateAssignment": "Failed to update projects.",
   "staff.timesheets.my.list.addDescription": "Add description",
   "staff.timesheets.my.list.noEntries": "No entries for this period.",
+  "staff.timesheets.my.list.saveError": "Nie udało się zapisać opisu. Spróbuj ponownie.",
   "staff.timesheets.my.list.today": "Today",
   "staff.timesheets.my.list.yesterday": "Yesterday",
   "staff.timesheets.my.loading": "Loading timesheets...",

package/src/modules/staff/lib/timesheets-ui/ListView.tsx

@@ -3,7 +3,9 @@
 import * as React from 'react'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import type { TranslateFn } from '@open-mercato/shared/lib/i18n/context'
-import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCallOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
+import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { ProjectColorDot } from './ProjectColorDot'
 
 type TimeEntry = {
@@ -86,6 +88,7 @@ function InlineDescription({
   placeholder: string
   onSaved?: () => void
 }) {
+  const t = useT()
   const [editing, setEditing] = React.useState(false)
   const [value, setValue] = React.useState(initialValue ?? '')
   const [saving, setSaving] = React.useState(false)
@@ -103,19 +106,24 @@ function InlineDescription({
     }
     setSaving(true)
     try {
-      await apiCall(`/api/staff/timesheets/time-entries`, {
+      await apiCallOrThrow(`/api/staff/timesheets/time-entries`, {
         method: 'PUT',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ id: entryId, notes: trimmed || null }),
       })
-      onSaved?.()
-    } catch {
-      // silent
-    } finally {
       setSaving(false)
       setEditing(false)
+      onSaved?.()
+    } catch (err) {
+      setSaving(false)
+      if (!surfaceRecordConflict(err, t)) {
+        flash(
+          t('staff.timesheets.my.list.saveError', 'Failed to save description. Please try again.'),
+          'error',
+        )
+      }
     }
-  }, [entryId, value, initialValue, onSaved])
+  }, [entryId, value, initialValue, onSaved, t])
 
   if (!editing) {
     return (

package/src/modules/translations/components/TranslationManager.tsx

@@ -3,6 +3,8 @@
 import * as React from 'react'
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
 import { Button } from '@open-mercato/ui/primitives/button'
+import { IconButton } from '@open-mercato/ui/primitives/icon-button'
+import { Tabs, TabsList, TabsTrigger } from '@open-mercato/ui/primitives/tabs'
 import { Input } from '@open-mercato/ui/primitives/input'
 import { ComboboxInput } from '@open-mercato/ui/backend/inputs'
 import { LoadingMessage, ErrorMessage } from '@open-mercato/ui/backend/detail'
@@ -337,27 +339,15 @@ export function TranslationManager({
   }
 
   const renderLocaleTabs = () => (
-    <div className="flex gap-1 border-b">
-      {locales.map((locale) => {
-        const isActive = activeLocale === locale
-        return (
-          <button
-            key={locale}
-            type="button"
-            data-state={isActive ? 'active' : 'inactive'}
-            data-locale={locale}
-            className={`px-3 py-1.5 text-sm font-medium transition-colors ${
-              isActive
-                ? 'border-b-2 border-accent-indigo text-foreground'
-                : 'text-muted-foreground hover:text-foreground'
-            }`}
-            onClick={() => setActiveLocale(locale)}
-          >
+    <Tabs variant="underline" value={activeLocale} onValueChange={setActiveLocale}>
+      <TabsList>
+        {locales.map((locale) => (
+          <TabsTrigger key={locale} value={locale}>
             {locale.toUpperCase()}
-          </button>
-        )
-      })}
-    </div>
+          </TabsTrigger>
+        ))}
+      </TabsList>
+    </Tabs>
   )
 
   const renderFieldTable = () => {
@@ -647,14 +637,17 @@ export function LocaleManager() {
           >
             {locale.toUpperCase()}{getIso639Label(locale) ? ` — ${getIso639Label(locale)}` : ''}
             {locales.length > 1 && (
-              <button
-                type="button"
-                className="rounded-full p-0.5 text-muted-foreground hover:text-foreground transition-colors"
+              <IconButton
+                variant="ghost"
+                size="xs"
+                fullRadius
+                aria-label={t('translations.locales.remove', 'Remove {{locale}}', { locale: getIso639Label(locale) ?? locale.toUpperCase() })}
+                title={t('translations.locales.remove', 'Remove {{locale}}', { locale: getIso639Label(locale) ?? locale.toUpperCase() })}
                 onClick={() => removeLocale(locale)}
                 disabled={mutation.isPending}
               >
                 <X className="h-3 w-3" />
-              </button>
+              </IconButton>
             )}
           </span>
         ))}

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

@@ -6,6 +6,7 @@
   "translations.locales.flash.error": "Fehler beim Aktualisieren der Sprachen",
   "translations.locales.flash.saved": "Sprachen aktualisiert",
   "translations.locales.loading": "Sprachen werden geladen...",
+  "translations.locales.remove": "{{locale}} entfernen",
   "translations.locales.title": "Unterstützte Sprachen",
   "translations.manager.actions.retry": "Erneut versuchen",
   "translations.manager.actions.save": "Übersetzungen speichern",

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

@@ -6,6 +6,7 @@
   "translations.locales.flash.error": "Failed to update locales",
   "translations.locales.flash.saved": "Locales updated",
   "translations.locales.loading": "Loading locales...",
+  "translations.locales.remove": "Remove {{locale}}",
   "translations.locales.title": "Supported locales",
   "translations.manager.actions.retry": "Retry",
   "translations.manager.actions.save": "Save translations",

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

@@ -6,6 +6,7 @@
   "translations.locales.flash.error": "Error al actualizar los idiomas",
   "translations.locales.flash.saved": "Idiomas actualizados",
   "translations.locales.loading": "Cargando idiomas...",
+  "translations.locales.remove": "Eliminar {{locale}}",
   "translations.locales.title": "Idiomas soportados",
   "translations.manager.actions.retry": "Reintentar",
   "translations.manager.actions.save": "Guardar traducciones",

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

@@ -6,6 +6,7 @@
   "translations.locales.flash.error": "Nie udało się zaktualizować języków",
   "translations.locales.flash.saved": "Języki zaktualizowane",
   "translations.locales.loading": "Ładowanie języków...",
+  "translations.locales.remove": "Usuń {{locale}}",
   "translations.locales.title": "Obsługiwane języki",
   "translations.manager.actions.retry": "Ponów",
   "translations.manager.actions.save": "Zapisz tłumaczenia",