@spree/dashboard-core 1.0.0-rc.4 → 1.0.0-rc.6

package/src/products/variant-edit-sheet.tsx

@@ -1,5 +1,6 @@
+import { DimensionUnit, WeightUnit } from '@spree/core'
 import type { ProductFormValues, VariantFormValues } from '@spree/dashboard-core'
-import { CountryCombobox, StoreDatePicker } from '@spree/dashboard-core'
+import { CountryCombobox, Slot, StoreDatePicker } from '@spree/dashboard-core'
 import {
   Alert,
   AlertDescription,
@@ -36,6 +37,7 @@ import { useTenantId } from '../providers/tenant-provider'
 import { cartonSize } from './carton-size'
 import { normalizeCustomsDescription, normalizeHsCode } from './normalize-customs'
 import { PURCHASE_UNITS } from './normalize-quantity'
+import { useSheetSaveHandlers } from './sheet-save-handlers'
 import {
   useFormCartonPackageTypes as useCartonPackageTypes,
   useFormOptionTypes as useOptionTypes,
@@ -43,13 +45,12 @@ import {
 } from './use-product-form-data'
 import { variantDisplayLabel } from './variants-matrix'
 
-const WEIGHT_UNITS = ['g', 'kg', 'lb', 'oz'] as const
-const DIMENSION_UNITS = ['mm', 'cm', 'in'] as const
-
 interface Props {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   form: UseFormReturn<ProductFormValues, any, any>
   variantIndex: number
+  /** The product form's key — names the `<formKey>.variant.form_fields` slot. */
+  formKey: string
   open: boolean
   onOpenChange: (open: boolean) => void
 }
@@ -58,7 +59,7 @@ interface Props {
 // form — no own form state. Save closes the sheet (changes are already in
 // form state; the product Save button commits them). Cancel restores the
 // snapshot captured when the sheet opened.
-export function VariantEditSheet({ form, variantIndex, open, onOpenChange }: Props) {
+export function VariantEditSheet({ form, variantIndex, formKey, open, onOpenChange }: Props) {
   const { t } = useTranslation()
   const { data: taxCategoriesResponse } = useTaxCategories()
   const taxCategories = taxCategoriesResponse?.data ?? []
@@ -112,6 +113,8 @@ export function VariantEditSheet({ form, variantIndex, open, onOpenChange }: Pro
       : null
   }, [open, variantIndex, form])
 
+  const { onSave, saveAll, saving } = useSheetSaveHandlers()
+
   const variant = form.watch(`variants.${variantIndex}`)
   if (!variant) return null
 
@@ -122,6 +125,8 @@ export function VariantEditSheet({ form, variantIndex, open, onOpenChange }: Pro
   )
 
   const handleCancel = () => {
+    // A save already sent can't be called back, so the sheet stays until it settles.
+    if (saving) return
     const snap = snapshotRef.current
     if (snap) {
       // Resolve the target index by stable id when we have one — the array
@@ -144,8 +149,8 @@ export function VariantEditSheet({ form, variantIndex, open, onOpenChange }: Pro
     onOpenChange(false)
   }
 
-  const handleDone = () => {
-    onOpenChange(false)
+  const handleDone = async () => {
+    if (await saveAll()) onOpenChange(false)
   }
 
   return (
@@ -230,7 +235,7 @@ export function VariantEditSheet({ form, variantIndex, open, onOpenChange }: Pro
                         <SelectValue>{(v) => (v as string) || '—'}</SelectValue>
                       </SelectTrigger>
                       <SelectContent>
-                        {WEIGHT_UNITS.map((u) => (
+                        {Object.values(WeightUnit).map((u) => (
                           <SelectItem key={u} value={u}>
                             {u}
                           </SelectItem>
@@ -295,7 +300,7 @@ export function VariantEditSheet({ form, variantIndex, open, onOpenChange }: Pro
                         <SelectValue>{(v) => (v as string) || '—'}</SelectValue>
                       </SelectTrigger>
                       <SelectContent>
-                        {DIMENSION_UNITS.map((u) => (
+                        {Object.values(DimensionUnit).map((u) => (
                           <SelectItem key={u} value={u}>
                             {u}
                           </SelectItem>
@@ -709,13 +714,18 @@ export function VariantEditSheet({ form, variantIndex, open, onOpenChange }: Pro
               </Field>
             </FormSection>
           )}
+
+          <Slot
+            name={`${formKey}.variant.form_fields`}
+            context={{ variant, variantIndex, fieldPrefix: `variants.${variantIndex}`, onSave }}
+          />
         </div>
 
         <SheetFooter>
-          <Button type="button" variant="outline" onClick={handleCancel}>
+          <Button type="button" variant="outline" disabled={saving} onClick={handleCancel}>
             {t('admin.actions.cancel')}
           </Button>
-          <Button type="button" onClick={handleDone}>
+          <Button type="button" disabled={saving} onClick={handleDone}>
             {t('admin.actions.done')}
           </Button>
         </SheetFooter>

package/src/products/variants-section.tsx

@@ -64,6 +64,8 @@ interface Props {
    * whatever it already has.
    */
   seedFromType?: boolean
+  /** The product form's key — names the variant sheet's slot. */
+  formKey?: string
 }
 
 // Derive the initial selected option types from current variant rows so the
@@ -125,7 +127,7 @@ function seedFromProductType(
     .filter((entry): entry is SelectedOptionType => entry !== null)
 }
 
-export function VariantsSection({ form, seedFromType = false }: Props) {
+export function VariantsSection({ form, seedFromType = false, formKey = 'product' }: Props) {
   const { t } = useTranslation()
   const { data: optionTypesData } = useOptionTypes()
   const allOptionTypes = useMemo(() => optionTypesData?.data ?? [], [optionTypesData])
@@ -447,6 +449,7 @@ export function VariantsSection({ form, seedFromType = false }: Props) {
         <VariantEditSheet
           form={form}
           variantIndex={editingIndex}
+          formKey={formKey}
           open={sheetOpen}
           onOpenChange={(o) => {
             setSheetOpen(o)

package/src/providers/store-provider.tsx

@@ -1,9 +1,11 @@
-import type { CurrencyCode, LocaleCode, Store } from '@spree/admin-sdk'
+import type { Store } from '@spree/admin-sdk'
+import type { CurrencyCode, LocaleCode } from '@spree/core'
 import { useQuery } from '@tanstack/react-query'
-import { createContext, type ReactNode, useContext, useEffect, useRef } from 'react'
+import { createContext, type ReactNode, useContext, useEffect, useMemo, useRef } from 'react'
 import { adminClient } from '../client'
 import { useAuth } from '../hooks/use-auth'
 import { coreLocaleCodes, reconcileStoreDefaultLocale } from '../lib/i18n'
+import { listAllMarkets, marketLocalization, STORE_CONFIG_STALE_TIME } from '../lib/store-config'
 
 /**
  * Resource segment of the store query key: the current store lives in the
@@ -19,14 +21,17 @@ interface StoreContextValue {
   store: Store | null
   storeId: string
   isLoading: boolean
+  /** Currencies of the store's markets, the default market's first. */
   currencies: CurrencyCode[]
-  /** Locales this store is configured to translate content into. */
+  /** Languages the store's markets offer — what content is translated into. */
   locales: LocaleCode[]
   /** Every locale a merchant may translate content into — the full canonical
    *  set, independent of which locales the store currently uses. Drives locale
    *  pickers so a new locale can always be added. */
   availableLocales: LocaleCode[]
+  /** The default market's currency. */
   defaultCurrency: CurrencyCode
+  /** The default market's language. */
   defaultLocale: LocaleCode
   /** ISO country the store sells from — used to pre-fill new address forms. */
   defaultCountry: string
@@ -75,6 +80,26 @@ export function StoreProvider({ storeId, children }: { storeId: string; children
   })
   const store = query.data ?? null
 
+  // Same key and request as the dashboard's market list, so the shell and every
+  // market picker share one cached fetch that market writes invalidate.
+  const marketsQuery = useQuery({
+    queryKey: ['markets', storeId, 'all'],
+    queryFn: listAllMarkets,
+    staleTime: STORE_CONFIG_STALE_TIME,
+  })
+  // Until the markets arrive, or if they cannot be read, the store payload
+  // stands in: the server derives the same values from the same markets, and a
+  // hardcoded USD/en would be wrong for most stores.
+  const localization = useMemo(() => {
+    if (marketsQuery.data) return marketLocalization(marketsQuery.data.data)
+    return {
+      currencies: store?.supported_currencies ?? [],
+      locales: store?.supported_locales ?? [],
+      defaultCurrency: store?.default_currency,
+      defaultLocale: store?.default_locale,
+    }
+  }, [marketsQuery.data, store])
+
   // Reconcile the admin language against this store's default — adopting it,
   // or dropping a now-stale auto-applied default — only when no account locale
   // or genuine personal choice owns it (legacy base_controller parity).
@@ -90,11 +115,10 @@ export function StoreProvider({ storeId, children }: { storeId: string; children
     )
   }, [store, storeId])
 
-  const currencies = store?.supported_currencies ?? []
-  const locales = store?.supported_locales ?? []
+  const { currencies, locales } = localization
   const availableLocales = store?.available_locales ?? []
-  const defaultCurrency = store?.default_currency ?? 'USD'
-  const defaultLocale = store?.default_locale ?? 'en'
+  const defaultCurrency = localization.defaultCurrency ?? 'USD'
+  const defaultLocale = localization.defaultLocale ?? 'en'
   const defaultCountry = store?.default_country_code ?? ''
   // A store's zone preference defaults to the host app's `Time.zone.name`,
   // which may be a Rails name ("Eastern Time (US & Canada)") that Intl and

package/src/schemas/package-type.ts

@@ -1,17 +1,19 @@
+import { DimensionUnit, PACKAGE_TYPE_KINDS, type PackageTypeKind, WeightUnit } from '@spree/core'
 import { requiredMessage } from '@spree/dashboard-ui'
 import i18n from 'i18next'
 import { z } from 'zod/v4'
 import type { PanelPackageType, PanelPackageTypeCreateParams } from '../api-client'
 
-// The vocabulary the server validates against; typing anything else could
-// only fail on save.
-export const PACKAGE_TYPE_KINDS = ['box', 'envelope', 'carton', 'pallet', 'container'] as const
-export const PACKAGE_DIMENSION_UNITS = ['mm', 'cm', 'in', 'ft'] as const
-export const PACKAGE_WEIGHT_UNITS = ['g', 'kg', 'lb', 'oz'] as const
+export { PACKAGE_TYPE_KINDS, type PackageTypeKind }
 
-export type PackageTypeKind = (typeof PACKAGE_TYPE_KINDS)[number]
-export type PackageDimensionUnit = (typeof PACKAGE_DIMENSION_UNITS)[number]
-export type PackageWeightUnit = (typeof PACKAGE_WEIGHT_UNITS)[number]
+/** @deprecated Use `Object.values(DimensionUnit)` from `@spree/admin-sdk`. */
+export const PACKAGE_DIMENSION_UNITS = Object.values(DimensionUnit)
+/** @deprecated Use `Object.values(WeightUnit)` from `@spree/admin-sdk`. */
+export const PACKAGE_WEIGHT_UNITS = Object.values(WeightUnit)
+/** @deprecated Use `DimensionUnit` from `@spree/admin-sdk`. */
+export type PackageDimensionUnit = DimensionUnit
+/** @deprecated Use `WeightUnit` from `@spree/admin-sdk`. */
+export type PackageWeightUnit = WeightUnit
 
 // Blank is how a merchant says "not measured", so every number is optional
 // and an empty string reaches the API as null rather than zero — a box
@@ -33,10 +35,10 @@ export const packageTypeFormSchema = z.object({
   length: optionalNumber,
   width: optionalNumber,
   height: optionalNumber,
-  dimensions_unit: z.enum(PACKAGE_DIMENSION_UNITS).optional(),
+  dimensions_unit: z.enum(DimensionUnit).optional(),
   weight: optionalNumber,
   max_weight: optionalNumber,
-  weight_unit: z.enum(PACKAGE_WEIGHT_UNITS).optional(),
+  weight_unit: z.enum(WeightUnit).optional(),
   default: z.boolean().optional(),
 })
 
@@ -89,10 +91,10 @@ export function packageTypeToFormValues(packageType: PanelPackageType): PackageT
     length: packageType.length ?? '',
     width: packageType.width ?? '',
     height: packageType.height ?? '',
-    dimensions_unit: (packageType.dimensions_unit ?? undefined) as PackageDimensionUnit | undefined,
+    dimensions_unit: (packageType.dimensions_unit ?? undefined) as DimensionUnit | undefined,
     weight: packageType.weight ?? '',
     max_weight: packageType.max_weight ?? '',
-    weight_unit: (packageType.weight_unit ?? undefined) as PackageWeightUnit | undefined,
+    weight_unit: (packageType.weight_unit ?? undefined) as WeightUnit | undefined,
     default: packageType.default ?? false,
   }
 }

package/src/schemas/stock-location.ts

@@ -1,3 +1,4 @@
+import { PICKUP_STOCK_POLICIES, type PickupStockPolicy, STOCK_LOCATION_KINDS } from '@spree/core'
 import { requiredMessage } from '@spree/dashboard-ui'
 import { z } from 'zod/v4'
 import type { PanelStockLocation, PanelStockLocationCreateParams } from '../api-client'
@@ -7,9 +8,7 @@ import { countryCodeSchema } from '../lib/iso-codes'
 // Labels live in `en.json` under `admin.stock_locations.kinds.*` and
 // `admin.stock_locations.pickup_stock_policies.*`. Consumers map these
 // values to translated labels at render time.
-export const STOCK_LOCATION_KINDS = ['warehouse', 'store', 'fulfillment_center'] as const
-export const PICKUP_STOCK_POLICIES = ['local', 'any'] as const
-export type PickupStockPolicy = (typeof PICKUP_STOCK_POLICIES)[number]
+export { PICKUP_STOCK_POLICIES, type PickupStockPolicy, STOCK_LOCATION_KINDS }
 
 export const stockLocationFormSchema = z.object({
   name: z

package/src/tables/stock-locations.tsx

@@ -1,3 +1,4 @@
+import { STOCK_LOCATION_KINDS } from '@spree/core'
 import { ActiveBadge, ResourceNameCell } from '@spree/dashboard-ui'
 import { WarehouseIcon } from '@spree/dashboard-ui/icons'
 import i18n from 'i18next'
@@ -35,14 +36,10 @@ defineTable<PanelStockLocation>('stock-locations', {
       filterable: true,
       default: true,
       filterType: 'enum',
-      filterOptions: [
-        { value: 'warehouse', label: i18n.t('admin.stock_locations.kinds.warehouse') },
-        { value: 'store', label: i18n.t('admin.stock_locations.kinds.store') },
-        {
-          value: 'fulfillment_center',
-          label: i18n.t('admin.stock_locations.kinds.fulfillment_center'),
-        },
-      ],
+      filterOptions: STOCK_LOCATION_KINDS.map((kind) => ({
+        value: kind,
+        label: i18n.t(`admin.stock_locations.kinds.${kind}`),
+      })),
       quickFilter: true,
       render: (sl) => {
         const key = `admin.stock_locations.kinds.${sl.kind}`

package/src/lib/money.test.ts

@@ -1,63 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  fractionToPercent,
-  isPositiveMoney,
-  percentOf,
-  percentToFraction,
-  prorateMoney,
-  shiftDecimalPoint,
-} from './money'
-
-describe('shiftDecimalPoint', () => {
-  it('moves the point exactly, without float noise', () => {
-    expect(shiftDecimalPoint('0.077', 2)).toBe('7.7')
-    expect(shiftDecimalPoint('7.7', -2)).toBe('0.077')
-    expect(shiftDecimalPoint('0.07', 2)).toBe('7')
-    expect(shiftDecimalPoint('1', 2)).toBe('100')
-    expect(shiftDecimalPoint('100', -2)).toBe('1')
-    expect(shiftDecimalPoint('-0.5', 2)).toBe('-50')
-    expect(shiftDecimalPoint('0', -2)).toBe('0')
-  })
-
-  it('leaves a value that is not a decimal string alone', () => {
-    expect(shiftDecimalPoint('abc', 2)).toBe('abc')
-  })
-})
-
-describe('fractionToPercent / percentToFraction', () => {
-  it('round-trips and keeps blanks blank', () => {
-    expect(fractionToPercent('0.23')).toBe('23')
-    expect(percentToFraction('23')).toBe('0.23')
-    expect(percentToFraction('7.25')).toBe('0.0725')
-    expect(fractionToPercent(null)).toBe('')
-    expect(percentToFraction('')).toBe('')
-  })
-})
-
-describe('percentOf', () => {
-  it('rounds to the currency decimals', () => {
-    expect(percentOf('19.99', '10', 'USD')).toBe('2.00')
-    expect(percentOf('100', '12.5', 'USD')).toBe('12.50')
-    expect(percentOf('1000', '0.05', 'JPY')).toBe('1')
-    expect(percentOf('1.005', '50', 'KWD')).toBe('0.503')
-  })
-})
-
-describe('isPositiveMoney', () => {
-  it('is true only for an amount above zero', () => {
-    expect(isPositiveMoney('0.01')).toBe(true)
-    expect(isPositiveMoney('0.00')).toBe(false)
-    expect(isPositiveMoney('-1')).toBe(false)
-    expect(isPositiveMoney(null)).toBe(false)
-    expect(isPositiveMoney('abc')).toBe(false)
-  })
-})
-
-describe('prorateMoney', () => {
-  it('shares an amount across units, rounded to the currency', () => {
-    expect(prorateMoney('10.00', 1, 3, 'USD')).toBe('3.33')
-    expect(prorateMoney('10.00', 2, 3, 'USD')).toBe('6.67')
-    expect(prorateMoney('10.00', 3, 3, 'USD')).toBe('10.00')
-    expect(prorateMoney('1000', 1, 3, 'JPY')).toBe('333')
-  })
-})

package/src/lib/normalize-money.test.ts

@@ -1,67 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { normalizeMoneyInput } from './normalize-money'
-
-describe('normalizeMoneyInput', () => {
-  it('passes through canonical en input', () => {
-    expect(normalizeMoneyInput('19.99', 'en')).toBe('19.99')
-    expect(normalizeMoneyInput('1,234.56', 'en')).toBe('1234.56')
-    expect(normalizeMoneyInput('1234.56', 'en')).toBe('1234.56')
-  })
-
-  it('converts de comma-decimal + dot grouping to canonical', () => {
-    expect(normalizeMoneyInput('19,99', 'de')).toBe('19.99')
-    expect(normalizeMoneyInput('1.234,56', 'de')).toBe('1234.56')
-    expect(normalizeMoneyInput('1.000.000,00', 'de')).toBe('1000000.00')
-  })
-
-  it('reads a lone group separator not followed by three digits as the decimal', () => {
-    expect(normalizeMoneyInput('19.50', 'de')).toBe('19.50')
-    expect(normalizeMoneyInput('0.5', 'de')).toBe('0.5')
-    expect(normalizeMoneyInput('19.50 €', 'de')).toBe('19.50')
-    expect(normalizeMoneyInput('19,50', 'en')).toBe('19.50')
-    expect(normalizeMoneyInput('1.500 €', 'de')).toBe('1500')
-    expect(normalizeMoneyInput('1.234.567', 'de')).toBe('1234567')
-  })
-
-  it('handles fr narrow-space grouping', () => {
-    // fr groups with U+202F (narrow no-break space) and uses a comma decimal.
-    expect(normalizeMoneyInput('1 234,56', 'fr')).toBe('1234.56')
-    expect(normalizeMoneyInput('73,45', 'fr')).toBe('73.45')
-  })
-
-  it('returns empty string for blank input', () => {
-    expect(normalizeMoneyInput('', 'de')).toBe('')
-    expect(normalizeMoneyInput('   ', 'de')).toBe('')
-    expect(normalizeMoneyInput(null, 'de')).toBe('')
-    expect(normalizeMoneyInput(undefined, 'de')).toBe('')
-  })
-
-  it('preserves a leading minus', () => {
-    expect(normalizeMoneyInput('-5,00', 'de')).toBe('-5.00')
-    expect(normalizeMoneyInput('-5.00', 'en')).toBe('-5.00')
-  })
-
-  it('drops stray currency symbols and whitespace', () => {
-    expect(normalizeMoneyInput(' € 1.234,56 ', 'de')).toBe('1234.56')
-    expect(normalizeMoneyInput('$19.99', 'en')).toBe('19.99')
-  })
-
-  it('keeps no-decimal values intact', () => {
-    expect(normalizeMoneyInput('50', 'de')).toBe('50')
-    expect(normalizeMoneyInput('1.000', 'de')).toBe('1000') // de: dot is grouping
-    expect(normalizeMoneyInput('1,000', 'en')).toBe('1000') // en: comma is grouping
-  })
-
-  it('collapses stray separators to a single decimal point', () => {
-    // Malformed multi-dot/interior-minus input must canonicalize, not pass through.
-    expect(normalizeMoneyInput('1.2.3', 'en')).toBe('1.23')
-    expect(normalizeMoneyInput('12-3.4', 'en')).toBe('123.4')
-    expect(normalizeMoneyInput('-12-3.4', 'en')).toBe('-123.4')
-  })
-
-  it('returns empty for inputs with no digits', () => {
-    expect(normalizeMoneyInput('.', 'en')).toBe('')
-    expect(normalizeMoneyInput('-', 'en')).toBe('')
-    expect(normalizeMoneyInput('abc', 'en')).toBe('')
-  })
-})