Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Cleanup/standarize component structure for Admin SPA
Damian Legawiec192c3e71cc03
diff --git a/packages/admin-sdk/src/index.ts b/packages/admin-sdk/src/index.tsindex e8e58110ed..9e0b8b6492 100644--- a/packages/admin-sdk/src/index.ts+++ b/packages/admin-sdk/src/index.ts@@ -15,5 +15,8 @@ export { AdminClient } from './admin-client'export type { AdminClientConfig, Client } from './client'export { createAdminClient } from './client'-// All types+// Param types (request bodies)+export type * from './params'++// All entity typesexport * from './types'diff --git a/packages/admin-sdk/tsconfig.tsbuildinfo b/packages/admin-sdk/tsconfig.tsbuildinfonew file mode 100644index 0000000000..9dcf3a7bc5--- /dev/null+++ b/packages/admin-sdk/tsconfig.tsbuildinfo@@ -0,0 +1 @@+{"root":["./src/admin-client.ts","./src/client.ts","./src/index.ts","./src/params.ts","./src/types/index.ts","./src/types/generated/address.ts","./src/types/generated/adjustment.ts","./src/types/generated/adminuser.ts","./src/types/generated/allowedorigin.ts","./src/types/generated/category.ts","./src/types/generated/country.ts","./src/types/generated/creditcard.ts","./src/types/generated/customfield.ts","./src/types/generated/customfielddefinition.ts","./src/types/generated/customer.ts","./src/types/generated/deliverymethod.ts","./src/types/generated/deliveryrate.ts","./src/types/generated/digitallink.ts","./src/types/generated/discount.ts","./src/types/generated/fulfillment.ts","./src/types/generated/giftcard.ts","./src/types/generated/lineitem.ts","./src/types/generated/market.ts","./src/types/generated/media.ts","./src/types/generated/optiontype.ts","./src/types/generated/optionvalue.ts","./src/types/generated/order.ts","./src/types/generated/payment.ts","./src/types/generated/paymentmethod.ts","./src/types/generated/paymentsource.ts","./src/types/generated/price.ts","./src/types/generated/pricehistory.ts","./src/types/generated/product.ts","./src/types/generated/refund.ts","./src/types/generated/reimbursement.ts","./src/types/generated/returnauthorization.ts","./src/types/generated/state.ts","./src/types/generated/stockitem.ts","./src/types/generated/stocklocation.ts","./src/types/generated/store.ts","./src/types/generated/storecredit.ts","./src/types/generated/taxcategory.ts","./src/types/generated/variant.ts","./src/types/generated/index.ts"],"version":"6.0.3"}\ No newline at end of filediff --git a/packages/admin/src/components/address-block.tsx b/packages/admin/src/components/spree/address-block.tsxsimilarity index 100%rename from packages/admin/src/components/address-block.tsxrename to packages/admin/src/components/spree/address-block.tsxdiff --git a/packages/admin/src/components/address-form-dialog.tsx b/packages/admin/src/components/spree/address-form-dialog.tsxsimilarity index 100%rename from packages/admin/src/components/address-form-dialog.tsxrename to packages/admin/src/components/spree/address-form-dialog.tsxdiff --git a/packages/admin/src/components/app-sidebar.tsx b/packages/admin/src/components/spree/app-sidebar.tsxsimilarity index 91%rename from packages/admin/src/components/app-sidebar.tsxrename to packages/admin/src/components/spree/app-sidebar.tsxindex 301c42e05a..6e2b6f8b54 100644--- a/packages/admin/src/components/app-sidebar.tsx+++ b/packages/admin/src/components/spree/app-sidebar.tsx@@ -1,9 +1,9 @@import { useParams } from '@tanstack/react-router'import { PackageIcon } from 'lucide-react'import type { ComponentProps } from 'react'-import { type NavItem, NavMain } from '@/components/nav-main'-import { NavUser } from '@/components/nav-user'-import { StoreSwitcher } from '@/components/store-switcher'+import { type NavItem, NavMain } from '@/components/spree/nav-main'+import { NavUser } from '@/components/spree/nav-user'+import { StoreSwitcher } from '@/components/spree/store-switcher'import { Sidebar, SidebarContent, SidebarFooter, SidebarHeader } from '@/components/ui/sidebar'import { type NavEntry, useNavEntries } from '@/lib/nav-registry'import { type Permissions, usePermissions } from '@/providers/permission-provider'diff --git a/packages/admin/src/components/back-button.tsx b/packages/admin/src/components/spree/back-button.tsxsimilarity index 100%rename from packages/admin/src/components/back-button.tsxrename to packages/admin/src/components/spree/back-button.tsxdiff --git a/packages/admin/src/components/can.tsx b/packages/admin/src/components/spree/can.tsxsimilarity index 100%rename from packages/admin/src/components/can.tsxrename to packages/admin/src/components/spree/can.tsxdiff --git a/packages/admin/src/components/confirm-dialog.tsx b/packages/admin/src/components/spree/confirm-dialog.tsxsimilarity index 100%rename from packages/admin/src/components/confirm-dialog.tsxrename to packages/admin/src/components/spree/confirm-dialog.tsxdiff --git a/packages/admin/src/components/spree/custom-fields/custom-fields-card.tsx b/packages/admin/src/components/spree/custom-fields/custom-fields-card.tsxnew file mode 100644index 0000000000..22d0445324--- /dev/null+++ b/packages/admin/src/components/spree/custom-fields/custom-fields-card.tsx@@ -0,0 +1,109 @@+import type { CustomFieldOwnerType } from '@spree/admin-sdk'+import { PencilIcon, TagIcon } from 'lucide-react'+import { Fragment, useState } from 'react'+import { EmptyState } from '@/components/spree/empty-state'+import { Button } from '@/components/ui/button'+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'+import { Skeleton } from '@/components/ui/skeleton'+import { useCustomFieldDefinitions, useCustomFields } from '@/hooks/use-custom-fields'+import { CustomFieldsDrawer } from './custom-fields-drawer'++interface CustomFieldsCardProps {+ ownerType: CustomFieldOwnerType+ ownerId: string+ /** Plural display label, e.g. "products". */+ resourceLabel: string+}++export function CustomFieldsCard({ ownerType, ownerId, resourceLabel }: CustomFieldsCardProps) {+ const [open, setOpen] = useState(false)+ const { data: definitionsResp, isLoading: defsLoading } = useCustomFieldDefinitions(ownerType)+ const { data: valuesResp, isLoading: valsLoading } = useCustomFields(ownerType, ownerId)++ const definitions = definitionsResp?.data ?? []+ const values = valuesResp?.data ?? []+ const valueByDefinition = new Map(values.map((v) => [v.custom_field_definition_id, v]))+ const isLoading = defsLoading || valsLoading++ const setCount = definitions.filter((d) => {+ const v = valueByDefinition.get(d.id)?.value+ return v !== null && v !== undefined && v !== ''+ }).length++ return (+ <>+ <Card>+ <CardHeader className="flex flex-row items-center justify-between gap-2 space-y-0">+ <CardTitle>Custom fields</CardTitle>+ <Button type="button" variant="outline" size="sm" onClick={() => setOpen(true)}>+ <PencilIcon className="size-4" />+ {definitions.length === 0 ? 'Set up' : 'Edit'}+ </Button>+ </CardHeader>+ <CardContent>+ {isLoading ? (+ <div className="flex flex-col gap-2">+ <Skeleton className="h-4 w-3/4" />+ <Skeleton className="h-4 w-1/2" />+ </div>+ ) : definitions.length === 0 ? (+ <EmptyState+ compact+ icon={<TagIcon />}+ title="No custom fields yet"+ description="Track structured details like material, fit, or care instructions."+ />+ ) : (+ <div className="flex flex-col gap-3">+ <dl className="grid grid-cols-[minmax(160px,1fr)_2fr] gap-x-4 gap-y-2 text-sm">+ {definitions.map((def) => {+ const value = valueByDefinition.get(def.id)?.value+ return (+ <Fragment key={def.id}>+ <dt className="flex flex-col">+ <span className="font-medium">{def.label}</span>+ <code className="text-xs text-muted-foreground">+ {def.namespace}.{def.key}+ </code>+ </dt>+ <dd className="text-foreground/90 break-words">+ {formatValue(value, def.field_type)}+ </dd>+ </Fragment>+ )+ })}+ </dl>+ {setCount < definitions.length && (+ <p className="text-xs text-muted-foreground border-t pt-2">+ {definitions.length - setCount} of {definitions.length} not yet set+ </p>+ )}+ </div>+ )}+ </CardContent>+ </Card>++ <CustomFieldsDrawer+ open={open}+ onOpenChange={setOpen}+ ownerType={ownerType}+ ownerId={ownerId}+ resourceLabel={resourceLabel}+ />+ </>+ )+}++function formatValue(value: unknown, fieldType: string): string {+ if (value === null || value === undefined || value === '') return '—'+ if (fieldType === 'boolean') return value ? 'Yes' : 'No'+ if (fieldType === 'rich_text' && typeof value === 'string') {+ // Plain-text preview of HTML for the summary row. DOMParser handles+ // nested/malformed tags correctly — a single-pass regex strip can leak+ // tags via patterns like `<scr<script>ipt>` (CodeQL js/incomplete-multi-character-sanitization).+ const text = new DOMParser().parseFromString(value, 'text/html').body.textContent ?? ''+ return text.trim() || '—'+ }+ if (fieldType === 'json') return typeof value === 'string' ? value : JSON.stringify(value)+ return String(value)+}diff --git a/packages/admin/src/components/spree/custom-fields/custom-fields-drawer.tsx b/packages/admin/src/components/spree/custom-fields/custom-fields-drawer.tsxnew file mode 100644index 0000000000..133b9496e8--- /dev/null+++ b/packages/admin/src/components/spree/custom-fields/custom-fields-drawer.tsx@@ -0,0 +1,390 @@+import type { CustomFieldOwnerType } from '@spree/admin-sdk'+import { ArrowLeftIcon, CheckCircle2Icon, Loader2Icon, PlusIcon, SaveIcon } from 'lucide-react'+import { type ReactNode, useEffect, useMemo, useState } from 'react'+import { useForm } from 'react-hook-form'+import { toast } from 'sonner'+import { EmptyState } from '@/components/spree/empty-state'+import { Button } from '@/components/ui/button'+import { Field, FieldLabel } from '@/components/ui/field'+import { Sheet, SheetContent, SheetFooter, SheetHeader, SheetTitle } from '@/components/ui/sheet'+import { Skeleton } from '@/components/ui/skeleton'+import {+ useCreateCustomField,+ useCustomFieldDefinitions,+ useCustomFields,+ useDeleteCustomField,+ useUpdateCustomField,+} from '@/hooks/use-custom-fields'+import { DefinitionForm } from './definition-form'+import { ValueInput } from './value-input'++type View = 'values' | 'new-definition' | 'definition-created'++interface CustomFieldsDrawerProps {+ open: boolean+ onOpenChange: (open: boolean) => void+ ownerType: CustomFieldOwnerType+ ownerId: string+ /** Display name for the resource type (e.g., "products"). */+ resourceLabel: string+}++export function CustomFieldsDrawer({+ open,+ onOpenChange,+ ownerType,+ ownerId,+ resourceLabel,+}: CustomFieldsDrawerProps) {+ const [view, setView] = useState<View>('values')+ const [lastCreatedDefinitionId, setLastCreatedDefinitionId] = useState<string | null>(null)++ // Reset to values view when the drawer reopens+ useEffect(() => {+ if (open) setView('values')+ }, [open])++ const header =+ view === 'values' ? (+ <SheetTitle>Custom fields</SheetTitle>+ ) : (+ <div className="flex items-center gap-2">+ <Button+ type="button"+ variant="ghost"+ size="icon-sm"+ onClick={() => setView('values')}+ aria-label="Back"+ >+ <ArrowLeftIcon className="size-4" />+ </Button>+ <SheetTitle>+ {view === 'new-definition' ? 'New custom field' : 'Definition created'}+ </SheetTitle>+ </div>+ )++ return (+ <Sheet open={open} onOpenChange={onOpenChange}>+ <SheetContent side="right" showCloseButton className="overflow-hidden">+ {view === 'values' && (+ <ValuesView+ ownerType={ownerType}+ ownerId={ownerId}+ resourceLabel={resourceLabel}+ onAddDefinition={() => setView('new-definition')}+ highlightedDefinitionId={lastCreatedDefinitionId}+ onClearHighlight={() => setLastCreatedDefinitionId(null)}+ onClose={() => onOpenChange(false)}+ header={header}+ />+ )}+ {view === 'new-definition' && (+ <NewDefinitionView+ resourceType={ownerType}+ header={header}+ onCancel={() => setView('values')}+ onSuccess={(id) => {+ setLastCreatedDefinitionId(id)+ setView('definition-created')+ toast.success('Definition created')+ }}+ />+ )}+ {view === 'definition-created' && (+ <>+ <SheetHeader>{header}</SheetHeader>+ <div className="flex-1 overflow-y-auto p-4">+ <DefinitionCreatedView+ onAddAnother={() => setView('new-definition')}+ onSetValues={() => setView('values')}+ />+ </div>+ </>+ )}+ </SheetContent>+ </Sheet>+ )+}++// ---------------------------------------------------------------------------+// New-definition view — owns the SheetHeader, body, and SheetFooter so the+// submit button is inside the same <form> as the inputs (no cross-DOM tricks).+// ---------------------------------------------------------------------------++function NewDefinitionView({+ resourceType,+ header,+ onCancel,+ onSuccess,+}: {+ resourceType: CustomFieldOwnerType+ header: React.ReactNode+ onCancel: () => void+ onSuccess: (id: string) => void+}) {+ return (+ <DefinitionForm+ resourceType={resourceType}+ onSuccess={onSuccess}+ renderShell={({ fields, submitButton }) => (+ <>+ <SheetHeader>{header}</SheetHeader>+ <div className="flex-1 overflow-y-auto p-4">{fields}</div>+ <SheetFooter>+ <Button type="button" variant="outline" size="sm" onClick={onCancel}>+ Cancel+ </Button>+ {submitButton}+ </SheetFooter>+ </>+ )}+ />+ )+}++// ---------------------------------------------------------------------------+// Values view+// ---------------------------------------------------------------------------++interface ValuesViewProps {+ ownerType: CustomFieldOwnerType+ ownerId: string+ resourceLabel: string+ onAddDefinition: () => void+ highlightedDefinitionId: string | null+ onClearHighlight: () => void+ onClose: () => void+ header: ReactNode+}++function ValuesView({+ ownerType,+ ownerId,+ resourceLabel,+ onAddDefinition,+ highlightedDefinitionId,+ onClearHighlight,+ onClose,+ header,+}: ValuesViewProps) {+ const { data: definitionsResp, isLoading: defsLoading } = useCustomFieldDefinitions(ownerType)+ const { data: valuesResp, isLoading: valsLoading } = useCustomFields(ownerType, ownerId)+ const createValue = useCreateCustomField(ownerType, ownerId)+ const updateValue = useUpdateCustomField(ownerType, ownerId)+ const deleteValue = useDeleteCustomField(ownerType, ownerId)++ const definitions = useMemo(() => definitionsResp?.data ?? [], [definitionsResp])+ const values = useMemo(() => valuesResp?.data ?? [], [valuesResp])++ // Build a map: definitionId → value record+ const valueByDefinition = useMemo(+ () => new Map(values.map((v) => [v.custom_field_definition_id, v])),+ [values],+ )++ // Default values keyed by definition id+ const defaultFormValues = useMemo(() => {+ const next: Record<string, unknown> = {}+ for (const def of definitions) {+ next[def.id] = valueByDefinition.get(def.id)?.value ?? null+ }+ return next+ }, [definitions, valueByDefinition])++ const form = useForm<Record<string, unknown>>({+ defaultValues: defaultFormValues,+ })++ // Reset form when definitions or stored values change+ useEffect(() => {+ form.reset(defaultFormValues)+ }, [defaultFormValues, form])++ const isLoading = defsLoading || valsLoading+ const isSaving = createValue.isPending || updateValue.isPending || deleteValue.isPending++ if (isLoading) {+ return (+ <>+ <SheetHeader>{header}</SheetHeader>+ <div className="flex-1 overflow-y-auto p-4">+ <div className="flex flex-col gap-4">+ <Skeleton className="h-20 w-full rounded-md" />+ <Skeleton className="h-20 w-full rounded-md" />+ </div>+ </div>+ </>+ )+ }++ if (definitions.length === 0) {+ return (+ <>+ <SheetHeader>{header}</SheetHeader>+ <div className="flex-1 overflow-y-auto p-4">+ <EmptyState+ title={`No custom fields defined for ${resourceLabel}`}+ description="Define a custom field to store typed, structured information alongside your records."+ action={+ <Button type="button" size="sm" onClick={onAddDefinition}>+ <PlusIcon className="size-4" />+ Create definition+ </Button>+ }+ />+ </div>+ </>+ )+ }++ const onSubmit = form.handleSubmit(async (formValues) => {+ const tasks: Promise<unknown>[] = []+ for (const def of definitions) {+ const submitted = formValues[def.id]+ const existing = valueByDefinition.get(def.id)+ const isEmpty = submitted === null || submitted === undefined || submitted === ''++ if (existing) {+ if (isEmpty) {+ tasks.push(deleteValue.mutateAsync(existing.id))+ } else if (submitted !== existing.value) {+ tasks.push(updateValue.mutateAsync({ id: existing.id, value: submitted }))+ }+ } else if (!isEmpty) {+ tasks.push(+ createValue.mutateAsync({+ custom_field_definition_id: def.id,+ value: submitted,+ }),+ )+ }+ }++ if (tasks.length === 0) {+ onClose()+ return+ }++ try {+ await Promise.all(tasks)+ toast.success('Custom fields saved')+ onClose()+ } catch (err) {+ const message = err instanceof Error ? err.message : 'Failed to save custom fields'+ toast.error(message)+ }+ })++ return (+ <form+ onSubmit={(e) => {+ // The drawer is portaled out of the DOM but React bubbles synthetic+ // events through the React tree, so without this guard the outer+ // product form's onSubmit also fires. Hard-stop here.+ e.stopPropagation()+ onSubmit(e)+ }}+ className="flex h-full flex-col"+ >+ <SheetHeader>{header}</SheetHeader>+ <div className="flex-1 overflow-y-auto p-4">+ <div className="flex flex-col gap-5">+ {definitions.map((def) => {+ const isHighlighted = def.id === highlightedDefinitionId+ return (+ <Field+ key={def.id}+ className={+ isHighlighted+ ? 'rounded-md ring-2 ring-primary/40 ring-offset-2 transition-shadow'+ : undefined+ }+ >+ <div className="flex items-baseline justify-between">+ <FieldLabel htmlFor={`cf-${def.id}`}>+ <span className="font-medium">{def.label}</span>{' '}+ <code className="text-xs text-muted-foreground">+ {def.namespace}.{def.key}+ </code>+ </FieldLabel>+ {!def.storefront_visible && (+ <span className="text-xs text-muted-foreground">Admin only</span>+ )}+ </div>+ <ValueInput+ control={form.control}+ name={def.id}+ fieldType={def.field_type}+ id={`cf-${def.id}`}+ />+ </Field>+ )+ })}+ </div>++ <div className="mt-6 flex items-center justify-start border-t pt-4">+ <Button+ type="button"+ variant="ghost"+ size="sm"+ onClick={() => {+ onClearHighlight()+ onAddDefinition()+ }}+ >+ <PlusIcon className="size-4" />+ Add another field+ </Button>+ </div>+ </div>++ <SheetFooter>+ <Button type="button" variant="outline" size="sm" onClick={onClose}>+ Cancel+ </Button>+ <Button type="submit" size="sm" disabled={isSaving}>+ {isSaving ? (+ <Loader2Icon className="size-4 animate-spin" />+ ) : (+ <SaveIcon className="size-4" />+ )}+ Save+ </Button>+ </SheetFooter>+ </form>+ )+}++// ---------------------------------------------------------------------------+// Definition created view+// ---------------------------------------------------------------------------++function DefinitionCreatedView({+ onAddAnother,+ onSetValues,+}: {+ onAddAnother: () => void+ onSetValues: () => void+}) {+ return (+ <div className="flex flex-col items-center gap-4 py-8 text-center">+ <CheckCircle2Icon className="size-10 text-emerald-500" />+ <div className="flex flex-col gap-1">+ <p className="text-base font-medium">Definition created</p>+ <p className="text-sm text-muted-foreground">+ You can set its value now or define another field first.+ </p>+ </div>+ <div className="mt-2 flex gap-2">+ <Button type="button" variant="outline" size="sm" onClick={onAddAnother}>+ <PlusIcon className="size-4" />+ Create another+ </Button>+ <Button type="button" size="sm" onClick={onSetValues}>+ Set values+ </Button>+ </div>+ </div>+ )+}diff --git a/packages/admin/src/components/spree/custom-fields/definition-form.tsx b/packages/admin/src/components/spree/custom-fields/definition-form.tsxnew file mode 100644index 0000000000..f6b096e404--- /dev/null+++ b/packages/admin/src/components/spree/custom-fields/definition-form.tsx@@ -0,0 +1,181 @@+import { zodResolver } from '@hookform/resolvers/zod'+import { Loader2Icon } from 'lucide-react'+import type { ReactNode } from 'react'+import { Controller, useForm } from 'react-hook-form'+import { z } from 'zod/v4'+import { Button } from '@/components/ui/button'+import { Field, FieldLabel } from '@/components/ui/field'+import { Input } from '@/components/ui/input'+import {+ Select,+ SelectContent,+ SelectItem,+ SelectTrigger,+ SelectValue,+} from '@/components/ui/select'+import { Switch } from '@/components/ui/switch'+import { useCreateCustomFieldDefinition } from '@/hooks/use-custom-fields'++const FIELD_TYPES = [+ { value: 'short_text', label: 'Short text' },+ { value: 'long_text', label: 'Long text' },+ { value: 'rich_text', label: 'Rich text' },+ { value: 'number', label: 'Number' },+ { value: 'boolean', label: 'Boolean' },+ { value: 'json', label: 'JSON' },+] as const++const definitionSchema = z.object({+ label: z.string().min(1, 'Required'),+ namespace: z.string().min(1, 'Required'),+ key: z+ .string()+ .min(1, 'Required')+ .regex(/^[a-z0-9_]+$/i, 'Letters, numbers, underscore only'),+ field_type: z.enum(['short_text', 'long_text', 'rich_text', 'number', 'boolean', 'json']),+ storefront_visible: z.boolean(),+})++export type DefinitionFormValues = z.infer<typeof definitionSchema>++interface DefinitionFormProps {+ resourceType: string+ /** Default namespace; "custom" mirrors Shopify/Saleor convention. */+ defaultNamespace?: string+ onSuccess: (definitionId: string) => void+ /**+ * Render-prop that builds the surrounding chrome (header/footer/etc) AROUND+ * the form fields and the submit button. The submit button must stay inside+ * the same `<form>` as the inputs, so the consumer composes layout, not the+ * form element itself.+ */+ renderShell: (parts: { fields: ReactNode; submitButton: ReactNode }) => ReactNode+}++export function DefinitionForm({+ resourceType,+ defaultNamespace = 'custom',+ onSuccess,+ renderShell,+}: DefinitionFormProps) {+ const create = useCreateCustomFieldDefinition(resourceType)++ const form = useForm<DefinitionFormValues>({+ resolver: zodResolver(definitionSchema),+ defaultValues: {+ label: '',+ namespace: defaultNamespace,+ key: '',+ field_type: 'short_text',+ storefront_visible: false,+ },+ })++ const onSubmit = async (values: DefinitionFormValues) => {+ try {+ const result = await create.mutateAsync({ ...values, resource_type: resourceType })+ onSuccess(result.id)+ } catch (err) {+ const message = err instanceof Error ? err.message : 'Failed to create definition'+ form.setError('root', { message })+ }+ }++ const fields = (+ <div className="flex flex-col gap-4">+ {form.formState.errors.root && (+ <div className="rounded-md bg-destructive/10 px-3 py-2 text-sm text-destructive">+ {form.formState.errors.root.message}+ </div>+ )}++ <Field>+ <FieldLabel htmlFor="label">Label</FieldLabel>+ <Input id="label" placeholder="e.g. Material" {...form.register('label')} />+ {form.formState.errors.label && (+ <p className="text-xs text-destructive">{form.formState.errors.label.message}</p>+ )}+ </Field>++ <div className="grid grid-cols-3 gap-3">+ <Field className="col-span-1">+ <FieldLabel htmlFor="namespace">Namespace</FieldLabel>+ <Input id="namespace" placeholder="custom" {...form.register('namespace')} />+ {form.formState.errors.namespace && (+ <p className="text-xs text-destructive">{form.formState.errors.namespace.message}</p>+ )}+ </Field>+ <Field className="col-span-2">+ <FieldLabel htmlFor="key">Key</FieldLabel>+ <Input id="key" placeholder="e.g. material" {...form.register('key')} />+ {form.formState.errors.key && (+ <p className="text-xs text-destructive">{form.formState.errors.key.message}</p>+ )}+ </Field>+ </div>++ <Field>+ <FieldLabel>Type</FieldLabel>+ <Controller+ name="field_type"+ control={form.control}+ render={({ field }) => (+ <Select value={field.value} onValueChange={field.onChange}>+ <SelectTrigger className="w-full">+ <SelectValue>+ {(value) => FIELD_TYPES.find((t) => t.value === value)?.label ?? value}+ </SelectValue>+ </SelectTrigger>+ <SelectContent>+ {FIELD_TYPES.map((t) => (+ <SelectItem key={t.value} value={t.value}>+ {t.label}+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ )}+ />+ </Field>++ <Field orientation="horizontal">+ <Controller+ name="storefront_visible"+ control={form.control}+ render={({ field }) => (+ <Switch+ id="storefront_visible"+ checked={field.value}+ onCheckedChange={field.onChange}+ />+ )}+ />+ <FieldLabel htmlFor="storefront_visible">Visible on storefront</FieldLabel>+ </Field>+ </div>+ )++ const submitButton = (+ <Button type="submit" size="sm" disabled={create.isPending}>+ {create.isPending && <Loader2Icon className="size-4 animate-spin" />}+ Create definition+ </Button>+ )++ const handleSubmit = form.handleSubmit(onSubmit)++ return (+ <form+ onSubmit={(e) => {+ // The drawer is portaled out of the DOM but React bubbles synthetic+ // events through the React tree, so without this guard the outer+ // product form's onSubmit also fires. Hard-stop here.+ e.stopPropagation()+ handleSubmit(e)+ }}+ className="flex h-full flex-col"+ >+ {renderShell({ fields, submitButton })}+ </form>+ )+}diff --git a/packages/admin/src/components/spree/custom-fields/value-input.tsx b/packages/admin/src/components/spree/custom-fields/value-input.tsxnew file mode 100644index 0000000000..409536a282--- /dev/null+++ b/packages/admin/src/components/spree/custom-fields/value-input.tsx@@ -0,0 +1,102 @@+import { type Control, Controller } from 'react-hook-form'+import { Input } from '@/components/ui/input'+import { RichTextEditor } from '@/components/ui/rich-text-editor'+import { Switch } from '@/components/ui/switch'+import { Textarea } from '@/components/ui/textarea'++type FieldType = 'short_text' | 'long_text' | 'rich_text' | 'number' | 'boolean' | 'json'++interface ValueInputProps {+ control: Control<Record<string, unknown>>+ name: string+ fieldType: FieldType+ id?: string+}++export function ValueInput({ control, name, fieldType, id }: ValueInputProps) {+ return (+ <Controller+ name={name}+ control={control}+ render={({ field }) => {+ switch (fieldType) {+ case 'short_text':+ return (+ <Input+ id={id}+ value={(field.value as string | null | undefined) ?? ''}+ onChange={field.onChange}+ onBlur={field.onBlur}+ />+ )+ case 'long_text':+ return (+ <Textarea+ id={id}+ rows={4}+ value={(field.value as string | null | undefined) ?? ''}+ onChange={field.onChange}+ onBlur={field.onBlur}+ />+ )+ case 'rich_text':+ return (+ <RichTextEditor+ value={(field.value as string | null | undefined) ?? ''}+ onChange={field.onChange}+ />+ )+ case 'number':+ return (+ <Input+ id={id}+ type="number"+ step="any"+ value={field.value === null || field.value === undefined ? '' : String(field.value)}+ onChange={(e) => {+ const v = e.target.value+ field.onChange(v === '' ? null : Number(v))+ }}+ onBlur={field.onBlur}+ />+ )+ case 'boolean':+ return (+ <Switch id={id} checked={Boolean(field.value)} onCheckedChange={field.onChange} />+ )+ case 'json':+ return (+ <Textarea+ id={id}+ rows={6}+ className="font-mono text-xs"+ placeholder='{"key": "value"}'+ value={+ field.value === null || field.value === undefined+ ? ''+ : typeof field.value === 'string'+ ? field.value+ : JSON.stringify(field.value, null, 2)+ }+ onChange={(e) => field.onChange(e.target.value)}+ onBlur={(e) => {+ field.onBlur()+ // Try to parse on blur so the form holds an object, not a string+ const v = e.target.value.trim()+ if (!v) {+ field.onChange(null)+ return+ }+ try {+ field.onChange(JSON.parse(v))+ } catch {+ // leave as raw string; submit will surface the server error+ }+ }}+ />+ )+ }+ }}+ />+ )+}diff --git a/packages/admin/src/components/spree/metadata/metadata-card.tsx b/packages/admin/src/components/spree/metadata/metadata-card.tsxnew file mode 100644index 0000000000..237e2e5fc6--- /dev/null+++ b/packages/admin/src/components/spree/metadata/metadata-card.tsx@@ -0,0 +1,55 @@+import { BracesIcon } from 'lucide-react'+import { Fragment } from 'react'+import { EmptyState } from '@/components/spree/empty-state'+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'++interface MetadataCardProps {+ /**+ * Free-form metadata stored on the record. Read-only — apps and integrations+ * write to this; admins just see what's there. Always an object (possibly+ * empty); the API never returns `null`.+ */+ metadata: Record<string, unknown>+}++export function MetadataCard({ metadata }: MetadataCardProps) {+ const entries = Object.entries(metadata)++ return (+ <Card>+ <CardHeader>+ <CardTitle>Metadata</CardTitle>+ </CardHeader>+ <CardContent>+ {entries.length === 0 ? (+ <EmptyState+ compact+ icon={<BracesIcon />}+ title="No metadata"+ description="Apps and integrations populate this automatically."+ />+ ) : (+ <dl className="grid grid-cols-[minmax(160px,1fr)_2fr] gap-x-4 gap-y-2 text-sm">+ {entries.map(([key, value]) => (+ <Fragment key={key}>+ <dt>+ <code className="text-xs text-muted-foreground">{key}</code>+ </dt>+ <dd className="text-foreground/90 break-words font-mono text-xs">+ {formatValue(value)}+ </dd>+ </Fragment>+ ))}+ </dl>+ )}+ </CardContent>+ </Card>+ )+}++function formatValue(value: unknown): string {+ if (value === null || value === undefined) return '—'+ if (typeof value === 'string') return value+ if (typeof value === 'number' || typeof value === 'boolean') return String(value)+ return JSON.stringify(value)+}diff --git a/packages/admin/src/components/nav-main.tsx b/packages/admin/src/components/spree/nav-main.tsxsimilarity index 100%rename from packages/admin/src/components/nav-main.tsxrename to packages/admin/src/components/spree/nav-main.tsxdiff --git a/packages/admin/src/components/nav-user.tsx b/packages/admin/src/components/spree/nav-user.tsxsimilarity index 100%rename from packages/admin/src/components/nav-user.tsxrename to packages/admin/src/components/spree/nav-user.tsxdiff --git a/packages/admin/src/components/spree/page-header.tsx b/packages/admin/src/components/spree/page-header.tsxindex a1eac3dee0..cae07cff3d 100644--- a/packages/admin/src/components/spree/page-header.tsx+++ b/packages/admin/src/components/spree/page-header.tsx@@ -1,8 +1,8 @@import { useParams } from '@tanstack/react-router'import { BracesIcon, CheckIcon, CopyIcon, EllipsisVerticalIcon, TrashIcon } from 'lucide-react'import { lazy, type ReactNode, Suspense, useState } from 'react'-import { BackButton } from '@/components/back-button'-import { useConfirm } from '@/components/confirm-dialog'+import { BackButton } from '@/components/spree/back-button'+import { useConfirm } from '@/components/spree/confirm-dialog'import type { JsonPreviewDrawerProps } from '@/components/spree/json-preview-drawer'import { Slot } from '@/components/spree/slot'import { Button } from '@/components/ui/button'diff --git a/packages/admin/src/components/resource-table.tsx b/packages/admin/src/components/spree/resource-table.tsxsimilarity index 99%rename from packages/admin/src/components/resource-table.tsxrename to packages/admin/src/components/spree/resource-table.tsxindex 6974a38c0f..d7b4548212 100644--- a/packages/admin/src/components/resource-table.tsx+++ b/packages/admin/src/components/spree/resource-table.tsx@@ -3,7 +3,7 @@ import { useNavigate } from '@tanstack/react-router'import { type ReactNode, useDeferredValue, useState } from 'react'import { z } from 'zod/v4'import { EmptyState } from '@/components/spree/empty-state'-import { TableToolbar } from '@/components/table-toolbar'+import { TableToolbar } from '@/components/spree/table-toolbar'import { Card, CardContent } from '@/components/ui/card'import {Table,diff --git a/packages/admin/src/components/store-switcher.tsx b/packages/admin/src/components/spree/store-switcher.tsxsimilarity index 100%rename from packages/admin/src/components/store-switcher.tsxrename to packages/admin/src/components/spree/store-switcher.tsxdiff --git a/packages/admin/src/components/table-toolbar.tsx b/packages/admin/src/components/spree/table-toolbar.tsxsimilarity index 99%rename from packages/admin/src/components/table-toolbar.tsxrename to packages/admin/src/components/spree/table-toolbar.tsxindex a01ed6ce9b..ee72352446 100644--- a/packages/admin/src/components/table-toolbar.tsx+++ b/packages/admin/src/components/spree/table-toolbar.tsx@@ -30,8 +30,8 @@ import {SelectTrigger,SelectValue,} from '@/components/ui/select'+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'import type { ColumnDef, FilterRule, SortOption } from '@/lib/table-registry'-import { Tooltip, TooltipContent, TooltipTrigger } from './ui/tooltip'interface TableToolbarProps {/** Displayable columns (for column selector and table headers) */diff --git a/packages/admin/src/components/tag-combobox.tsx b/packages/admin/src/components/spree/tag-combobox.tsxsimilarity index 100%rename from packages/admin/src/components/tag-combobox.tsxrename to packages/admin/src/components/spree/tag-combobox.tsxdiff --git a/packages/admin/src/components/date-range-picker.tsx b/packages/admin/src/components/ui/date-range-picker.tsxsimilarity index 100%rename from packages/admin/src/components/date-range-picker.tsxrename to packages/admin/src/components/ui/date-range-picker.tsxdiff --git a/packages/admin/src/components/ui/rich-text-editor.tsx b/packages/admin/src/components/ui/rich-text-editor.tsxindex f9d6832e79..e893b715a1 100644--- a/packages/admin/src/components/ui/rich-text-editor.tsx+++ b/packages/admin/src/components/ui/rich-text-editor.tsx@@ -153,7 +153,7 @@ export function RichTextEditor({{/* Editor */}<EditorContenteditor={editor}- className="prose prose-sm max-w-none px-3 py-2 min-h-32 [&_.tiptap]:outline-none [&_.tiptap.is-editor-empty:first-child::before]:text-gray-500 [&_.tiptap.is-editor-empty:first-child::before]:content-[attr(data-placeholder)] [&_.tiptap.is-editor-empty:first-child::before]:float-left [&_.tiptap.is-editor-empty:first-child::before]:h-0 [&_.tiptap.is-editor-empty:first-child::before]:pointer-events-none"+ className="prose prose-sm max-w-none px-3 py-2 [&_.tiptap]:min-h-32 [&_.tiptap]:outline-none [&_.tiptap.is-editor-empty:first-child::before]:text-gray-500 [&_.tiptap.is-editor-empty:first-child::before]:content-[attr(data-placeholder)] [&_.tiptap.is-editor-empty:first-child::before]:float-left [&_.tiptap.is-editor-empty:first-child::before]:h-0 [&_.tiptap.is-editor-empty:first-child::before]:pointer-events-none"/></div>)diff --git a/packages/admin/src/components/ui/sheet.tsx b/packages/admin/src/components/ui/sheet.tsxindex 28d85cb3c5..e20c9e73e9 100644--- a/packages/admin/src/components/ui/sheet.tsx+++ b/packages/admin/src/components/ui/sheet.tsx@@ -11,12 +11,23 @@ function Sheet({open,defaultOpen,onOpenChange,+ modal,...props}: {children?: React.ReactNodeopen?: booleandefaultOpen?: booleanonOpenChange?: (open: boolean, eventDetails: SheetPrimitive.Root.ChangeEventDetails) => void+ /**+ * `true` (default) — full modal: focus trap + scroll lock + outside pointer interactions disabled.+ * `'trap-focus'` — focus trap only; outside pointer interactions remain enabled.+ * `false` — no modal behavior.+ *+ * Use `'trap-focus'` when the sheet contains a contenteditable (e.g. tiptap)+ * — the full-modal pointer-down listeners on `document` with `capture: true`+ * race with ProseMirror's own pointer handlers and break click-to-focus.+ */+ modal?: boolean | 'trap-focus'}) {return (<SheetPrimitive.Root@@ -24,6 +35,7 @@ function Sheet({open={open}defaultOpen={defaultOpen}onOpenChange={onOpenChange}+ modal={modal}{...props}>{children}diff --git a/packages/admin/src/hooks/use-custom-fields.ts b/packages/admin/src/hooks/use-custom-fields.tsnew file mode 100644index 0000000000..ac81254ed7--- /dev/null+++ b/packages/admin/src/hooks/use-custom-fields.ts@@ -0,0 +1,98 @@+import type {+ CustomFieldCreateParams,+ CustomFieldDefinitionCreateParams,+ CustomFieldDefinitionUpdateParams,+ CustomFieldOwnerType,+ CustomFieldUpdateParams,+} from '@spree/admin-sdk'+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'+import { adminClient } from '@/client'++const valuesKey = (ownerType: CustomFieldOwnerType, ownerId: string) =>+ ['custom-fields', ownerType, ownerId] as const++const definitionsKey = (resourceType: string) => ['custom-field-definitions', resourceType] as const++export function useCustomFields(ownerType: CustomFieldOwnerType, ownerId: string) {+ return useQuery({+ queryKey: valuesKey(ownerType, ownerId),+ queryFn: () => adminClient.customFields(ownerType, ownerId).list({ per_page: 100 }),+ enabled: !!ownerId,+ })+}++export function useCustomFieldDefinitions(resourceType: string) {+ return useQuery({+ queryKey: definitionsKey(resourceType),+ queryFn: () =>+ adminClient.customFieldDefinitions.list({+ per_page: 100,+ resource_type_eq: resourceType,+ }),+ enabled: !!resourceType,+ })+}++export function useCreateCustomField(ownerType: CustomFieldOwnerType, ownerId: string) {+ const queryClient = useQueryClient()+ return useMutation({+ mutationFn: (params: CustomFieldCreateParams) =>+ adminClient.customFields(ownerType, ownerId).create(params),+ onSuccess: () => {+ queryClient.invalidateQueries({ queryKey: valuesKey(ownerType, ownerId) })+ },+ })+}++export function useUpdateCustomField(ownerType: CustomFieldOwnerType, ownerId: string) {+ const queryClient = useQueryClient()+ return useMutation({+ mutationFn: ({ id, ...params }: { id: string } & CustomFieldUpdateParams) =>+ adminClient.customFields(ownerType, ownerId).update(id, params),+ onSuccess: () => {+ queryClient.invalidateQueries({ queryKey: valuesKey(ownerType, ownerId) })+ },+ })+}++export function useDeleteCustomField(ownerType: CustomFieldOwnerType, ownerId: string) {+ const queryClient = useQueryClient()+ return useMutation({+ mutationFn: (id: string) => adminClient.customFields(ownerType, ownerId).delete(id),+ onSuccess: () => {+ queryClient.invalidateQueries({ queryKey: valuesKey(ownerType, ownerId) })+ },+ })+}++export function useCreateCustomFieldDefinition(resourceType: string) {+ const queryClient = useQueryClient()+ return useMutation({+ mutationFn: (params: CustomFieldDefinitionCreateParams) =>+ adminClient.customFieldDefinitions.create(params),+ onSuccess: () => {+ queryClient.invalidateQueries({ queryKey: definitionsKey(resourceType) })+ },+ })+}++export function useUpdateCustomFieldDefinition(resourceType: string) {+ const queryClient = useQueryClient()+ return useMutation({+ mutationFn: ({ id, ...params }: { id: string } & CustomFieldDefinitionUpdateParams) =>+ adminClient.customFieldDefinitions.update(id, params),+ onSuccess: () => {+ queryClient.invalidateQueries({ queryKey: definitionsKey(resourceType) })+ },+ })+}++export function useDeleteCustomFieldDefinition(resourceType: string) {+ const queryClient = useQueryClient()+ return useMutation({+ mutationFn: (id: string) => adminClient.customFieldDefinitions.delete(id),+ onSuccess: () => {+ queryClient.invalidateQueries({ queryKey: definitionsKey(resourceType) })+ },+ })+}diff --git a/packages/admin/src/main.tsx b/packages/admin/src/main.tsxindex bbfb745b2b..638ce3a91d 100644--- a/packages/admin/src/main.tsx+++ b/packages/admin/src/main.tsx@@ -2,7 +2,7 @@ import { QueryClientProvider } from '@tanstack/react-query'import { RouterProvider } from '@tanstack/react-router'import { StrictMode } from 'react'import { createRoot } from 'react-dom/client'-import { ConfirmProvider } from '@/components/confirm-dialog'+import { ConfirmProvider } from '@/components/spree/confirm-dialog'import { TooltipProvider } from '@/components/ui/tooltip'import { useAuth } from '@/hooks/use-auth'import { queryClient } from '@/lib/query-client'diff --git a/packages/admin/src/routes/_authenticated/$storeId.tsx b/packages/admin/src/routes/_authenticated/$storeId.tsxindex b3fc2e1ed5..813eb304f8 100644--- a/packages/admin/src/routes/_authenticated/$storeId.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId.tsx@@ -1,7 +1,7 @@import { createFileRoute, Outlet } from '@tanstack/react-router'import { useEffect } from 'react'import { adminClient } from '@/client'-import { AppSidebar } from '@/components/app-sidebar'+import { AppSidebar } from '@/components/spree/app-sidebar'import { SidebarInset, SidebarProvider, SidebarTrigger } from '@/components/ui/sidebar'import { StoreProvider } from '@/providers/store-provider'diff --git a/packages/admin/src/routes/_authenticated/$storeId/customers/$customerId.tsx b/packages/admin/src/routes/_authenticated/$storeId/customers/$customerId.tsxindex acf17afaaf..a56184cd0e 100644--- a/packages/admin/src/routes/_authenticated/$storeId/customers/$customerId.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/customers/$customerId.tsx@@ -12,12 +12,14 @@ import {} from 'lucide-react'import { type FormEvent, useState } from 'react'import { adminClient } from '@/client'-import { AddressFormDialog, type AddressParams } from '@/components/address-form-dialog'-import { useConfirm } from '@/components/confirm-dialog'+import { AddressFormDialog, type AddressParams } from '@/components/spree/address-form-dialog'+import { useConfirm } from '@/components/spree/confirm-dialog'+import { CustomFieldsCard } from '@/components/spree/custom-fields/custom-fields-card'+import { MetadataCard } from '@/components/spree/metadata/metadata-card'import { PageHeader } from '@/components/spree/page-header'import { ResourceLayout } from '@/components/spree/resource-layout'import { ErrorState } from '@/components/spree/route-error-boundary'-import { TagCombobox } from '@/components/tag-combobox'+import { TagCombobox } from '@/components/spree/tag-combobox'import { Badge, StatusBadge } from '@/components/ui/badge'import { Button } from '@/components/ui/button'import { Card, CardAction, CardContent, CardHeader, CardTitle } from '@/components/ui/card'@@ -125,6 +127,12 @@ function CustomerBody({ customer }: { customer: Customer }) {isLoading={isLoading}/><StoreCreditsCard customer={customer} />+ <CustomFieldsCard+ ownerType="Spree::User"+ ownerId={customer.id}+ resourceLabel="customers"+ />+ <MetadataCard metadata={customer.metadata} /></>}sidebar={diff --git a/packages/admin/src/routes/_authenticated/$storeId/customers/index.tsx b/packages/admin/src/routes/_authenticated/$storeId/customers/index.tsxindex 276784ce3a..b1c4dbeaf5 100644--- a/packages/admin/src/routes/_authenticated/$storeId/customers/index.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/customers/index.tsx@@ -1,6 +1,6 @@import { createFileRoute } from '@tanstack/react-router'import { adminClient } from '@/client'-import { ResourceTable, resourceSearchSchema } from '@/components/resource-table'+import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'import '@/tables/customers'export const Route = createFileRoute('/_authenticated/$storeId/customers/')({diff --git a/packages/admin/src/routes/_authenticated/$storeId/index.tsx b/packages/admin/src/routes/_authenticated/$storeId/index.tsxindex bd62054dc8..eb80a039b7 100644--- a/packages/admin/src/routes/_authenticated/$storeId/index.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/index.tsx@@ -6,7 +6,6 @@ import { PackageIcon } from 'lucide-react'import { useState } from 'react'import { Bar, BarChart, CartesianGrid, XAxis } from 'recharts'import { adminClient } from '@/client'-import { type DateRange, DateRangePicker } from '@/components/date-range-picker'import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'import {type ChartConfig,@@ -14,6 +13,7 @@ import {ChartTooltip,ChartTooltipContent,} from '@/components/ui/chart'+import { type DateRange, DateRangePicker } from '@/components/ui/date-range-picker'import { Skeleton } from '@/components/ui/skeleton'export const Route = createFileRoute('/_authenticated/$storeId/')({diff --git a/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsx b/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsxindex daa5a61ccc..9fea89c19f 100644--- a/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsx@@ -20,13 +20,15 @@ import {} from 'lucide-react'import { type FormEvent, useEffect, useState } from 'react'import { adminClient } from '@/client'-import { AddressBlock } from '@/components/address-block'-import { AddressFormDialog, type AddressParams } from '@/components/address-form-dialog'-import { useConfirm } from '@/components/confirm-dialog'+import { AddressBlock } from '@/components/spree/address-block'+import { AddressFormDialog, type AddressParams } from '@/components/spree/address-form-dialog'+import { useConfirm } from '@/components/spree/confirm-dialog'+import { CustomFieldsCard } from '@/components/spree/custom-fields/custom-fields-card'+import { MetadataCard } from '@/components/spree/metadata/metadata-card'import { PageHeader } from '@/components/spree/page-header'import { ResourceLayout } from '@/components/spree/resource-layout'import { ErrorState } from '@/components/spree/route-error-boundary'-import { TagCombobox } from '@/components/tag-combobox'+import { TagCombobox } from '@/components/spree/tag-combobox'import { Badge, StatusBadge } from '@/components/ui/badge'import { Button } from '@/components/ui/button'import { Card, CardAction, CardContent, CardHeader, CardTitle } from '@/components/ui/card'@@ -120,6 +122,8 @@ function OrderDetailPage() {<ShipmentsCard order={order} /><PaymentsCard order={order} /><OrderSummaryCard order={order} />+ <CustomFieldsCard ownerType="Spree::Order" ownerId={order.id} resourceLabel="orders" />+ <MetadataCard metadata={order.metadata} /></>}sidebar={diff --git a/packages/admin/src/routes/_authenticated/$storeId/orders/drafts.tsx b/packages/admin/src/routes/_authenticated/$storeId/orders/drafts.tsxindex e770a1916e..369b6af575 100644--- a/packages/admin/src/routes/_authenticated/$storeId/orders/drafts.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/orders/drafts.tsx@@ -1,7 +1,7 @@import { createFileRoute } from '@tanstack/react-router'import { PlusIcon } from 'lucide-react'import { adminClient } from '@/client'-import { ResourceTable, resourceSearchSchema } from '@/components/resource-table'+import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'import { Button } from '@/components/ui/button'import '@/tables/orders'diff --git a/packages/admin/src/routes/_authenticated/$storeId/orders/index.tsx b/packages/admin/src/routes/_authenticated/$storeId/orders/index.tsxindex c34366860b..3b950bddfa 100644--- a/packages/admin/src/routes/_authenticated/$storeId/orders/index.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/orders/index.tsx@@ -1,7 +1,7 @@import { createFileRoute, Link } from '@tanstack/react-router'import { PlusIcon } from 'lucide-react'import { adminClient } from '@/client'-import { ResourceTable, resourceSearchSchema } from '@/components/resource-table'+import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'import { Button } from '@/components/ui/button'import '@/tables/orders'diff --git a/packages/admin/src/routes/_authenticated/$storeId/products/$productId.tsx b/packages/admin/src/routes/_authenticated/$storeId/products/$productId.tsxindex 82b3b39619..6a7624cfde 100644--- a/packages/admin/src/routes/_authenticated/$storeId/products/$productId.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/products/$productId.tsx@@ -20,12 +20,14 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'import { Controller, type UseFormReturn, useForm } from 'react-hook-form'import { toast } from 'sonner'import { adminClient } from '@/client'-import { useConfirm } from '@/components/confirm-dialog'+import { useConfirm } from '@/components/spree/confirm-dialog'+import { CustomFieldsCard } from '@/components/spree/custom-fields/custom-fields-card'+import { MetadataCard } from '@/components/spree/metadata/metadata-card'import { PageHeader } from '@/components/spree/page-header'import { ResourceLayout } from '@/components/spree/resource-layout'import { ErrorState } from '@/components/spree/route-error-boundary'import { StickyFormFooter } from '@/components/spree/sticky-form-footer'-import { TagCombobox } from '@/components/tag-combobox'+import { TagCombobox } from '@/components/spree/tag-combobox'import { StatusBadge } from '@/components/ui/badge'import { Button } from '@/components/ui/button'import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'@@ -227,7 +229,12 @@ function ProductForm({ product }: { product: Product }) {<MediaCard productId={productId} />{!hasVariants && <PricingCard form={form} />}{!hasVariants && <InventoryCard form={form} />}- <SEOCard form={form} product={product} />+ <CustomFieldsCard+ ownerType="Spree::Product"+ ownerId={productId}+ resourceLabel="products"+ />+ <MetadataCard metadata={product.metadata} /></>}sidebar={@@ -236,6 +243,7 @@ function ProductForm({ product }: { product: Product }) {<CategorizationCard form={form} /><ShippingCard form={form} hasVariants={hasVariants} /><TaxCard form={form} />+ <SEOCard form={form} product={product} /></>}/>diff --git a/packages/admin/src/routes/_authenticated/$storeId/products/index.tsx b/packages/admin/src/routes/_authenticated/$storeId/products/index.tsxindex ef1a9f4588..bf76123934 100644--- a/packages/admin/src/routes/_authenticated/$storeId/products/index.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/products/index.tsx@@ -1,7 +1,7 @@import { createFileRoute } from '@tanstack/react-router'import { PlusIcon } from 'lucide-react'import { adminClient } from '@/client'-import { ResourceTable, resourceSearchSchema } from '@/components/resource-table'+import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'import { Button } from '@/components/ui/button'import '@/tables/products'