@vendure/dashboard 3.7.4-master-202609060211 → 3.7.4-master-202609090211

package/dist/bundle/chunks/{2SSKDMRQ-rQCpZsiI.js → 2SSKDMRQ-B1rA10ds.js}

@@ -1,5 +1,5 @@
-import { c as createLocalStorage, T as THEME_PREFERENCE, P as PiPProvider, a as ThemeContext, b as ParentPanel, C as ContentView, Q as QueryDevtoolsContext } from "./AP7HFJJL-BJdLqnVW.js";
-import { g as getPreferredColorScheme, c as createMemo, a as createComponent } from "./main-9UGYMBwq.js";
+import { c as createLocalStorage, T as THEME_PREFERENCE, P as PiPProvider, a as ThemeContext, b as ParentPanel, C as ContentView, Q as QueryDevtoolsContext } from "./AP7HFJJL-C5T1-SoG.js";
+import { g as getPreferredColorScheme, c as createMemo, a as createComponent } from "./main-BnHyVdxB.js";
 var DevtoolsPanelComponent = (props) => {
   const [localStore, setLocalStore] = createLocalStorage({
     prefix: "TanstackQueryDevtools"

package/dist/bundle/chunks/{AP7HFJJL-BJdLqnVW.js → AP7HFJJL-C5T1-SoG.js}

@@ -1,4 +1,4 @@
-import { b as createContext, d as createSignal, o as onMount, e as createEffect, c as createMemo, a as createComponent, P as Portal, m as memo, S as Show, t as template, i as insert, f as createRenderEffect, h as className, j as clearDelegatedEvents, k as delegateEvents, u as useContext, l as onCleanup, s as sortFns, n as mutationSortFns, p as on, q as setAttribute, r as getSidedProp, v as use, w as convertRemToPixels, x as createUniqueId, y as batch, z as getQueryStatusLabel, A as getMutationStatusColor, B as getQueryStatusColor, C as getQueryStatusColorByLabel, D as displayValue, F as For, E as untrack, $ as $TRACK, G as useTransition, H as spread, I as mergeProps, J as createRoot, K as serialize, L as Index, M as updateNestedDataByPath, N as addEventListener, O as stringify, Q as Match, R as Switch, T as deleteNestedDataByPath, U as splitProps, V as Dynamic, W as createComputed } from "./main-9UGYMBwq.js";
+import { b as createContext, d as createSignal, o as onMount, e as createEffect, c as createMemo, a as createComponent, P as Portal, m as memo, S as Show, t as template, i as insert, f as createRenderEffect, h as className, j as clearDelegatedEvents, k as delegateEvents, u as useContext, l as onCleanup, s as sortFns, n as mutationSortFns, p as on, q as setAttribute, r as getSidedProp, v as use, w as convertRemToPixels, x as createUniqueId, y as batch, z as getQueryStatusLabel, A as getMutationStatusColor, B as getQueryStatusColor, C as getQueryStatusColorByLabel, D as displayValue, F as For, E as untrack, $ as $TRACK, G as useTransition, H as spread, I as mergeProps, J as createRoot, K as serialize, L as Index, M as updateNestedDataByPath, N as addEventListener, O as stringify, Q as Match, R as Switch, T as deleteNestedDataByPath, U as splitProps, V as Dynamic, W as createComputed } from "./main-BnHyVdxB.js";
 var isNonNullable = (i2) => i2 != null;
 var filterNonNullable = (arr) => arr.filter(isNonNullable);
 function chain(callbacks) {

package/dist/bundle/chunks/{WDYDFRGG-CplI2xmz.js → WDYDFRGG-B7YN1qB0.js}

@@ -1,5 +1,5 @@
-import { c as createLocalStorage, T as THEME_PREFERENCE, P as PiPProvider, a as ThemeContext, D as Devtools, Q as QueryDevtoolsContext } from "./AP7HFJJL-BJdLqnVW.js";
-import { g as getPreferredColorScheme, c as createMemo, a as createComponent } from "./main-9UGYMBwq.js";
+import { c as createLocalStorage, T as THEME_PREFERENCE, P as PiPProvider, a as ThemeContext, D as Devtools, Q as QueryDevtoolsContext } from "./AP7HFJJL-C5T1-SoG.js";
+import { g as getPreferredColorScheme, c as createMemo, a as createComponent } from "./main-BnHyVdxB.js";
 var DevtoolsComponent = (props) => {
   const [localStore, setLocalStore] = createLocalStorage({
     prefix: "TanstackQueryDevtools"

package/dist/bundle/chunks/{main-9UGYMBwq.js → main-BnHyVdxB.js}

@@ -2934,7 +2934,7 @@ var TanstackQueryDevtools = class {
       if (this.#Component) {
         Devtools = this.#Component;
       } else {
-        Devtools = lazy(() => import("./WDYDFRGG-CplI2xmz.js"));
+        Devtools = lazy(() => import("./WDYDFRGG-B7YN1qB0.js"));
         this.#Component = Devtools;
       }
       setupStyleSheet(this.#styleNonce, this.#shadowDOMTarget);
@@ -3072,7 +3072,7 @@ var TanstackQueryDevtoolsPanel = class {
       if (this.#Component) {
         Devtools = this.#Component;
       } else {
-        Devtools = lazy(() => import("./2SSKDMRQ-rQCpZsiI.js"));
+        Devtools = lazy(() => import("./2SSKDMRQ-B1rA10ds.js"));
         this.#Component = Devtools;
       }
       setupStyleSheet(this.#styleNonce, this.#shadowDOMTarget);
@@ -7012,20 +7012,16 @@ function PromotionListPage() {
     endsAt: true
   }, onSearchTermChange: (searchTerm) => {
     return searchTerm ? {
-      name: {
-        contains: searchTerm
-      },
-      couponCode: {
-        contains: searchTerm
-      }
+      _or: [{
+        name: {
+          contains: searchTerm
+        }
+      }, {
+        couponCode: {
+          contains: searchTerm
+        }
+      }]
     } : {};
-  }, transformVariables: (variables) => {
-    return {
-      options: {
-        ...variables.options,
-        filterOperator: "OR"
-      }
-    };
   }, customizeColumns: {
     name: {
       cell: ({
@@ -7834,15 +7830,19 @@ function ProductListPage$1() {
     }
   }, onSearchTermChange: (searchTerm) => {
     return searchTerm ? {
-      name: {
-        contains: searchTerm
-      },
-      slug: {
-        contains: searchTerm
-      },
-      sku: {
-        contains: searchTerm
-      }
+      _or: [{
+        name: {
+          contains: searchTerm
+        }
+      }, {
+        slug: {
+          contains: searchTerm
+        }
+      }, {
+        sku: {
+          contains: searchTerm
+        }
+      }]
     } : {};
   }, additionalColumns: {
     facetValueId: {
@@ -7862,13 +7862,6 @@ function ProductListPage$1() {
       ),
       component: FacetValueFacetedFilter
     }
-  }, transformVariables: (variables) => {
-    return {
-      options: {
-        ...variables.options,
-        filterOperator: "OR"
-      }
-    };
   }, defaultSort: [{
     id: "updatedAt",
     desc: true
@@ -8252,20 +8245,16 @@ function ProductListPage() {
     }
   }, onSearchTermChange: (searchTerm) => {
     return searchTerm ? {
-      name: {
-        contains: searchTerm
-      },
-      sku: {
-        contains: searchTerm
-      }
+      _or: [{
+        name: {
+          contains: searchTerm
+        }
+      }, {
+        sku: {
+          contains: searchTerm
+        }
+      }]
     } : {};
-  }, transformVariables: (variables) => {
-    return {
-      options: {
-        ...variables.options,
-        filterOperator: "OR"
-      }
-    };
   }, route: Route$F });
 }
 const paymentMethodItemFragment = graphql(`
@@ -10340,23 +10329,20 @@ function CustomerListPage() {
     id: "NihQNk"
   } }), pageId: "customer-list", listQuery: customerListDocument, onSearchTermChange: (searchTerm) => {
     return searchTerm ? {
-      lastName: {
-        contains: searchTerm
-      },
-      emailAddress: {
-        contains: searchTerm
-      },
-      phoneNumber: {
-        contains: searchTerm
-      }
+      _or: [{
+        lastName: {
+          contains: searchTerm
+        }
+      }, {
+        emailAddress: {
+          contains: searchTerm
+        }
+      }, {
+        phoneNumber: {
+          contains: searchTerm
+        }
+      }]
     } : {};
-  }, transformVariables: (variables) => {
-    return {
-      options: {
-        ...variables.options,
-        filterOperator: "OR"
-      }
-    };
   }, route: Route$z, customizeColumns: {
     user: {
       header: () => /* @__PURE__ */ jsx(Trans, { .../*i18n*/
@@ -10610,12 +10596,15 @@ function CustomerGroupMembersTable({
       setFilters(filters2);
     }, onSearchTermChange: (searchTerm) => {
       return {
-        lastName: {
-          contains: searchTerm
-        },
-        emailAddress: {
-          contains: searchTerm
-        }
+        _or: [{
+          lastName: {
+            contains: searchTerm
+          }
+        }, {
+          emailAddress: {
+            contains: searchTerm
+          }
+        }]
       };
     }, additionalColumns: {
       name: {
@@ -10829,21 +10818,16 @@ function CountryListPage() {
     enabled: true
   }, onSearchTermChange: (searchTerm) => {
     return searchTerm ? {
-      name: {
-        contains: searchTerm
-      },
-      code: {
-        contains: searchTerm
-      }
+      _or: [{
+        name: {
+          contains: searchTerm
+        }
+      }, {
+        code: {
+          contains: searchTerm
+        }
+      }]
     } : {};
-  }, transformVariables: (variables) => {
-    return {
-      ...variables,
-      options: {
-        ...variables.options,
-        filterOperator: "OR"
-      }
-    };
   }, customizeColumns: {
     name: {
       cell: ({
@@ -12452,23 +12436,20 @@ function AdministratorListPage() {
     id: "3zE1mx"
   } }), listQuery: administratorListDocument, route: Route$s, onSearchTermChange: (searchTerm) => {
     return searchTerm ? {
-      firstName: {
-        contains: searchTerm
-      },
-      lastName: {
-        contains: searchTerm
-      },
-      emailAddress: {
-        contains: searchTerm
-      }
+      _or: [{
+        firstName: {
+          contains: searchTerm
+        }
+      }, {
+        lastName: {
+          contains: searchTerm
+        }
+      }, {
+        emailAddress: {
+          contains: searchTerm
+        }
+      }]
     } : {};
-  }, transformVariables: (variables) => {
-    return {
-      options: {
-        ...variables.options,
-        filterOperator: "OR"
-      }
-    };
   }, additionalColumns: {
     name: {
       meta: {

package/dist/bundle/main.js

@@ -1,7 +1,7 @@
 import "react/jsx-runtime";
 import "./chunks/use-job-queue-polling-BrMR-IHJ.js";
 import "sonner";
-import "./chunks/main-9UGYMBwq.js";
+import "./chunks/main-BnHyVdxB.js";
 import "@tanstack/react-router";
 import "react";
 import "react-dom";

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@vendure/dashboard",
     "private": false,
-    "version": "3.7.4-master-202609060211",
+    "version": "3.7.4-master-202609090211",
     "type": "module",
     "repository": {
         "type": "git",
@@ -140,8 +140,8 @@
         "@storybook/addon-vitest": "^10.3.1",
         "@storybook/react-vite": "^10.3.1",
         "@types/node": "^22.19.0",
-        "@vendure/common": "^3.7.4-master-202609060211",
-        "@vendure/core": "^3.7.4-master-202609060211",
+        "@vendure/common": "^3.7.4-master-202609090211",
+        "@vendure/core": "^3.7.4-master-202609090211",
         "@vitest/browser": "^3.2.4",
         "@vitest/coverage-v8": "^3.2.4",
         "eslint": "^9.39.0",

package/src/app/routes/_authenticated/_administrators/administrators.tsx

@@ -25,20 +25,14 @@ function AdministratorListPage() {
             onSearchTermChange={searchTerm => {
                 return searchTerm
                     ? {
-                          firstName: { contains: searchTerm },
-                          lastName: { contains: searchTerm },
-                          emailAddress: { contains: searchTerm },
+                          _or: [
+                              { firstName: { contains: searchTerm } },
+                              { lastName: { contains: searchTerm } },
+                              { emailAddress: { contains: searchTerm } },
+                          ],
                       }
                     : {};
             }}
-            transformVariables={variables => {
-                return {
-                    options: {
-                        ...variables.options,
-                        filterOperator: 'OR',
-                    },
-                };
-            }}
             additionalColumns={{
                 name: {
                     meta: { dependencies: ['id', 'firstName', 'lastName'] },

package/src/app/routes/_authenticated/_countries/countries.tsx

@@ -28,20 +28,10 @@ function CountryListPage() {
             onSearchTermChange={searchTerm => {
                 return searchTerm
                     ? {
-                          name: { contains: searchTerm },
-                          code: { contains: searchTerm },
+                          _or: [{ name: { contains: searchTerm } }, { code: { contains: searchTerm } }],
                       }
                     : {};
             }}
-            transformVariables={variables => {
-                return {
-                    ...variables,
-                    options: {
-                        ...variables.options,
-                        filterOperator: 'OR',
-                    },
-                };
-            }}
             customizeColumns={{
                 name: {
                     cell: ({ row }) => <DetailPageButton id={row.original.id} label={row.original.name} />,

package/src/app/routes/_authenticated/_customer-groups/components/customer-group-members-table.tsx

@@ -93,12 +93,10 @@ export function CustomerGroupMembersTable({
                 }}
                 onSearchTermChange={searchTerm => {
                     return {
-                        lastName: {
-                            contains: searchTerm,
-                        },
-                        emailAddress: {
-                            contains: searchTerm,
-                        },
+                        _or: [
+                            { lastName: { contains: searchTerm } },
+                            { emailAddress: { contains: searchTerm } },
+                        ],
                     };
                 }}
                 additionalColumns={{

package/src/app/routes/_authenticated/_customers/customers.tsx

@@ -24,20 +24,14 @@ function CustomerListPage() {
             onSearchTermChange={searchTerm => {
                 return searchTerm
                     ? {
-                          lastName: { contains: searchTerm },
-                          emailAddress: { contains: searchTerm },
-                          phoneNumber: { contains: searchTerm },
+                          _or: [
+                              { lastName: { contains: searchTerm } },
+                              { emailAddress: { contains: searchTerm } },
+                              { phoneNumber: { contains: searchTerm } },
+                          ],
                       }
                     : {};
             }}
-            transformVariables={variables => {
-                return {
-                    options: {
-                        ...variables.options,
-                        filterOperator: 'OR',
-                    },
-                };
-            }}
             route={Route}
             customizeColumns={{
                 user: {

package/src/app/routes/_authenticated/_product-variants/product-variants.tsx

@@ -88,19 +88,10 @@ function ProductListPage() {
             onSearchTermChange={searchTerm => {
                 return searchTerm
                     ? {
-                          name: { contains: searchTerm },
-                          sku: { contains: searchTerm },
+                          _or: [{ name: { contains: searchTerm } }, { sku: { contains: searchTerm } }],
                       }
                     : {};
             }}
-            transformVariables={variables => {
-                return {
-                    options: {
-                        ...variables.options,
-                        filterOperator: 'OR',
-                    },
-                };
-            }}
             route={Route}
         ></ListPage>
     );

package/src/app/routes/_authenticated/_products/products.tsx

@@ -56,9 +56,11 @@ function ProductListPage() {
             onSearchTermChange={searchTerm => {
                 return searchTerm
                     ? {
-                          name: { contains: searchTerm },
-                          slug: { contains: searchTerm },
-                          sku: { contains: searchTerm },
+                          _or: [
+                              { name: { contains: searchTerm } },
+                              { slug: { contains: searchTerm } },
+                              { sku: { contains: searchTerm } },
+                          ],
                       }
                     : {};
             }}
@@ -77,14 +79,6 @@ function ProductListPage() {
                     component: FacetValueFacetedFilter,
                 },
             }}
-            transformVariables={variables => {
-                return {
-                    options: {
-                        ...variables.options,
-                        filterOperator: 'OR',
-                    },
-                };
-            }}
             defaultSort={[{ id: 'updatedAt', desc: true }]}
             defaultVisibility={{
                 name: true,

package/src/app/routes/_authenticated/_promotions/promotions.tsx

@@ -38,19 +38,10 @@ function PromotionListPage() {
             onSearchTermChange={searchTerm => {
                 return searchTerm
                     ? {
-                          name: { contains: searchTerm },
-                          couponCode: { contains: searchTerm },
+                          _or: [{ name: { contains: searchTerm } }, { couponCode: { contains: searchTerm } }],
                       }
                     : {};
             }}
-            transformVariables={variables => {
-                return {
-                    options: {
-                        ...variables.options,
-                        filterOperator: 'OR' as const,
-                    },
-                };
-            }}
             customizeColumns={{
                 name: {
                     cell: ({ row }) => <DetailPageButton id={row.original.id} label={row.original.name} />,

package/src/lib/framework/page/list-page.stories.tsx

@@ -148,21 +148,7 @@ export const WithSearch: Story = {
         },
         onSearchTermChange: (searchTerm: string) => {
             return {
-                name: {
-                    contains: searchTerm,
-                },
-                code: {
-                    contains: searchTerm,
-                },
-            };
-        },
-        transformVariables: (variables: any) => {
-            return {
-                ...variables,
-                options: {
-                    ...variables.options,
-                    filterOperator: 'OR',
-                },
+                _or: [{ name: { contains: searchTerm } }, { code: { contains: searchTerm } }],
             };
         },
         customizeColumns: {
@@ -222,21 +208,7 @@ export const Complete: Story = {
         },
         onSearchTermChange: (searchTerm: string) => {
             return {
-                name: {
-                    contains: searchTerm,
-                },
-                code: {
-                    contains: searchTerm,
-                },
-            };
-        },
-        transformVariables: (variables: any) => {
-            return {
-                ...variables,
-                options: {
-                    ...variables.options,
-                    filterOperator: 'OR',
-                },
+                _or: [{ name: { contains: searchTerm } }, { code: { contains: searchTerm } }],
             };
         },
         customizeColumns: {

package/src/lib/framework/page/list-page.tsx

@@ -140,6 +140,11 @@ export interface ListPageProps<
      * Allows you to customize how the search term is used in the list query options.
      * For instance, when you want the term to filter on specific fields.
      *
+     * The returned filter is merged with the column & faceted filters, so when the term should
+     * match any of several fields, group those fields in an `_or` block. Setting a page-level
+     * `filterOperator: 'OR'` would instead OR together _every_ top-level condition, including
+     * the column filters.
+     *
      * @example
      * ```tsx
      *  <ListPage
@@ -148,9 +153,11 @@ export interface ListPageProps<
      *    listQuery={administratorListDocument}
      *    onSearchTermChange={searchTerm => {
      *      return {
-     *        firstName: { contains: searchTerm },
-     *        lastName: { contains: searchTerm },
-     *        emailAddress: { contains: searchTerm },
+     *        _or: [
+     *          { firstName: { contains: searchTerm } },
+     *          { lastName: { contains: searchTerm } },
+     *          { emailAddress: { contains: searchTerm } },
+     *        ],
      *      };
      *    }}
      *  />