@spree/dashboard-core 1.0.0-rc.1 → 1.0.0-rc.3

package/src/products/product-types.ts

@@ -1,3 +1,5 @@
+import type { CountryCode, CurrencyCode } from '@spree/admin-sdk'
+
 /**
  * What the shared product form reads off a product, its variants and its
  * media.
@@ -42,12 +44,12 @@ export interface PanelVariant {
   price?: { amount?: string | null; currency?: string | null } | null
   prices?: Array<{
     amount?: string | null
-    currency?: string | null
+    currency?: CurrencyCode | null
     compare_at_amount?: string | null
     price_list_id?: string | null
   }>
   cost_price?: string | null
-  cost_currency?: string | null
+  cost_currency?: CurrencyCode | null
   weight?: number | null
   height?: number | null
   width?: number | null
@@ -55,7 +57,7 @@ export interface PanelVariant {
   weight_unit?: string | null
   dimensions_unit?: string | null
   hs_code?: string | null
-  country_of_origin?: string | null
+  country_of_origin?: CountryCode | null
   customs_description?: string | null
   minimum_order_quantity?: number | null
   order_multiple?: number | null

package/src/products/use-product-form-data.ts

@@ -2,7 +2,6 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import type {
   PanelCollection,
   PanelDeliveryProfile,
-  PanelMarket,
   PanelNamedRecord,
   PanelOptionType,
   PanelPackageType,
@@ -244,30 +243,3 @@ export function collectionAutocompleteProps(queryKey: string) {
     getOptionLabel: (collection: PanelCollection) => collection.name ?? collection.id,
   }
 }
-
-/**
- * Resolves a currency to the locale its amounts are typed and shown in, so a
- * EUR field accepts `1.234,56` and normalizes it to `1234.56`. Mirrors the
- * operator dashboard's `useCurrencyLocale`, reading through the registered
- * client so the shared price editor works in either panel; a panel with no
- * markets answers undefined and callers fall back to the UI language.
- */
-export function useFormCurrencyLocale(): (currency: string | undefined) => string | undefined {
-  const client = getApiClient()
-
-  const { data } = useQuery({
-    queryKey: useResourceKey('markets', 'panel-form'),
-    queryFn: async (): Promise<{ data: PanelMarket[] }> =>
-      (await client.markets?.list({ limit: 100 })) ?? { data: [] },
-    enabled: Boolean(client.markets),
-    staleTime: FIVE_MINUTES,
-  })
-
-  const markets = data?.data ?? []
-
-  return (currency) => {
-    if (!currency) return undefined
-
-    return markets.find((market) => market.currency === currency)?.default_locale ?? undefined
-  }
-}

package/src/providers/store-provider.tsx

@@ -1,4 +1,4 @@
-import type { Store } from '@spree/admin-sdk'
+import type { CurrencyCode, LocaleCode, Store } from '@spree/admin-sdk'
 import { useQuery } from '@tanstack/react-query'
 import { createContext, type ReactNode, useContext, useEffect, useRef } from 'react'
 import { adminClient } from '../client'
