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
Fixed enum filtering
Damian Legawiec4b7218825f36
diff --git a/packages/admin/src/components/spree/table-toolbar.tsx b/packages/admin/src/components/spree/table-toolbar.tsxindex 9d47461b8c..18e23d7b98 100644--- a/packages/admin/src/components/spree/table-toolbar.tsx+++ b/packages/admin/src/components/spree/table-toolbar.tsx@@ -7,7 +7,7 @@ import {Trash2Icon,XIcon,} from 'lucide-react'-import { useCallback, useRef, useState } from 'react'+import { useCallback, useMemo, useRef, useState } from 'react'import { Badge } from '@/components/ui/badge'import { Button } from '@/components/ui/button'import { CardTitle } from '@/components/ui/card'@@ -126,8 +126,11 @@ export function TableToolbar({const searchRef = useRef<HTMLInputElement>(null)const allCols = allColumns ?? columns- const sortableColumns = allCols.filter((c) => c.sortable)- const filterableColumns = allCols.filter((c) => c.filterable)+ // Memoize so `FilterPanel`'s `useMemo` deps stay stable across parent+ // re-renders. Otherwise picking a filter value triggers an `items` change+ // in the field-picker Select, which Base UI re-emits as a state change.+ const sortableColumns = useMemo(() => allCols.filter((c) => c.sortable), [allCols])+ const filterableColumns = useMemo(() => allCols.filter((c) => c.filterable), [allCols])const activeFilterCount = filters.lengthreturn (@@ -384,6 +387,15 @@ function FilterPanel({onClose: () => void}) {const [draft, setDraft] = useState<FilterRule[]>(initialFilters)+ // Stable `{ value, label }` array for the field-picker `<Select items>`.+ // Building it inline per render produces a new reference each time, which+ // Base UI's Select treats as an `items` change and re-emits state — causing+ // a "Maximum update depth exceeded" loop when the value-Select sits inside+ // the same panel.+ const fieldItems = useMemo(+ () => columns.map((c) => ({ value: c.key, label: c.label })),+ [columns],+ )const addFilter = useCallback(() => {const first = columns[0]@@ -432,7 +444,7 @@ function FilterPanel({return (<div key={filter.id} className="flex items-center gap-1.5"><Select- items={columns.map((c) => ({ value: c.key, label: c.label }))}+ items={fieldItems}value={filter.field}onValueChange={(val) => {const newCol = columns.find((c) => c.key === val)diff --git a/packages/admin/src/tables/option-types.tsx b/packages/admin/src/tables/option-types.tsxindex 149ef57e7c..9174e0c9c6 100644--- a/packages/admin/src/tables/option-types.tsx+++ b/packages/admin/src/tables/option-types.tsx@@ -40,6 +40,8 @@ defineTable<OptionType>('option-types', {label: 'Kind',sortable: true,filterable: true,+ filterType: 'enum',+ filterOptions: Object.entries(KIND_LABELS).map(([value, label]) => ({ value, label })),default: true,render: (ot) => <Badge variant="secondary">{KIND_LABELS[ot.kind] ?? ot.kind}</Badge>,},