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
Re-use `AddressFormDialog` component in Customers UI
Damian Legawiec38021fdd019d
diff --git a/packages/admin/src/components/address-form-dialog.tsx b/packages/admin/src/components/address-form-dialog.tsxindex 620680a380..359443b411 100644--- a/packages/admin/src/components/address-form-dialog.tsx+++ b/packages/admin/src/components/address-form-dialog.tsx@@ -36,6 +36,9 @@ export interface AddressParams {country_iso: stringstate_abbr: stringphone: string+ label?: string+ is_default_billing?: boolean+ is_default_shipping?: boolean}type CountryOption = { iso: string; name: string }@@ -48,6 +51,8 @@ export function AddressFormDialog({onSave,title = 'Edit Address',isPending = false,+ showLabel = false,+ showDefaultFlags = false,}: {address: Address | null | undefinedopen: boolean@@ -55,6 +60,8 @@ export function AddressFormDialog({onSave: (address: AddressParams) => voidtitle?: stringisPending?: boolean+ showLabel?: boolean+ showDefaultFlags?: boolean}) {const { countries } = useCountries()@@ -63,13 +70,12 @@ export function AddressFormDialog({[countries],)- const initialCountry = useMemo(+ // Lazy initializer runs once on mount; the parent keys the dialog on the+ // address id so a fresh instance mounts for each open.+ const [selectedCountry, setSelectedCountry] = useState<CountryOption | null>(() => countryItems.find((c) => c.iso === address?.country_iso) ?? null,- [countryItems, address?.country_iso],)- const [selectedCountry, setSelectedCountry] = useState<CountryOption | null>(initialCountry)-const countryData = useMemo(() => countries.find((c) => c.iso === selectedCountry?.iso),[countries, selectedCountry],@@ -81,13 +87,10 @@ export function AddressFormDialog({[countryData],)- const initialState = useMemo(+ const [selectedState, setSelectedState] = useState<StateOption | null>(() => stateItems.find((s) => s.abbr === address?.state_abbr) ?? null,- [stateItems, address?.state_abbr],)- const [selectedState, setSelectedState] = useState<StateOption | null>(initialState)-const handleCountryChange = useCallback((country: CountryOption | null) => {setSelectedCountry(country)setSelectedState(null)@@ -106,6 +109,11 @@ export function AddressFormDialog({country_iso: selectedCountry?.iso ?? '',state_abbr: statesRequired ? (selectedState?.abbr ?? '') : (fd.get('state_abbr') as string),phone: fd.get('phone') as string,+ ...(showLabel && { label: (fd.get('label') as string) || undefined }),+ ...(showDefaultFlags && {+ is_default_billing: fd.get('is_default_billing') === 'on',+ is_default_shipping: fd.get('is_default_shipping') === 'on',+ }),})}@@ -127,6 +135,12 @@ export function AddressFormDialog({<form onSubmit={handleSubmit} onKeyDown={handleKeyDown} className="flex flex-col flex-1 overflow-hidden"><div className="flex-1 overflow-y-auto p-4"><FieldGroup>+ {showLabel && (+ <Field>+ <FieldLabel htmlFor="addr-label">Label</FieldLabel>+ <Input id="addr-label" name="label" placeholder="e.g. Home, Office" defaultValue={address?.label ?? ''} />+ </Field>+ )}<div className="grid grid-cols-2 gap-3"><Field><FieldLabel htmlFor="addr-fn">First name</FieldLabel>@@ -216,6 +230,22 @@ export function AddressFormDialog({<FieldLabel htmlFor="addr-phone">Phone</FieldLabel><Input id="addr-phone" name="phone" defaultValue={address?.phone ?? ''} /></Field>+ {showDefaultFlags && (+ <>+ <Field>+ <label className="flex items-center gap-2 text-sm">+ <input type="checkbox" name="is_default_billing" defaultChecked={address?.is_default_billing} />+ Default billing address+ </label>+ </Field>+ <Field>+ <label className="flex items-center gap-2 text-sm">+ <input type="checkbox" name="is_default_shipping" defaultChecked={address?.is_default_shipping} />+ Default shipping address+ </label>+ </Field>+ </>+ )}</FieldGroup></div><SheetFooter>diff --git a/packages/admin/src/hooks/use-countries.ts b/packages/admin/src/hooks/use-countries.tsindex f8213863da..e7a2278315 100644--- a/packages/admin/src/hooks/use-countries.ts+++ b/packages/admin/src/hooks/use-countries.ts@@ -5,8 +5,7 @@ import { adminClient } from '@/client'export function useCountries() {const { data, isLoading } = useQuery({queryKey: ['countries'],- queryFn: () =>- adminClient.countries.list({ limit: 250, expand: ['states'] }),+ queryFn: () => adminClient.countries.list({ expand: ['states'] }),staleTime: 1000 * 60 * 30, // 30 minutes — countries rarely change})diff --git a/packages/admin/src/routes/_authenticated/$storeId/customers/$customerId.tsx b/packages/admin/src/routes/_authenticated/$storeId/customers/$customerId.tsxindex 08b7028fe1..25418b6a86 100644--- a/packages/admin/src/routes/_authenticated/$storeId/customers/$customerId.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/customers/$customerId.tsx@@ -13,9 +13,11 @@ import {import { type FormEvent, useState } from 'react'import { adminClient } from '@/client'import { useAuth } from '@/hooks/use-auth'+import { AddressFormDialog, type AddressParams } from '@/components/address-form-dialog'import { BackButton } from '@/components/back-button'import { useConfirm } from '@/components/confirm-dialog'import { TagCombobox } from '@/components/tag-combobox'+import { useCountries } from '@/hooks/use-countries'import { Badge, StatusBadge } from '@/components/ui/badge'import { Button } from '@/components/ui/button'import { Card, CardAction, CardContent, CardHeader, CardTitle } from '@/components/ui/card'@@ -585,138 +587,68 @@ function AddressesCard({ customer }: { customer: Customer }) {)}</Card>- <AddressDialog- customerId={customer.id}- address={null}- open={addOpen}- onOpenChange={setAddOpen}- />- <AddressDialog- customerId={customer.id}- address={editing}- open={editing !== null}- onOpenChange={(o) => { if (!o) setEditing(null) }}- />+ {addOpen && (+ <CustomerAddressDialog+ customer={customer}+ address={newAddressTemplate(customer)}+ onOpenChange={setAddOpen}+ title="Add Address"+ />+ )}+ {editing && (+ <CustomerAddressDialog+ customer={customer}+ address={editing}+ onOpenChange={(o) => { if (!o) setEditing(null) }}+ title="Edit Address"+ />+ )}</>)}-function AddressDialog({- customerId,+function newAddressTemplate(customer: Customer): Address {+ return {+ first_name: customer.first_name ?? '',+ last_name: customer.last_name ?? '',+ phone: customer.phone ?? '',+ } as Address+}++function CustomerAddressDialog({+ customer,address,- open,onOpenChange,+ title,}: {- customerId: string- address: Address | null- open: boolean+ customer: Customer+ address: AddressonOpenChange: (open: boolean) => void+ title: string}) {- const isEdit = address !== null- const mutation = useCustomerMutation(customerId, (params: Record<string, unknown>) =>+ const { isLoading: countriesLoading } = useCountries()+ const isEdit = Boolean(address.id)+ const mutation = useCustomerMutation(customer.id, (params: AddressParams) =>isEdit- ? adminClient.customers.addresses.update(customerId, address!.id, params as Parameters<typeof adminClient.customers.addresses.update>[2])- : adminClient.customers.addresses.create(customerId, params as Parameters<typeof adminClient.customers.addresses.create>[1]),+ ? adminClient.customers.addresses.update(customer.id, address.id, params)+ : adminClient.customers.addresses.create(customer.id, params),)- function handleSubmit(e: FormEvent<HTMLFormElement>) {- e.preventDefault()- const fd = new FormData(e.currentTarget)- const payload: Record<string, unknown> = {- first_name: fd.get('first_name'),- last_name: fd.get('last_name'),- address1: fd.get('address1'),- address2: fd.get('address2'),- city: fd.get('city'),- postal_code: fd.get('postal_code'),- country_iso: fd.get('country_iso'),- state_abbr: fd.get('state_abbr'),- phone: fd.get('phone'),- label: fd.get('label'),- is_default_billing: fd.get('is_default_billing') === 'on',- is_default_shipping: fd.get('is_default_shipping') === 'on',- }- mutation.mutate(payload, { onSuccess: () => onOpenChange(false) })- }+ // Wait for countries before mounting so the country/state lazy initializer+ // can resolve the address's country_iso/state_abbr to a real option.+ if (countriesLoading) return nullreturn (- <Dialog open={open} onOpenChange={onOpenChange}>- <DialogContent>- <DialogHeader>- <DialogTitle>{isEdit ? 'Edit Address' : 'Add Address'}</DialogTitle>- </DialogHeader>- <form onSubmit={handleSubmit}>- <DialogBody>- <FieldGroup>- <Field>- <FieldLabel htmlFor="addr-label">Label</FieldLabel>- <Input id="addr-label" name="label" placeholder="e.g. Home, Office" defaultValue={address?.label ?? ''} />- </Field>- <div className="grid grid-cols-2 gap-3">- <Field>- <FieldLabel htmlFor="addr-first">First name</FieldLabel>- <Input id="addr-first" name="first_name" defaultValue={address?.first_name ?? ''} />- </Field>- <Field>- <FieldLabel htmlFor="addr-last">Last name</FieldLabel>- <Input id="addr-last" name="last_name" defaultValue={address?.last_name ?? ''} />- </Field>- </div>- <Field>- <FieldLabel htmlFor="addr-1">Address line 1</FieldLabel>- <Input id="addr-1" name="address1" defaultValue={address?.address1 ?? ''} required />- </Field>- <Field>- <FieldLabel htmlFor="addr-2">Address line 2</FieldLabel>- <Input id="addr-2" name="address2" defaultValue={address?.address2 ?? ''} />- </Field>- <div className="grid grid-cols-2 gap-3">- <Field>- <FieldLabel htmlFor="addr-city">City</FieldLabel>- <Input id="addr-city" name="city" defaultValue={address?.city ?? ''} required />- </Field>- <Field>- <FieldLabel htmlFor="addr-zip">Postal code</FieldLabel>- <Input id="addr-zip" name="postal_code" defaultValue={address?.postal_code ?? ''} required />- </Field>- </div>- <div className="grid grid-cols-2 gap-3">- <Field>- <FieldLabel htmlFor="addr-country">Country (ISO)</FieldLabel>- <Input id="addr-country" name="country_iso" defaultValue={address?.country_iso ?? ''} placeholder="US" required />- </Field>- <Field>- <FieldLabel htmlFor="addr-state">State / Province</FieldLabel>- <Input id="addr-state" name="state_abbr" defaultValue={address?.state_abbr ?? ''} placeholder="NY" />- </Field>- </div>- <Field>- <FieldLabel htmlFor="addr-phone">Phone</FieldLabel>- <Input id="addr-phone" name="phone" defaultValue={address?.phone ?? ''} />- </Field>- <Field>- <label className="flex items-center gap-2 text-sm">- <input type="checkbox" name="is_default_billing" defaultChecked={address?.is_default_billing} />- Default billing address- </label>- </Field>- <Field>- <label className="flex items-center gap-2 text-sm">- <input type="checkbox" name="is_default_shipping" defaultChecked={address?.is_default_shipping} />- Default shipping address- </label>- </Field>- </FieldGroup>- </DialogBody>- <DialogFooter>- <Button type="button" variant="outline" onClick={() => onOpenChange(false)}>Cancel</Button>- <Button type="submit" disabled={mutation.isPending}>- {mutation.isPending ? 'Saving…' : isEdit ? 'Save' : 'Add Address'}- </Button>- </DialogFooter>- </form>- </DialogContent>- </Dialog>+ <AddressFormDialog+ address={address}+ open+ onOpenChange={onOpenChange}+ onSave={(params) => mutation.mutate(params, { onSuccess: () => onOpenChange(false) })}+ title={title}+ isPending={mutation.isPending}+ showLabel+ showDefaultFlags+ />)}diff --git a/spree/api/app/controllers/spree/api/v3/admin/countries_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/countries_controller.rbindex f5e228fd88..45456c5c68 100644--- a/spree/api/app/controllers/spree/api/v3/admin/countries_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/countries_controller.rb@@ -3,6 +3,15 @@ module Spreemodule V3module Adminclass CountriesController < ResourceController+ # Override base index to skip pagination — there are ~250 countries+ # and address-form dropdowns need them all at once. Pagy's global+ # max_limit (100) prevents using the paginated path for this.+ def index+ authorize!(:read, model_class)+ @collection = scope+ render json: { data: serialize_collection(@collection), meta: { count: @collection.size } }+ end+protecteddef model_class@@ -17,12 +26,6 @@ module SpreeSpree::Country.all.order(:name)end- # Return all countries without pagination — there are ~250 and they're- # needed in full for address form dropdowns.- def limit- 1000- end-def find_resourcescope.find_by!(iso: params[:id].upcase)end