@@ -19,15 +19,15 @@ interface StoreContextValue {
   store: Store | null
   storeId: string
   isLoading: boolean
-  currencies: string[]
+  currencies: CurrencyCode[]
   /** Locales this store is configured to translate content into. */
-  locales: string[]
+  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: string[]
-  defaultCurrency: string
-  defaultLocale: string
+  availableLocales: LocaleCode[]
+  defaultCurrency: CurrencyCode
+  defaultLocale: LocaleCode
   /** ISO country the store sells from — used to pre-fill new address forms. */
   defaultCountry: string
   /** IANA timezone for the store (e.g. `Europe/Berlin`). Falls back to the
@@ -64,7 +64,7 @@ export function StoreProvider({ storeId, children }: { storeId: string; children
   // that path already owns the locale via `switchAdminLocale`, and re-applying
   // would race that PATCH and could reload before it lands. Tracking the
   // storeId it last ran for re-arms it per store, so a multi-store admin still
-  // inherits each store's preferred_admin_locale.
+  // inherits each store's admin_locale.
   const localeFallbackStoreRef = useRef<string | null>(null)
 
   const query = useQuery({
@@ -83,7 +83,7 @@ export function StoreProvider({ storeId, children }: { storeId: string; children
 
     localeFallbackStoreRef.current = storeId
     reconcileStoreDefaultLocale(
-      store.preferred_admin_locale,
+      store.admin_locale,
       storeId,
       accountLocaleRef.current,
       coreLocaleCodes(),
@@ -99,7 +99,7 @@ export function StoreProvider({ storeId, children }: { storeId: string; children
   // 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
   // date-fns-tz reject — falling back keeps every date control working.
-  const timezone = resolveTimezone(store?.preferred_timezone)
+  const timezone = resolveTimezone(store?.timezone)
 
   return (
     <StoreContext.Provider

package/src/schemas/stock-location.ts

@@ -2,6 +2,7 @@ import { requiredMessage } from '@spree/dashboard-ui'
 import { z } from 'zod/v4'
 import type { PanelStockLocation, PanelStockLocationCreateParams } from '../api-client'
 import { blankToUndefined, emptyToUndefined } from '../lib/form-mappers'
+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
@@ -27,7 +28,7 @@ export const stockLocationFormSchema = z.object({
   zipcode: z.string().optional(),
   phone: z.string().optional(),
   company: z.string().optional(),
-  country_code: z.string().optional(),
+  country_code: countryCodeSchema.or(z.literal('')).optional(),
   state_code: z.string().optional(),
   state_name: z.string().optional(),
   pickup_enabled: z.boolean(),
@@ -114,7 +115,7 @@ export function formValuesToParams(v: StockLocationFormValues): PanelStockLocati
     zipcode: blankToUndefined(v.zipcode),
     phone: blankToUndefined(v.phone),
     company: blankToUndefined(v.company),
-    country_code: blankToUndefined(v.country_code),
+    country_code: v.country_code || undefined,
     state_code: blankToUndefined(v.state_code),
     state_name: blankToUndefined(v.state_name),
     pickup_enabled: v.pickup_enabled,

package/src/tables/package-types.tsx

@@ -8,7 +8,7 @@ defineTable<PanelPackageType>('package-types', {
   docsPath: 'settings/package-types',
   description: i18n.t('admin.package_types.description'),
   title: i18n.t('admin.package_types.table_title'),
-  searchParam: 'name_cont',
+  searchParam: 'search',
   searchPlaceholder: i18n.t('admin.package_types.search_placeholder'),
   defaultSort: { field: 'name', direction: 'asc' },
   emptyIcon: <PackageIcon className="size-8 text-muted-foreground" />,

package/src/tables/stock-locations.tsx

@@ -8,7 +8,7 @@ defineTable<PanelStockLocation>('stock-locations', {
   docsPath: 'settings/locations',
   description: i18n.t('admin.stock_locations.description'),
   title: i18n.t('admin.settings_nav.items.stock_locations'),
-  searchParam: 'name_cont',
+  searchParam: 'search',
   searchPlaceholder: i18n.t('admin.stock_locations.search_placeholder'),
   defaultSort: { field: 'name', direction: 'asc' },
   emptyIcon: <WarehouseIcon className="size-8 text-muted-foreground" />,

package/src/vite/discover.ts

@@ -39,6 +39,17 @@ export interface DashboardPluginManifest {
    * Compiled into the host's route tree by `@spree/dashboard/vite`.
    */
   routesDir?: string
+  /**
+   * Absolute path to the plugin's directory of signed-in pages outside any
+   * store (`"authenticatedRoutes"` in the marker), mounted at the root inside
+   * the dashboard's auth guard.
+   */
+  authenticatedRoutesDir?: string
+  /**
+   * Absolute path to the plugin's directory of public pages
+   * (`"publicRoutes"` in the marker), mounted at the root with no sign-in.
+   */
+  publicRoutesDir?: string
 }
 
 /**
@@ -68,12 +79,14 @@ export function discoverDashboardPluginManifests(
       manifests.push({ name })
       continue
     }
-    const routes = pkg.spree?.dashboard?.routes
+    const marker = pkg.spree?.dashboard
+    const resolveDir = (dir?: string) =>
+      dir ? path.resolve(path.dirname(manifestPath), dir) : undefined
     manifests.push({
       name,
-      routesDir: routes
-        ? linkedPackagePath(root, name, path.resolve(path.dirname(manifestPath), routes))
-        : undefined,
+      routesDir: resolveDir(marker?.routes),
+      authenticatedRoutesDir: resolveDir(marker?.authenticatedRoutes),
+      publicRoutesDir: resolveDir(marker?.publicRoutes),
     })
   }
   return manifests
@@ -128,34 +141,24 @@ export function discoverDashboardPlugins({ root, onWarn }: DiscoverOptions): str
 }
 
 /**
- * Re-expresses a path inside an installed package through the package's
- * `node_modules/<name>` link, rather than the real location Node resolves to.
+ * The routes directory of an installed dashboard shell (`@spree/dashboard`,
+ * `@spree/seller-dashboard`), at its real location. The shell's `.` export
+ * maps to a file in `src/`, so `routes/` is its sibling directory.
  *
- * Under pnpm the real location is `node_modules/.pnpm/<name>@<version>_<hash>/…`,
- * which changes with every install. The route generator writes these paths
- * into the host's committed `routeTree.gen.ts`, so a real location made the
- * file differ on a new project's first dev start and after every upgrade —
- * and each rewrite reloaded the open page. The link stays put across installs
- * and is the same inside the monorepo, so the file only changes when the
- * routes do.
+ * The route generator imports these files from the host's `routeTree.gen.ts`.
+ * Under pnpm a package is reached through a `node_modules/<name>` link, while
+ * its own dependencies sit next to its real location under
+ * `node_modules/.pnpm/`. TypeScript does not follow the link for a relative
+ * import, so a route file imported through it cannot see the shell's
+ * dependencies and the host's type check fails. Plugin routes directories
+ * resolve to their real location for the same reason.
  *
  * @param root host project root
- * @param packageName the package the path belongs to
- * @param resolvedPath a path inside that package, as Node resolved it
- * @returns the same path through the link, or `resolvedPath` when no link
- *   leads to it (the package resolving itself, an unusual layout)
+ * @param packageName the shell package the host depends on
  */
