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
Added `<RelativeTime>` component in Admin SPA (#13996)
Damian Legawiecb39e6c479a1f
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.tsxindex 133b9496e8..a1af570861 100644--- a/packages/admin/src/components/spree/custom-fields/custom-fields-drawer.tsx+++ b/packages/admin/src/components/spree/custom-fields/custom-fields-drawer.tsx@@ -1,5 +1,5 @@import type { CustomFieldOwnerType } from '@spree/admin-sdk'-import { ArrowLeftIcon, CheckCircle2Icon, Loader2Icon, PlusIcon, SaveIcon } from 'lucide-react'+import { ArrowLeftIcon, CheckCircle2Icon, Loader2Icon, PlusIcon } from 'lucide-react'import { type ReactNode, useEffect, useMemo, useState } from 'react'import { useForm } from 'react-hook-form'import { toast } from 'sonner'@@ -48,7 +48,7 @@ export function CustomFieldsDrawer({view === 'values' ? (<SheetTitle>Custom fields</SheetTitle>) : (- <div className="flex items-center gap-2">+ <SheetTitle className="flex gap-2 items-center"><Buttontype="button"variant="ghost"@@ -58,10 +58,8 @@ export function CustomFieldsDrawer({><ArrowLeftIcon className="size-4" /></Button>- <SheetTitle>- {view === 'new-definition' ? 'New custom field' : 'Definition created'}- </SheetTitle>- </div>+ {view === 'new-definition' ? 'New custom field' : 'Definition created'}+ </SheetTitle>)return (@@ -129,7 +127,7 @@ function NewDefinitionView({onSuccess={onSuccess}renderShell={({ fields, submitButton }) => (<>- <SheetHeader>{header}</SheetHeader>+ <SheetHeader className="h-13 py-3">{header}</SheetHeader><div className="flex-1 overflow-y-auto p-4">{fields}</div><SheetFooter><Button type="button" variant="outline" size="sm" onClick={onCancel}>@@ -340,15 +338,11 @@ function ValuesView({</div><SheetFooter>- <Button type="button" variant="outline" size="sm" onClick={onClose}>+ <Button type="button" variant="outline" onClick={onClose}>Cancel</Button>- <Button type="submit" size="sm" disabled={isSaving}>- {isSaving ? (- <Loader2Icon className="size-4 animate-spin" />- ) : (- <SaveIcon className="size-4" />- )}+ <Button type="submit" disabled={isSaving}>+ {isSaving && <Loader2Icon className="size-4 animate-spin" />}Save</Button></SheetFooter>diff --git a/packages/admin/src/components/spree/relative-time.tsx b/packages/admin/src/components/spree/relative-time.tsxnew file mode 100644index 0000000000..2cdc8c7492--- /dev/null+++ b/packages/admin/src/components/spree/relative-time.tsx@@ -0,0 +1,48 @@+import { format, formatDistanceToNow } from 'date-fns'+import type { ComponentProps, ReactNode } from 'react'++import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'+import { cn } from '@/lib/utils'++type TooltipContentProps = ComponentProps<typeof TooltipContent>++type RelativeTimeProps = {+ iso: string | null | undefined+ fallback?: ReactNode+ prefix?: ReactNode+ className?: string+ side?: TooltipContentProps['side']+ align?: TooltipContentProps['align']+}++export function RelativeTime({+ iso,+ fallback = '—',+ prefix,+ className,+ side,+ align,+}: RelativeTimeProps) {+ if (!iso) return <>{fallback}</>++ const date = new Date(iso)+ if (Number.isNaN(date.getTime())) return <>{fallback}</>++ const relative = formatDistanceToNow(date, { addSuffix: true })+ const absolute = format(date, 'PPpp')++ return (+ <Tooltip>+ <TooltipTrigger asChild>+ <time dateTime={iso} className={cn('cursor-default', className)}>+ {prefix}+ {prefix ? ' ' : null}+ {relative}+ </time>+ </TooltipTrigger>+ <TooltipContent side={side} align={align}>+ {absolute}+ </TooltipContent>+ </Tooltip>+ )+}diff --git a/packages/admin/src/components/spree/table-toolbar.tsx b/packages/admin/src/components/spree/table-toolbar.tsxindex a5a918bbf4..009f7c35f2 100644--- a/packages/admin/src/components/spree/table-toolbar.tsx+++ b/packages/admin/src/components/spree/table-toolbar.tsx@@ -162,7 +162,9 @@ export function TableToolbar({<Button variant="outline" size="sm" className="h-[2.125rem]"><FilterIcon className="size-4" />{activeFilterCount > 0 && (- <Badge className="ml-1 px-1.5 py-0 text-xs">{activeFilterCount}</Badge>+ <Badge variant="outline" className="ml-1 px-1.5 py-0 text-xs">+ {activeFilterCount}+ </Badge>)}</Button></PopoverTrigger>@@ -207,7 +209,7 @@ export function TableToolbar({const ops = getOperators(col?.filterType ?? 'string')const opLabel = ops.find((o) => o.value === filter.operator)?.label ?? filter.operatorreturn (- <Badge key={filter.id} className="gap-1.5 pr-1">+ <Badge key={filter.id} variant="outline" className="gap-1.5 pr-0.5"><span className="font-medium">{col?.label ?? filter.field}</span><span className="text-muted-foreground">{opLabel}</span>{!noValueOperators.includes(filter.operator) && (@@ -215,7 +217,7 @@ export function TableToolbar({)}<buttontype="button"- className="ml-0.5 p-0.5 rounded-sm hover:bg-accent"+ className="ml-0.5 p-0.5 rounded-full hover:bg-accent"onClick={() => onFiltersChange(filters.filter((f) => f.id !== filter.id))}><XIcon className="size-3" />diff --git a/packages/admin/src/lib/formatters.ts b/packages/admin/src/lib/formatters.tsindex 8460427817..cfe1b28cf2 100644--- a/packages/admin/src/lib/formatters.ts+++ b/packages/admin/src/lib/formatters.ts@@ -1,12 +1,6 @@-import { formatDistanceToNow } from 'date-fns'-export function formatPrice(price: { amount?: string; currency?: string; display?: string } | null,) {if (!price) return '—'return price.display ?? `${price.currency} ${price.amount}`}--export function formatRelativeTime(iso: string) {- return formatDistanceToNow(new Date(iso), { addSuffix: true })-}diff --git a/packages/admin/src/routes/_authenticated/$storeId/customers/$customerId.tsx b/packages/admin/src/routes/_authenticated/$storeId/customers/$customerId.tsxindex a1bba1f1ba..25df86247c 100644--- a/packages/admin/src/routes/_authenticated/$storeId/customers/$customerId.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/customers/$customerId.tsx@@ -10,13 +10,14 @@ import {StarIcon,TrashIcon,} from 'lucide-react'-import { type FormEvent, useState } from 'react'+import { type FormEvent, type ReactNode, useState } from 'react'import { adminClient } from '@/client'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 { RelativeTime } from '@/components/spree/relative-time'import { ResourceLayout } from '@/components/spree/resource-layout'import { ErrorState } from '@/components/spree/route-error-boundary'import { TagCombobox } from '@/components/spree/tag-combobox'@@ -43,7 +44,6 @@ import { Input } from '@/components/ui/input'import { Textarea } from '@/components/ui/textarea'import { useAuth } from '@/hooks/use-auth'import { useCountries } from '@/hooks/use-countries'-import { formatRelativeTime } from '@/lib/formatters'export const Route = createFileRoute('/_authenticated/$storeId/customers/$customerId')({component: CustomerDetailPage,@@ -186,7 +186,7 @@ function ProfileCard({ customer }: { customer: Customer }) {</div>{customer.created_at && (<div className="text-xs text-muted-foreground">- Customer since {formatRelativeTime(customer.created_at)}+ <RelativeTime iso={customer.created_at} prefix="Customer since" /></div>)}</CardContent>@@ -309,13 +309,13 @@ function LifetimeStatsCard({ customer }: { customer: Customer }) {<Stat label="Orders" value={String(orders)} /><Stat label="Avg order value" value={aovDisplay ?? '—'} /><Stat label="Store credit" value={customer.display_available_store_credit_total ?? '—'} />- <Stat label="Customer since" value={formatRelativeTime(customer.created_at)} />+ <Stat label="Customer since" value={<RelativeTime iso={customer.created_at} />} /></CardContent></Card>)}-function Stat({ label, value }: { label: string; value: string }) {+function Stat({ label, value }: { label: string; value: ReactNode }) {return (<div className="flex flex-col gap-1"><span className="text-sm text-muted-foreground">{label}</span>@@ -365,7 +365,7 @@ function LastOrderCard({ order }: { order: Order }) {</span>{order.completed_at && (<div className="text-xs text-muted-foreground mt-1">- {formatRelativeTime(order.completed_at)}+ <RelativeTime iso={order.completed_at} /></div>)}</div>@@ -468,7 +468,7 @@ function OrdersCard({</Link></td><td className="px-6 py-3 text-muted-foreground">- {formatRelativeTime(order.completed_at ?? order.created_at)}+ <RelativeTime iso={order.completed_at ?? order.created_at} /></td><td className="px-6 py-3"><span className="inline-flex gap-1">diff --git a/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsx b/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsxindex 8933708d44..c256dd232d 100644--- a/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsx@@ -26,6 +26,7 @@ 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 { RelativeTime } from '@/components/spree/relative-time'import { ResourceLayout } from '@/components/spree/resource-layout'import { ErrorState } from '@/components/spree/route-error-boundary'import { TagCombobox } from '@/components/spree/tag-combobox'@@ -71,7 +72,6 @@ import { Switch } from '@/components/ui/switch'import { Textarea } from '@/components/ui/textarea'import { orderQueryKey, useOrder, useOrderMutation } from '@/hooks/use-order'import { useResourceMutation } from '@/hooks/use-resource-mutation'-import { formatRelativeTime } from '@/lib/formatters'import { cn } from '@/lib/utils'export const Route = createFileRoute('/_authenticated/$storeId/orders/$orderId')({@@ -186,9 +186,9 @@ function OrderHeader({ order }: { order: Order }) {</>)- const subtitle = order.completed_at- ? `Completed ${formatRelativeTime(order.completed_at)}`- : undefined+ const subtitle = order.completed_at ? (+ <RelativeTime iso={order.completed_at} prefix="Completed" />+ ) : undefinedconst dropdownItems = (<>@@ -844,8 +844,7 @@ function ShipmentsCard({ order }: { order: Order }) {{fulfillment.fulfilled_at && (<span className="text-xs text-muted-foreground">- Shipped{' '}- {fulfillment.fulfilled_at ? formatRelativeTime(fulfillment.fulfilled_at) : ''}+ <RelativeTime iso={fulfillment.fulfilled_at} prefix="Shipped" fallback="" /></span>)}</div>diff --git a/packages/admin/src/routes/_authenticated/$storeId/settings/api-keys.tsx b/packages/admin/src/routes/_authenticated/$storeId/settings/api-keys.tsxindex 578d5575fa..06b6913ba6 100644--- a/packages/admin/src/routes/_authenticated/$storeId/settings/api-keys.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/settings/api-keys.tsx@@ -16,6 +16,7 @@ import { z } from 'zod/v4'import { useConfirm } from '@/components/spree/confirm-dialog'import { EmptyState } from '@/components/spree/empty-state'import { PageHeader } from '@/components/spree/page-header'+import { RelativeTime } from '@/components/spree/relative-time'import { Badge } from '@/components/ui/badge'import { Button } from '@/components/ui/button'import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'@@ -57,7 +58,6 @@ import {import { Skeleton } from '@/components/ui/skeleton'import { useApiKeys, useCreateApiKey, useDeleteApiKey, useRevokeApiKey } from '@/hooks/use-api-keys'import { useCopyToClipboard } from '@/hooks/use-copy-to-clipboard'-import { formatRelativeTime } from '@/lib/formatters'import { cn } from '@/lib/utils'export const Route = createFileRoute('/_authenticated/$storeId/settings/api-keys')({@@ -287,14 +287,13 @@ function ApiKeyRow({ apiKey, showScopes }: { apiKey: ApiKey; showScopes: booleanApiKeyAuthentication#touch_api_key_if_needed), so the timestampwon't be perfectly fresh — but it's accurate enough for "is thiskey still in use?" decisions. */}- {apiKey.last_used_at ? (- formatRelativeTime(apiKey.last_used_at)- ) : (- <span className="text-muted-foreground/60">Never</span>- )}+ <RelativeTime+ iso={apiKey.last_used_at}+ fallback={<span className="text-muted-foreground/60">Never</span>}+ /></TableCell><TableCell className="text-sm text-muted-foreground whitespace-nowrap">- {formatRelativeTime(apiKey.created_at)}+ <RelativeTime iso={apiKey.created_at} />{apiKey.created_by_email && <div className="text-xs">by {apiKey.created_by_email}</div>}</TableCell><TableCell className="text-right">@@ -544,7 +543,7 @@ function KeyTypeOption({className={cn('flex flex-col items-start gap-1 rounded-lg border p-3 text-left transition-colors',selected- ? 'border-primary bg-primary/5 text-foreground'+ ? 'border-blue-300 bg-blue-500/5 text-blue-600 dark:border-blue-600/75': 'border-border hover:border-foreground/30',)}>diff --git a/packages/admin/src/routes/_authenticated/$storeId/settings/staff.tsx b/packages/admin/src/routes/_authenticated/$storeId/settings/staff.tsxindex 2d4483485d..323bc4c77f 100644--- a/packages/admin/src/routes/_authenticated/$storeId/settings/staff.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/settings/staff.tsx@@ -17,6 +17,7 @@ import { z } from 'zod/v4'import { useConfirm } from '@/components/spree/confirm-dialog'import { EmptyState } from '@/components/spree/empty-state'import { PageHeader } from '@/components/spree/page-header'+import { RelativeTime } from '@/components/spree/relative-time'import { Avatar, AvatarFallback } from '@/components/ui/avatar'import { Badge } from '@/components/ui/badge'import { Button } from '@/components/ui/button'@@ -66,7 +67,6 @@ import {useStaff,useUpdateStaff,} from '@/hooks/use-staff'-import { formatRelativeTime } from '@/lib/formatters'export const Route = createFileRoute('/_authenticated/$storeId/settings/staff')({component: StaffSettingsPage,@@ -337,7 +337,7 @@ function InvitationRow({ invitation }: { invitation: Invitation }) {{invitation.expires_at ? (<span className="inline-flex items-center gap-1"><ClockIcon className="size-3.5" />- {formatRelativeTime(invitation.expires_at)}+ <RelativeTime iso={invitation.expires_at} /></span>) : ('—'diff --git a/packages/admin/src/tables/customers.tsx b/packages/admin/src/tables/customers.tsxindex 4f12c4dc20..c99148ff89 100644--- a/packages/admin/src/tables/customers.tsx+++ b/packages/admin/src/tables/customers.tsx@@ -1,6 +1,6 @@import { Link } from '@tanstack/react-router'import { UsersIcon } from 'lucide-react'-import { formatRelativeTime } from '@/lib/formatters'+import { RelativeTime } from '@/components/spree/relative-time'import { defineTable } from '@/lib/table-registry'defineTable('customers', {@@ -65,8 +65,7 @@ defineTable('customers', {label: 'Last order',default: true,className: 'text-sm text-muted-foreground whitespace-nowrap',- render: (c) =>- c.last_order_completed_at ? formatRelativeTime(c.last_order_completed_at) : '—',+ render: (c) => <RelativeTime iso={c.last_order_completed_at} />,},{key: 'accepts_email_marketing',@@ -84,7 +83,7 @@ defineTable('customers', {default: false,filterType: 'date',className: 'text-sm text-muted-foreground whitespace-nowrap',- render: (c) => formatRelativeTime(c.created_at),+ render: (c) => <RelativeTime iso={c.created_at} />,},],})diff --git a/packages/admin/src/tables/orders.tsx b/packages/admin/src/tables/orders.tsxindex 858986adb3..213b71b154 100644--- a/packages/admin/src/tables/orders.tsx+++ b/packages/admin/src/tables/orders.tsx@@ -1,7 +1,7 @@import { Link } from '@tanstack/react-router'import { ShoppingCartIcon } from 'lucide-react'+import { RelativeTime } from '@/components/spree/relative-time'import { StatusBadge } from '@/components/ui/badge'-import { formatRelativeTime } from '@/lib/formatters'import { defineTable } from '@/lib/table-registry'defineTable('orders', {@@ -35,7 +35,7 @@ defineTable('orders', {default: true,filterType: 'date',className: 'text-sm text-muted-foreground whitespace-nowrap',- render: (order) => (order.completed_at ? formatRelativeTime(order.completed_at) : '—'),+ render: (order) => <RelativeTime iso={order.completed_at} />,},{key: 'email',@@ -123,7 +123,7 @@ defineTable('orders', {default: false,filterType: 'date',className: 'text-sm text-muted-foreground whitespace-nowrap',- render: (order) => formatRelativeTime(order.created_at),+ render: (order) => <RelativeTime iso={order.created_at} />,},{key: 'updated_at',@@ -132,7 +132,7 @@ defineTable('orders', {default: false,filterType: 'date',className: 'text-sm text-muted-foreground whitespace-nowrap',- render: (order) => formatRelativeTime(order.updated_at),+ render: (order) => <RelativeTime iso={order.updated_at} />,},// Filter-only columns{diff --git a/packages/admin/src/tables/products.tsx b/packages/admin/src/tables/products.tsxindex ab9caa183d..97fc2185ca 100644--- a/packages/admin/src/tables/products.tsx+++ b/packages/admin/src/tables/products.tsx@@ -1,7 +1,8 @@import { Link } from '@tanstack/react-router'import { PackageIcon } from 'lucide-react'+import { RelativeTime } from '@/components/spree/relative-time'import { StatusBadge } from '@/components/ui/badge'-import { formatPrice, formatRelativeTime } from '@/lib/formatters'+import { formatPrice } from '@/lib/formatters'import { defineTable } from '@/lib/table-registry'defineTable('products', {@@ -117,7 +118,7 @@ defineTable('products', {default: false,filterType: 'date',className: 'text-sm text-muted-foreground whitespace-nowrap',- render: (product) => formatRelativeTime(product.created_at),+ render: (product) => <RelativeTime iso={product.created_at} />,},{key: 'updated_at',@@ -127,7 +128,7 @@ defineTable('products', {default: false,filterType: 'date',className: 'text-sm text-muted-foreground whitespace-nowrap',- render: (product) => formatRelativeTime(product.updated_at),+ render: (product) => <RelativeTime iso={product.updated_at} />,},{key: 'in_stock',