@spree/dashboard-core 6.0.2 → 6.0.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spree/dashboard-core",
   "license": "MIT",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "Spree Dashboard framework — registries (table, nav, slot, settings-nav), providers (auth, permission, store), admin SDK client, generic infra hooks, and the defineDashboardPlugin extension API.",
   "author": "Vendo Connect Inc.",
   "homepage": "https://spreecommerce.org",
@@ -49,8 +49,8 @@
     "LICENSE"
   ],
   "peerDependencies": {
-    "@spree/admin-sdk": ">=6.0.2 <7.0.0-0",
-    "@spree/dashboard-ui": ">=6.0.2 <7.0.0-0",
+    "@spree/admin-sdk": ">=6.0.3 <7.0.0-0",
+    "@spree/dashboard-ui": ">=6.0.3 <7.0.0-0",
     "@tanstack/react-query": "^5.100.9",
     "@tanstack/react-router": "^1.169.2",
     "i18next": "^26.2.0",
@@ -60,17 +60,17 @@
     "react-i18next": "^17.0.8"
   },
   "dependencies": {
-    "@dnd-kit/core": "^6.3.1",
-    "@dnd-kit/sortable": "^10.0.0",
-    "@dnd-kit/utilities": "^3.2.2",
+    "@dnd-kit/core": "6.3.1",
+    "@dnd-kit/sortable": "10.0.0",
+    "@dnd-kit/utilities": "3.2.2",
     "@hookform/resolvers": "^6.0.0",
     "@tailwindcss/vite": "^4.2.4",
-    "@tanstack/react-hotkeys": "^0.16.0",
-    "date-fns": "^4.4.0",
-    "date-fns-tz": "^3.2.0",
-    "lucide-react": "^1.60.0",
+    "@tanstack/react-hotkeys": "0.16.0",
+    "date-fns": "4.4.0",
+    "date-fns-tz": "3.2.0",
+    "lucide-react": "1.60.0",
     "zod": "^4.6.7",
-    "@spree/core": "^6.0.2"
+    "@spree/core": "^6.0.3"
   },
   "devDependencies": {
     "@tanstack/react-query": "^5.104.5",
@@ -86,8 +86,8 @@
     "typescript": "~7.0.2",
     "vite": "^8.3.4",
     "vitest": "^5.0.5",
-    "@spree/admin-sdk": "^6.0.2",
-    "@spree/dashboard-ui": "^6.0.2"
+    "@spree/dashboard-ui": "^6.0.3",
+    "@spree/admin-sdk": "^6.0.3"
   },
   "scripts": {
     "lint": "biome check src",

package/src/components/product-stock-summary.tsx

@@ -0,0 +1,58 @@
+import { useTranslation } from 'react-i18next'
+
+/** The fields both panels' product payloads carry for a stock summary. */
+export interface ProductStockFields {
+  in_stock: boolean
+  backorderable: boolean
+  total_on_hand?: number | null
+  variant_count: number
+}
+
+/**
+ * Whether a product has stock, by its total rather than `in_stock`. Null is
+ * untracked stock, which is unlimited; undefined is a server too old to send
+ * a total, which leaves only the sellable flag to go by. Shared so every place
+ * that labels a product's stock agrees.
+ */
+export function productInStock(product: Pick<ProductStockFields, 'in_stock' | 'total_on_hand'>) {
+  const total = product.total_on_hand
+  return total === undefined ? product.in_stock : total === null || total > 0
+}
+
+/**
+ * A product's stock in a products list: how many units are on hand, on
+ * backorder, or out of stock, followed by the variant count when there are
+ * several. Shared by the admin and seller product lists.
+ *
+ * It reads the stock total rather than `in_stock`, which leaves out variants
+ * whose seller cannot sell yet: a pending seller's units on the shelf are in
+ * stock as far as inventory goes.
+ */
+export function ProductStockSummary({ product }: { product: ProductStockFields }) {
+  const { t } = useTranslation()
+  const total = product.total_on_hand
+
+  const status = productInStock(product) ? (
+    typeof total === 'number' ? (
+      t('admin.components.product_stock.in_stock', { count: total })
+    ) : (
+      t('admin.components.product_stock.in_stock_short')
+    )
+  ) : product.backorderable ? (
+    t('admin.components.product_stock.on_backorder')
+  ) : (
+    <span className="text-destructive">{t('admin.components.product_stock.out_of_stock')}</span>
+  )
+
+  return (
+    <span className="text-sm text-muted-foreground">
+      {status}
+      {product.variant_count > 1 && (
+        <>
+          {' · '}
+          {t('admin.components.product_stock.variants', { count: product.variant_count })}
+        </>
+      )}
+    </span>
+  )
+}

package/src/components/table-toolbar.tsx

@@ -1,4 +1,4 @@
-import type { FilterPredicate } from '@spree/core'
+import { type FilterPredicate, randomUUID } from '@spree/core'
 import {
   Button,
   Checkbox,
@@ -865,7 +865,7 @@ function QuickEnumFilter({
       onFiltersChange([
         ...others,
         {
-          id: existing?.id ?? crypto.randomUUID(),
+          id: existing?.id ?? randomUUID(),
           field: column.key,
           operator: 'in',
           value: values.join(','),
@@ -956,7 +956,7 @@ function QuickResourceFilter({
       onFiltersChange([
         ...others,
         {
-          id: existing?.id ?? crypto.randomUUID(),
+          id: existing?.id ?? randomUUID(),
           field: column.key,
           operator: 'in',
           value: values.join(','),
@@ -1039,14 +1039,14 @@ function QuickDateFilter({
       const next: FilterRule[] = [...others]
       if (rangeFrom) {
         next.push({
-          id: crypto.randomUUID(),
+          id: randomUUID(),
           field: column.key,
           operator: 'gteq',
           value: rangeFrom,
         })
       }
       if (rangeTo) {
-        next.push({ id: crypto.randomUUID(), field: column.key, operator: 'lteq', value: rangeTo })
+        next.push({ id: randomUUID(), field: column.key, operator: 'lteq', value: rangeTo })
       }
       onFiltersChange(next)
     },
@@ -1626,10 +1626,7 @@ function FilterPanel({
     const others = filters.filter(
       (f) => !(f.field === field && f.operator === nextOperator) && f.id !== editing,
     )
-    onApply([
-      ...others,
-      { id: crypto.randomUUID(), field, operator: nextOperator, value: nextValue },
-    ])
+    onApply([...others, { id: randomUUID(), field, operator: nextOperator, value: nextValue }])
   }
 
   /** Replace this field's bounds with a preset's, and close. */
@@ -1641,10 +1638,10 @@ function FilterPanel({
     )
     const next = [...others]
     if (range.from) {
-      next.push({ id: crypto.randomUUID(), field, operator: 'gteq', value: range.from })
+      next.push({ id: randomUUID(), field, operator: 'gteq', value: range.from })
     }
     if (range.to) {
-      next.push({ id: crypto.randomUUID(), field, operator: 'lteq', value: range.to })
+      next.push({ id: randomUUID(), field, operator: 'lteq', value: range.to })
     }
     onApply(next)
   }
@@ -1672,7 +1669,7 @@ function FilterPanel({
     onChange(
       next.length === 0
         ? others
-        : [...others, { id: crypto.randomUUID(), field, operator: 'in', value: next.join(',') }],
+        : [...others, { id: randomUUID(), field, operator: 'in', value: next.join(',') }],
     )
   }
 
@@ -1911,7 +1908,7 @@ function FilterPanel({
                   const next = [...others]
                   if (customRange.from) {
                     next.push({
-                      id: crypto.randomUUID(),
+                      id: randomUUID(),
                       field,
                       operator: 'gteq',
                       value: customRange.from,
@@ -1919,7 +1916,7 @@ function FilterPanel({
                   }
                   if (customRange.to) {
                     next.push({
-                      id: crypto.randomUUID(),
+                      id: randomUUID(),
                       field,
                       operator: 'lteq',
                       value: customRange.to,

package/src/index.ts

@@ -51,6 +51,7 @@ export * from './components/nav-main'
 export * from './components/page-header'
 export * from './components/page-tabs'
 export * from './components/preferences-form'
+export * from './components/product-stock-summary'
 export * from './components/record-metadata'
 export * from './components/resource-combobox'
 export * from './components/resource-multi-autocomplete'

package/src/locales/ar.json

@@ -493,6 +493,14 @@
         "discard_confirm": "تجاهل",
         "discard_message": "سيُفقد كل ما أدخلته حتى الآن، ولا يمكن التراجع عن ذلك.",
         "discard_title": "تجاهل هذه المسودة؟"
+      },
+      "product_stock": {
+        "out_of_stock": "إنتهى من المخزن",
+        "on_backorder": "على المؤجل",
+        "in_stock": "{{count}} في المخزون",
+        "in_stock_short": "في المخزون",
+        "variants_one": "{{count}} البديل",
+        "variants_other": "{{count}} متغيرات"
       }
     },
     "currency_amounts": {

package/src/locales/de.json

@@ -493,6 +493,14 @@
         "discard_confirm": "Verwerfen",
         "discard_message": "Alles bisher Eingegebene geht verloren. Das lässt sich nicht rückgängig machen.",
         "discard_title": "Entwurf verwerfen?"
+      },
+      "product_stock": {
+        "out_of_stock": "Nicht auf Lager",
+        "on_backorder": "Im Rückstand",
+        "in_stock": "{{count}} auf Lager",
+        "in_stock_short": "Auf Lager",
+        "variants_one": "{{count}} Variante",
+        "variants_other": "{{count}} Varianten"
       }
     },
     "currency_amounts": {

package/src/locales/en.json

@@ -495,6 +495,14 @@
         "discard_confirm": "Discard",
         "discard_message": "Everything you have filled in so far will be lost. This cannot be undone.",
         "discard_title": "Discard this draft?"
+      },
+      "product_stock": {
+        "out_of_stock": "Out of stock",
+        "on_backorder": "On backorder",
+        "in_stock": "{{count}} in stock",
+        "in_stock_short": "In stock",
+        "variants_one": "{{count}} variant",
+        "variants_other": "{{count}} variants"
       }
     },
     "currency_amounts": {

package/src/locales/es.json

@@ -306,6 +306,14 @@
         "discard_confirm": "Descartar",
         "discard_message": "Todo lo que completaste hasta ahora se perderá. Esta acción no se puede deshacer.",
         "discard_title": "¿Descartar este borrador?"
+      },
+      "product_stock": {
+        "out_of_stock": "Sin stock",
+        "on_backorder": "En contrarreserva",
+        "in_stock": "{{count}} en stock",
+        "in_stock_short": "Con stock",
+        "variants_one": "{{count}} variante",
+        "variants_other": "{{count}} variantes"
       }
     },
     "currency_amounts": {

package/src/locales/fr.json

@@ -493,6 +493,14 @@
         "discard_confirm": "Abandonner",
         "discard_message": "Tout ce que vous avez saisi sera perdu. Cette action est irréversible.",
         "discard_title": "Abandonner ce brouillon ?"
+      },
+      "product_stock": {
+        "out_of_stock": "En rupture de stock",
+        "on_backorder": "En réapprovisionnement",
+        "in_stock": "{{count}} en stock",
+        "in_stock_short": "En stock",
+        "variants_one": "{{count}} variante",
+        "variants_other": "{{count}} variantes"
       }
     },
     "currency_amounts": {

package/src/locales/ja.json

@@ -495,6 +495,14 @@
         "discard_confirm": "破棄",
         "discard_message": "ここまで入力した内容はすべて失われます。元に戻すことはできません。",
         "discard_title": "この下書きを破棄しますか？"
+      },
+      "product_stock": {
+        "out_of_stock": "在庫切れ",
+        "on_backorder": "入荷待ち",
+        "in_stock": "在庫 {{count}}",
+        "in_stock_short": "在庫あり",
+        "variants_one": "バリアント {{count}} 件",
+        "variants_other": "バリアント {{count}} 件"
       }
     },
     "currency_amounts": {

package/src/locales/pl.json

@@ -494,6 +494,16 @@
         "discard_confirm": "Odrzuć",
         "discard_message": "Wszystko, co zostało wprowadzone, zostanie utracone. Nie można tego cofnąć.",
         "discard_title": "Odrzucić szkic?"
+      },
+      "product_stock": {
+        "out_of_stock": "Brak w magazynie",
+        "on_backorder": "Na zamówienie",
+        "in_stock": "{{count}} w magazynie",
+        "in_stock_short": "W magazynie",
+        "variants_few": "{{count}} warianty",
+        "variants_many": "{{count}} wariantów",
+        "variants_one": "{{count}} wariant",
+        "variants_other": "{{count}} wariantów"
       }
     },
     "currency_amounts": {

package/src/locales/vi.json

@@ -495,6 +495,14 @@
         "discard_confirm": "Loại bỏ",
         "discard_message": "Mọi thứ bạn đã điền cho đến nay sẽ bị mất. Điều này không thể hoàn tác được.",
         "discard_title": "Hủy bản nháp này?"
+      },
+      "product_stock": {
+        "out_of_stock": "Hết hàng",
+        "on_backorder": "Đang đặt hàng trước",
+        "in_stock": "{{count}} còn hàng",
+        "in_stock_short": "Còn hàng",
+        "variants_one": "{{count}} biến thể",
+        "variants_other": "{{count}} biến thể"
       }
     },
     "currency_amounts": {

package/src/locales/zh-CN.json

@@ -493,6 +493,14 @@
         "discard_confirm": "放弃",
         "discard_message": "已填写的内容将全部丢失，且无法恢复。",
         "discard_title": "放弃此草稿？"
+      },
+      "product_stock": {
+        "out_of_stock": "缺货",
+        "on_backorder": "可延期交货",
+        "in_stock": "库存 {{count}} 件",
+        "in_stock_short": "有库存",
+        "variants_one": "{{count}} 个变体",
+        "variants_other": "{{count}} 个变体"
       }
     },
     "currency_amounts": {

package/src/products/product-form-cards.tsx

@@ -13,7 +13,7 @@ import {
   useSortable,
 } from '@dnd-kit/sortable'
 import { CSS } from '@dnd-kit/utilities'
-import type { CurrencyCode } from '@spree/core'
+import { type CurrencyCode, randomUUID } from '@spree/core'
 import type { MediaType, ProductFormValues } from '@spree/dashboard-core'
 import {
   getApiClient,
@@ -368,7 +368,7 @@ export function MediaCard({
     async (files: FileList | File[]) => {
       const fileArray = Array.from(files)
       for (const file of fileArray) {
-        const uploadId = crypto.randomUUID()
+        const uploadId = randomUUID()
         const preview = URL.createObjectURL(file)
         setPending((prev) => [...prev, { id: uploadId, file, preview, progress: 'uploading' }])
         try {
@@ -445,7 +445,7 @@ export function MediaCard({
           ...entries.map((entry, index) => ({
             ...entry,
             position: current.length + index + 1,
-            uploadId: crypto.randomUUID(),
+            uploadId: randomUUID(),
           })),
         ],
         { shouldDirty: true },

package/src/products/product-form-mapping.test.ts

@@ -1,11 +1,12 @@
 import { describe, expect, it } from 'vitest'
 import {
+  omitUnchangedListFields,
   prepareVariantsTaxForProductSave,
   variantHasTaxCategoryOverride,
   variantToFormValues,
   variantToWirePayload,
 } from './product-form-mapping'
-import type { VariantFormValues } from './product-schema'
+import type { ProductFormValues, VariantFormValues } from './product-schema'
 import type { PanelVariant } from './product-types'
 
 // variantToFormValues reads a handful of fields; cast a minimal fixture rather
@@ -129,3 +130,43 @@ describe('variant tax category overrides', () => {
     expect(variantToWirePayload(prepared[0], 0).tax_category_id).toBeNull()
   })
 })
+
+describe('omitUnchangedListFields', () => {
+  const payload = {
+    name: 'Linen shirt',
+    category_ids: ['ctg_1'],
+    collection_ids: ['coll_1'],
+    tags: ['summer'],
+  }
+
+  it('sends a list when its field changed', () => {
+    expect(omitUnchangedListFields(payload, { category_ids: true })).toEqual({
+      name: 'Linen shirt',
+      category_ids: ['ctg_1'],
+    })
+    expect(omitUnchangedListFields(payload, { tags: true, collection_ids: true })).toEqual({
+      name: 'Linen shirt',
+      collection_ids: ['coll_1'],
+      tags: ['summer'],
+    })
+  })
+
+  // React Hook Form marks an array field dirty per item when it compares item by item.
+  it('reads a per-item dirty flag', () => {
+    expect(omitUnchangedListFields(payload, { category_ids: [false, true] })).toEqual({
+      name: 'Linen shirt',
+      category_ids: ['ctg_1'],
+    })
+    expect(omitUnchangedListFields(payload, { category_ids: [false] })).toEqual({
+      name: 'Linen shirt',
+    })
+  })
+
+  // Another tab, a bulk action or an import may have added to a list since the
+  // page loaded; sending the loaded list back would remove those additions.
+  it('leaves the lists out when their fields did not change', () => {
+    const dirtyFields: Partial<Record<keyof ProductFormValues, boolean>> = { name: true }
+
+    expect(omitUnchangedListFields(payload, dirtyFields)).toEqual({ name: 'Linen shirt' })
+  })
+})

package/src/products/product-form-mapping.ts

@@ -195,6 +195,25 @@ export function withExtensionRowValues(
   }
 }
 
+// The API replaces each of these lists with what a save sends.
+const LIST_FIELDS = ['category_ids', 'collection_ids', 'tags'] as const
+
+/**
+ * The save payload without the category, collection and tag lists the merchant
+ * left unchanged, so a save keeps what something else added since the page loaded.
+ */
+export function omitUnchangedListFields(
+  payload: Record<string, unknown>,
+  dirtyFields: Partial<Record<(typeof LIST_FIELDS)[number], unknown>>,
+): Record<string, unknown> {
+  const trimmed = { ...payload }
+  for (const field of LIST_FIELDS) {
+    const dirty = dirtyFields[field]
+    if (!(Array.isArray(dirty) ? dirty.some(Boolean) : dirty)) delete trimmed[field]
+  }
+  return trimmed
+}
+
 // Strip UI-only fields (stock_location_name) and undefined entries so the
 // PATCH body matches the Admin API VariantUpdateParams shape exactly. The
 // Spree::Product#variants= setter reconciles by id, creates new entries,