-export function linkedPackagePath(root: string, packageName: string, resolvedPath: string): string {
-  const realPath = fs.realpathSync(resolvedPath)
-  for (let dir = root; ; dir = path.dirname(dir)) {
-    const link = path.join(dir, 'node_modules', packageName)
-    if (fs.existsSync(path.join(link, 'package.json'))) {
-      const inside = path.relative(fs.realpathSync(link), realPath)
-      if (inside.startsWith('..') || path.isAbsolute(inside)) return resolvedPath
-      return path.join(link, inside)
-    }
-    if (path.dirname(dir) === dir) return resolvedPath
-  }
+export function resolveShellRoutesDir(root: string, packageName: string): string {
+  const require = createRequire(path.join(root, 'package.json'))
+  return path.join(path.dirname(fs.realpathSync(require.resolve(packageName))), 'routes')
 }
 
 interface HostManifest {
@@ -168,6 +171,8 @@ interface PluginManifest {
     dashboard?: {
       plugin?: boolean
       routes?: string
+      authenticatedRoutes?: string
+      publicRoutes?: string
     }
   }
 }

package/src/hooks/use-direct-upload.ts

@@ -1,117 +0,0 @@
-import { useMutation } from '@tanstack/react-query'
-import SparkMD5 from 'spark-md5'
-import { getApiClient } from '../api-client'
-
-function computeMD5Checksum(file: File): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const chunkSize = 2097152 // 2MB chunks
-    const spark = new SparkMD5.ArrayBuffer()
-    const reader = new FileReader()
-    let currentChunk = 0
-    const chunks = Math.ceil(file.size / chunkSize)
-
-    reader.onload = (e) => {
-      spark.append(e.target!.result as ArrayBuffer)
-      currentChunk++
-
-      if (currentChunk < chunks) {
-        loadNext()
-      } else {
-        // Active Storage expects base64-encoded raw MD5 digest
-        resolve(btoa(spark.end(true)))
-      }
-    }
-
-    reader.onerror = () => reject(reader.error)
-
-    function loadNext() {
-      const start = currentChunk * chunkSize
-      const end = Math.min(start + chunkSize, file.size)
-      reader.readAsArrayBuffer(file.slice(start, end))
-    }
-
-    loadNext()
-  })
-}
-
-interface UploadResult {
-  signedId: string
-  previewUrl: string
-}
-
-function sameOriginIfRailsDisk(url: string): string {
-  try {
-    const parsed = new URL(url)
-    if (parsed.pathname.startsWith('/rails/active_storage/')) {
-      return parsed.pathname + parsed.search
-    }
-    return url
-  } catch {
-    return url
-  }
-}
-
-interface DirectUploadOptions {
-  /**
-   * Upload to private storage instead of the public bucket. Required for files
-   * that are only ever served through an authorized, signed link — attaching a
-   * blob never moves it between services, so this has to be decided up front.
-   */
-  private?: boolean
-}
-
-export function useDirectUpload(options: DirectUploadOptions = {}) {
-  return useMutation({
-    mutationFn: async (file: File): Promise<UploadResult> => {
-      const checksum = await computeMD5Checksum(file)
-
-      // Step 1: Get presigned upload URL
-      let response: {
-        direct_upload: { url: string; headers: Record<string, string> }
-        signed_id: string
-      }
-      try {
-        const presign = getApiClient().createDirectUpload
-        if (!presign) throw new Error('This panel cannot upload files.')
-
-        response = await presign({
-          blob: {
-            filename: file.name,
-            byte_size: file.size,
-            checksum,
-            content_type: file.type || 'application/octet-stream',
-          },
-          ...(options.private ? { private: true } : {}),
-        })
-      } catch (err) {
-        throw new Error(`Presign failed: ${err instanceof Error ? err.message : err}`)
-      }
-
-      // Step 2: Upload file directly to storage.
-      //
-      // Active Storage's Disk service issues an absolute URL against the Rails
-      // origin (e.g. http://localhost:3000/rails/active_storage/disk/...). In
-      // dev the SPA runs on a different port and that controller doesn't speak
-      // CORS, so the browser blocks the cross-origin PUT before any response
-      // ("Failed to fetch"). When the URL points at a `/rails/active_storage/`
-      // path we drop the host so the request goes through Vite's `/rails`
-      // proxy and stays same-origin. Production S3 URLs are untouched.
-      const uploadUrl = sameOriginIfRailsDisk(response.direct_upload.url)
-      const uploadResponse = await fetch(uploadUrl, {
-        method: 'PUT',
-        headers: response.direct_upload.headers,
-        body: file,
-      })
-
-      if (!uploadResponse.ok) {
-        const text = await uploadResponse.text().catch(() => '')
-        throw new Error(`Storage upload failed (${uploadResponse.status}): ${text}`)
-      }
-
-      return {
-        signedId: response.signed_id,
-        previewUrl: URL.createObjectURL(file),
-      }
-    },
-  })
-}