@spree/dashboard-core 6.0.1 → 6.0.3

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,